diff options
| author | Julian Andres Klode <jak@debian.org> | 2011-04-04 12:41:12 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2011-04-04 12:41:12 +0200 |
| commit | 04441569dd064858680e44545c800774e6f1efb0 (patch) | |
| tree | 89e868900870ff0c5a30435ca36a8962dcc53c81 | |
| parent | 957ea09a244c9d5f749f3973545a4d4b064998df (diff) | |
| download | python-apt-04441569dd064858680e44545c800774e6f1efb0.tar.gz | |
Rework Python 3.2 patch
Move Python 3 debug files before installing other files (Closes: #619528)
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/python3-apt-dbg.files | 1 | ||||
| -rw-r--r-- | debian/python3-apt-dbg.install | 1 | ||||
| -rw-r--r-- | debian/python3-apt.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 11 |
5 files changed, 7 insertions, 12 deletions
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 <jak@debian.org> 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 \ |