From 91d0136c3816ef2d2135ddd64d3dc50d2170354f Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 4 Apr 2011 11:48:59 +0200 Subject: * debian/python3-apt-dbg.install - Do not try to install old-style debugging files. --- debian/changelog | 2 ++ debian/python3-apt-dbg.install | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b6c1945f..f97e2be2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ python-apt (0.7.100.3) UNRELEASED; urgency=low - Fix mixed tab/spaces indentation in xz test * tests/test_apt_cache.py: - Package records 'Package' field now corresponds to shortname + * debian/python3-apt-dbg.install + - Do not try to install old-style debugging files. [ Scott Kitterman ] * Override override_dh_auto_install to install python3 extensions in the diff --git a/debian/python3-apt-dbg.install b/debian/python3-apt-dbg.install index 011ab164..64fd1842 100644 --- a/debian/python3-apt-dbg.install +++ b/debian/python3-apt-dbg.install @@ -1 +1 @@ -usr/lib/python3*/*/*_d.so +#usr/lib/python3*/*/*_d.so -- cgit v1.2.3 From 957ea09a244c9d5f749f3973545a4d4b064998df Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 4 Apr 2011 12:11:52 +0200 Subject: * debian/rules: - Support the nocheck build option and ignore test failures on hurd (Closes: #610448) --- debian/changelog | 3 +++ debian/rules | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f97e2be2..adde1554 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,9 @@ python-apt (0.7.100.3) UNRELEASED; urgency=low - Package records 'Package' field now corresponds to shortname * debian/python3-apt-dbg.install - Do not try to install old-style debugging files. + * debian/rules: + - Support the nocheck build option and ignore test failures on hurd + (Closes: #610448) [ Scott Kitterman ] * Override override_dh_auto_install to install python3 extensions in the diff --git a/debian/rules b/debian/rules index d020e901..6425c78c 100755 --- a/debian/rules +++ b/debian/rules @@ -37,10 +37,15 @@ override_dh_strip: override_dh_compress: dh_compress -X.js -X_static/* -X _sources/* -X_sources/*/* -X.inv +# We ignore failures on hurd, since its locking is broken override_dh_auto_test: +ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) set -e; for python in $(shell pyversions -r); do \ - $$python tests/test_all.py -q; \ + $$python tests/test_all.py -q || [ "$(DEB_BUILD_ARCH_OS)" = "hurd" ]; \ done; +else + @echo "** tests disabled" +endif override_dh_python2: dh_python2 -N python-apt-common -- cgit v1.2.3 From 04441569dd064858680e44545c800774e6f1efb0 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 4 Apr 2011 12:41:12 +0200 Subject: Rework Python 3.2 patch Move Python 3 debug files before installing other files (Closes: #619528) --- debian/changelog | 4 +--- debian/python3-apt-dbg.files | 1 + debian/python3-apt-dbg.install | 1 - debian/python3-apt.install | 2 ++ debian/rules | 11 +++-------- 5 files changed, 7 insertions(+), 12 deletions(-) create mode 100644 debian/python3-apt-dbg.files delete mode 100644 debian/python3-apt-dbg.install diff --git a/debian/changelog b/debian/changelog index adde1554..8b5f439b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,11 +28,9 @@ python-apt (0.7.100.3) UNRELEASED; urgency=low * debian/rules: - Support the nocheck build option and ignore test failures on hurd (Closes: #610448) + - Move Python 3 debug files before installing other files (Closes: #619528) [ Scott Kitterman ] - * Override override_dh_auto_install to install python3 extensions in the - correct locations (Closes: #619528) - - Drop .so files from python3-apt.install * Removed ${python:Breaks} - No longer used in dh_python2 -- Julian Andres Klode Mon, 04 Apr 2011 09:48:10 +0200 diff --git a/debian/python3-apt-dbg.files b/debian/python3-apt-dbg.files new file mode 100644 index 00000000..88cbfcb0 --- /dev/null +++ b/debian/python3-apt-dbg.files @@ -0,0 +1 @@ +usr/lib/python3*/*/*d*.so diff --git a/debian/python3-apt-dbg.install b/debian/python3-apt-dbg.install deleted file mode 100644 index 64fd1842..00000000 --- a/debian/python3-apt-dbg.install +++ /dev/null @@ -1 +0,0 @@ -#usr/lib/python3*/*/*_d.so diff --git a/debian/python3-apt.install b/debian/python3-apt.install index 6335f751..352d102b 100644 --- a/debian/python3-apt.install +++ b/debian/python3-apt.install @@ -1,2 +1,4 @@ +usr/lib/python3*/*/apt_pkg*.so +usr/lib/python3*/*/apt_inst*.so usr/lib/python3*/*/*/ usr/lib/python3*/*/*.egg-info diff --git a/debian/rules b/debian/rules index 6425c78c..5428375d 100755 --- a/debian/rules +++ b/debian/rules @@ -11,14 +11,9 @@ export SHELL = env PATH=$(PATH) sh override_dh_auto_build: dh_auto_build -override_dh_auto_install: - for i in $(shell py3versions -r); do \ - $$i ./setup.py install --install-layout=deb --root $(CURDIR)/debian/python3-apt; \ - done - for i in $(shell py3versions -r); do \ - $$i-dbg ./setup.py install --install-layout=deb --root $(CURDIR)/debian/python3-apt-dbg; \ - done - dh_auto_install +override_dh_install: + dh_movefiles + dh_install override_dh_installdocs: set -e; if [ -z $(filter -a,$(DH_INTERNAL_OPTIONS)) ]; then \ -- cgit v1.2.3