diff options
| author | Mike Hommey <glandium@debian.org> | 2005-03-28 16:30:19 +0000 |
|---|---|---|
| committer | Mike Hommey <glandium@debian.org> | 2005-03-28 16:30:19 +0000 |
| commit | 6937f250a66e5b1d533966970eae5a80a75967d1 (patch) | |
| tree | 89c8dbe75c83a716ce9d9794330135708c2859dd | |
| parent | c8e90387a457dabd46e06f127590af105a98b28d (diff) | |
| download | libxml2-6937f250a66e5b1d533966970eae5a80a75967d1.tar.gz | |
Sync with unstable branch
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rwxr-xr-x | debian/rules | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 0e15892..0e92788 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,15 @@ libxml2 (2.6.18-1) experimental; urgency=low * (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 diff --git a/debian/rules b/debian/rules index 4638522..dd45c88 100755 --- a/debian/rules +++ b/debian/rules @@ -73,7 +73,7 @@ install-stamp: build-stamp 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 @@ install-stamp: build-stamp 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 |