* autogen.sh: Changed the way we rebuild the examples.

* debian/rules: Added history support in xmllint. Closes: #318083.
* debian/control: Added build dependency upon libreadline5-dev for history support in xmllint.
* xmllint.c: Added some spaces in usage(). Closes: #335015.
* testModule.c: Added PATH_MAX definition for the Hurd. Closes: #333623.

6 files changed, 26 insertions, 10 deletions

diff --git a/autogen.sh b/autogen.sh
index 91898c7..8207e6a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -30,10 +30,11 @@ autoconf
 rm -rf autom4te.cache
 
 # rebuild doc/examples/index.html
-cd doc/examples
-xsltproc examples.xsl examples.xml
-xmllint --valid --noout index.html
-cd ../..
+make -C doc/examples rebuild
+#cd doc/examples
+#xsltproc examples.xsl examples.xml
+#xmllint --valid --noout index.html
+#cd ../..
 
 ## ----------------------------------------------------------------------
 exit 0
diff --git a/debian/changelog b/debian/changelog
index 7e3da5e..fc546eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libxml2 (2.6.22-2) UNRELEASED; urgency=low
+
+  * autogen.sh: Changed the way we rebuild the examples.
+  * debian/rules: Added history support in xmllint. Closes: #318083.
+  * debian/control: Added build dependency upon libreadline5-dev for history
+    support in xmllint.
+  * xmllint.c: Added some spaces in usage(). Closes: #335015.
+  * testModule.c: Added PATH_MAX definition for the Hurd. Closes: #333623.
+
+ -- Mike Hommey <mh@glandium.org>  Wed,  2 Nov 2005 17:57:49 +0100
+
 libxml2 (2.6.22-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 22aecf5..25c52e7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Section: libs
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org>
 Uploaders: Mike Hommey <glandium@debian.org>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.1.67), zlib1g-dev | libz-dev, python, python2.4-dev, python2.3-dev, python2.2-dev, autotools-dev
+Build-Depends: debhelper (>= 4.1.67), zlib1g-dev | libz-dev, python, python2.4-dev, python2.3-dev, python2.2-dev, autotools-dev, libreadline5-dev
 
 Package: libxml2
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 2d65dfc..c86585e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ build-stamp:
 	done
 
 	# ./configure
-	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr
+	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --with-history
 	echo "all:" > example/Makefile
 	echo "install:" >> example/Makefile
 	echo "distclean:" >> example/Makefile
diff --git a/testModule.c b/testModule.c
index fecc852..92e1949 100644
--- a/testModule.c
+++ b/testModule.c
@@ -29,6 +29,10 @@
 #define MODULE_PATH ".libs"
 #endif
 
+#ifndef PATH_MAX /* for The Hurd */
+#define PATH_MAX 4096
+#endif
+
 typedef int (*hello_world_t)(void);
  
 int main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) {
diff --git a/xmllint.c b/xmllint.c
index e8d3b4d..fcc4a81 100644
--- a/xmllint.c
+++ b/xmllint.c
@@ -2769,7 +2769,7 @@ static void usage(const char *name) {
     printf("\t--recover : output what was parsable on broken XML documents\n");
     printf("\t--noent : substitute entity references by their value\n");
     printf("\t--noout : don't output the result tree\n");
-    printf("\t--path 'paths': provide a set of paths for resources\n");
+    printf("\t--path 'paths' : provide a set of paths for resources\n");
     printf("\t--load-trace : print trace of all external entites loaded\n");
     printf("\t--nonet : refuse to fetch DTDs or entities over network\n");
     printf("\t--nocompact : do not generate compact text nodes\n");
@@ -2819,7 +2819,7 @@ static void usage(const char *name) {
     printf("\t--catalogs : use SGML catalogs from $SGML_CATALOG_FILES\n");
     printf("\t             otherwise XML Catalogs starting from \n");
     printf("\t         %s are activated by default\n", XML_XML_DEFAULT_CATALOG);
-    printf("\t--nocatalogs: deactivate all catalogs\n");
+    printf("\t--nocatalogs : deactivate all catalogs\n");
 #endif
     printf("\t--auto : generate a small doc on the fly\n");
 #ifdef LIBXML_XINCLUDE_ENABLED
@@ -2844,9 +2844,9 @@ static void usage(const char *name) {
     printf("\t--schematron schema : do validation against a schematron\n");
 #endif
 #ifdef LIBXML_SAX1_ENABLED
-    printf("\t--sax1: use the old SAX1 interfaces for processing\n");
+    printf("\t--sax1 : use the old SAX1 interfaces for processing\n");
 #endif
-    printf("\t--sax: do not build a tree but work just at the SAX level\n");
+    printf("\t--sax : do not build a tree but work just at the SAX level\n");
 
     printf("\nLibxml project home page: http://xmlsoft.org/\n");
     printf("To report bugs or get some help check: http://xmlsoft.org/bugs.html\n");