* New upstream release.debian/2.6.26.dfsg-1

* debian/rules:
  + Added -fno-strict-aliasing to the CFLAGS.
  + Use dpkg-architecture to feed configure.
  + Bumped shlibs to current version, since new symbol for XPath cache has
    been added.
* debian/control: Bumped Standards-Version to 3.7.2.0. No changes required.

3 files changed, 21 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index e9089f7..8561723 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libxml2 (2.6.26.dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/rules:
+    + Added -fno-strict-aliasing to the CFLAGS.
+    + Use dpkg-architecture to feed configure.
+    + Bumped shlibs to current version, since new symbol for XPath cache has
+      been added.
+  * debian/control: Bumped Standards-Version to 3.7.2.0. No changes required.
+
+ -- Mike Hommey <glandium@debian.org>  Thu,  8 Jun 2006 21:39:55 +0200
+
 libxml2 (2.6.24.dfsg-1) unstable; urgency=low
 
   * New upstream release. Closes: #365246.
diff --git a/debian/control b/debian/control
index f8abf0b..9f8cb7d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Section: libs
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org>
 Uploaders: Mike Hommey <glandium@debian.org>
-Standards-Version: 3.7.0.0
+Standards-Version: 3.7.2.0
 Build-Depends: debhelper (>= 5.0.0), zlib1g-dev | libz-dev, python, python2.4-dev, python2.3-dev, autotools-dev, libreadline5-dev | libreadline-dev, binutils (>= 2.14.90.0.7)
 
 Package: libxml2
diff --git a/debian/rules b/debian/rules
index d25fc6e..2d0a6c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# These are used for cross-compiling and for saving the configure script
+# # from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
 # The versions of python currently supported
 PYVERS=$(subst -dev,,$(subst python,,$(filter python%-dev,$(shell sed -n '/^Build-Depends/s/,//gp' debian/control))))
 
@@ -14,7 +19,7 @@ CFLAGS = -Wall -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
       CFLAGS += -O0
 else
-      CFLAGS += -O2
+      CFLAGS += -O2 -fno-strict-aliasing
 endif
 
 build: build-stamp
@@ -27,7 +32,7 @@ build-stamp:
 	done
 
 	# ./configure
-	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --with-history
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --with-history
 	echo "all:" > example/Makefile
 	echo "install:" >> example/Makefile
 	echo "distclean:" >> example/Makefile
@@ -163,7 +168,7 @@ binary-arch: build install
 	dh_strip $(addprefix -ppython,$(addsuffix -libxml2, $(PYVERS)))
 	dh_compress -a -Xexamples/
 	dh_fixperms -a
-	dh_makeshlibs -a -V 'libxml2 (>= 2.6.24)'
+	dh_makeshlibs -a -V 'libxml2 (>= 2.6.26)'
 	dh_installdeb -a
 	dh_shlibdeps -a
 	dh_gencontrol -a