[xml/sgml-commit] r387 - packages/libxml2/trunk/debian

[Mike Hommey]

Author: glandium
Date: 2005-03-28 16:30:19 +0000 (Mon, 28 Mar 2005)
New Revision: 387

Modified:
   packages/libxml2/trunk/debian/changelog
   packages/libxml2/trunk/debian/rules
Log:
Sync with unstable branch

Modified: packages/libxml2/trunk/debian/changelog
===================================================================
--- packages/libxml2/trunk/debian/changelog	2005-03-28 16:28:15 UTC (rev 386)
+++ packages/libxml2/trunk/debian/changelog	2005-03-28 16:30:19 UTC (rev 387)
@@ -3,8 +3,16 @@
   * (NOT RELEASED YET) New upstream release.
   * debian/rules: bump shlibs to current version.
 
- -- Mike Hommey <glandium@debian.org>  Sun, 27 Mar 2005 22:32:01 +0200
+ -- Mike Hommey <glandium@debian.org>  Mon, 28 Mar 2005 18:29:55 +0200
 
+libxml2 (2.6.16-6) unstable; urgency=low
+
+  * The "pbuilder has its caveats, too" release.
+  * debian/rules: fix installation of python files and make proper use of
+    DESTDIR at install time, fixing FTBFS on buildds.
+
+ -- Mike Hommey <glandium@debian.org>  Mon, 28 Mar 2005 18:12:15 +0200
+
 libxml2 (2.6.16-5) unstable; urgency=low
 
   * debian/watch: use svn-upgrade instead of uupdate.

Modified: packages/libxml2/trunk/debian/rules
===================================================================
--- packages/libxml2/trunk/debian/rules	2005-03-28 16:28:15 UTC (rev 386)
+++ packages/libxml2/trunk/debian/rules	2005-03-28 16:30:19 UTC (rev 387)
@@ -73,7 +73,7 @@
 
 	mv -f python/Makefile python/Makefile.bak
 	echo install: > python/Makefile
-	$(MAKE) prefix=`pwd`/debian/tmp/usr install
+	$(MAKE) DESTDIR=`pwd`/debian/tmp install
 	mv -f python/Makefile.bak python/Makefile
 
 	mv debian/tmp/usr/share/aclocal/libxml.m4 debian/tmp/usr/share/aclocal/libxml2.m4
@@ -105,13 +105,13 @@
 	touch install-stamp
 
 build-python%-stamp: build-stamp
-	cd python && $(MAKE) clean && $(MAKE) PYTHON=/usr/bin/python$* pythondir=`pwd`/../debian/tmp/usr/lib/python$*/site-packages PYTHON_VERSION=$* PYTHON_INCLUDES=/usr/include/python$*
+	cd python && $(MAKE) clean && $(MAKE) PYTHON=/usr/bin/python$* PYTHON_VERSION=$* PYTHON_INCLUDES=/usr/include/python$*
 
 	touch $@
 
 install-python%-stamp: build-python%-stamp
 	rm build-python$*-stamp
-	cd python && $(MAKE) PYTHON=/usr/bin/python$* pythondir=`pwd`/../debian/tmp/usr/lib/python$*/site-packages PYTHON_VERSION=$* PYTHON_INCLUDES=/usr/include/python$* install
+	cd python && $(MAKE) DESTDIR=`pwd`/../debian/tmp PYTHON=/usr/bin/python$* PYTHON_VERSION=$* PYTHON_INCLUDES=/usr/include/python$* install
 
 	sed s/PYVERS/$*/ debian/python-libxml2.install.in > debian/python$*-libxml2.install
 	cp debian/python-libxml2.examples.in debian/python$*-libxml2.examples