Add changes from 2.6.11-4 and update changelog. This will be version 2.6.14-1.

3 files changed, 32 insertions, 24 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..cc2a777
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,12 @@
+Notes about libxml2
+-------------------
+While libxml2 is trying to fit at best the XML, XPath, XIncludes, etc.
+standards, it is likely to contain implementation bugs which tend to
+disappear with newer versions.
+For this reason, if you are using libxml2 libraries or tools for standard
+conforming development, it's suggested to upgrade libxml2 with newer
+packages from either testing or unstable Debian repositories.
+If you're using libxml2 in Gnome context, or similar case (ie. xml usage
+not requiring heavy standards compliance), you don't need such upgrade.
+
+-- Mike Hommey <mh@glandium.org>, Sat Oct 16 14:29:43 JST 2004
diff --git a/debian/changelog b/debian/changelog
index 2e9c210..c394867 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,17 @@
-libxml2 (2.6.14-2) experimental; urgency=low
+libxml2 (2.6.14-1) experimental; urgency=low
 
-  * debian/libxml2-python2.3: don't install .a and .la files.
+  * New upstream release. Closes: #273961.
+  * debian/rules: Use "dh_makeshlibs -V 'libxml2 (>= 2.6.14)'", since version
+    2.6.14 introduces some new symbols.
+  * debian/shlibs.local: Removed, since it is not useful any more.
 
- -- Mike Hommey <mh@glandium.org>  Fri, 15 Oct 2004 15:47:46 +0900
+ -- Mike Hommey <mh@glandium.org>  Sat, 16 Oct 2004 16:12:12 +0900
 
-libxml2 (2.6.14-1) experimental; urgency=low
+libxml2 (2.6.11-4) unstable; urgency=low
 
-  * New upstream release. Closes: #273961.
-  * debian/rules:
-    + Use "dh_makeshlibs -V 'libxml2 (>= 2.6.14)'", since version 2.6.14
-      introduces some new functions.
-      the index.html, and are not useful for the documentation.
-    + Avoid compression of both python examples and documentation.
+  * The "let's do some clean up for sarge" release.
+  * debian/libxml2-python2.3.install: don't install .a and .la files.
+  * debian/rules: Avoid compression of both python examples and documentation.
   * Reorganization in documentation:
     + debian/libxml2-doc.examples: removed, they will get installed by
       libxml2-doc.install, and we don't ship gjob* examples anymore, they
@@ -31,19 +31,15 @@ libxml2 (2.6.14-1) experimental; urgency=low
     text saying where to find it and why it has been (re)moved.
     That will save some space in the archive, especially considering this
     file is constantly growing.
-
- -- Mike Hommey <mh@glandium.org>  Thu, 14 Oct 2004 22:29:56 +0900
-
-libxml2 (2.6.13-1) experimental; urgency=low
-
-  * New upstream release:
-    + Fixed typo in xmlIO.c (Closes: #265740)
-    + no_proxy environment variable doesn't disable proxy anymore
-      (Closes: #266430)
-  * debian/rules: Use "dh_makeshlibs -V 'libxml2 (>= 2.6.13)'", since
-    version 2.6.13 introduces some new functions.
-
- -- Mike Hommey <mh@glandium.org>  Sun, 12 Sep 2004 14:52:22 +0900
+  * debian/README.Debian: Added a recommentation to upgrade package if user
+    needs heavy standards compliance.
+  * debian/shlibs.local: Added to tighten dependencies between libxml2-*
+    packages.
+  * xmlIO.c: Fixed typo (Closes: #265740).
+  * nanohttp.c, nanoftp.c: no_proxy environment variable doesn't disable proxy
+    anymore. (Closes: #266430)
+
+ -- Mike Hommey <mh@glandium.org>  Sat, 16 Oct 2004 15:38:20 +0900
 
 libxml2 (2.6.11-3) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index d7116ef..6c8b699 100755
--- a/debian/rules
+++ b/debian/rules
@@ -128,7 +128,7 @@ binary-arch: build install
 	ln -sf libxml2 debian/libxml2-utils/usr/share/doc/libxml2-utils
 	dh_installman -a
 	dh_installchangelogs -plibxml2 ChangeLog
-	for file in AUTHORS README changelog.Debian.gz changelog.gz; do \
+	for file in AUTHORS README README.Debian changelog.Debian.gz changelog.gz; do \
 		ln -sf ../libxml2/$${file} debian/libxml2-python2.3/usr/share/doc/libxml2-python2.3/$${file}; \
 	done
 	dh_install -a --sourcedir=debian/tmp