diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-04-04 12:01:34 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-04-04 12:01:34 +0200 |
| commit | 3a4a11628a6f80c2caed9488219f19d52f923917 (patch) | |
| tree | 476e54d05220a6fe65594970b475507e90ebde40 /debian | |
| parent | 50ad561deddca0b239f67ce25fd9800e8bbe94a9 (diff) | |
| parent | 80e04f26777a5c7bd32b40a48f46f8d9f1c8aeb1 (diff) | |
| download | python-apt-3a4a11628a6f80c2caed9488219f19d52f923917.tar.gz | |
merged from debian-sid
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 20 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/python3-apt.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 9 |
4 files changed, 29 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 0aed50d9..b6c1945f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,25 @@ python-apt (0.7.100.3) UNRELEASED; urgency=low - add test for xz compression * update priority of python3-apt to match the archive - -- Michael Vogt <mvo@debian.org> Mon, 21 Mar 2011 15:46:50 +0100 + [ Julian Andres Klode ] + * python/cache.cc: + - Add Package.get_fullname() and Package.architecture + * apt/cache.py, apt/package.py: + - Add architecture property to apt.Package (LP: #703472) + - Change apt.Package.name to use get_fullname(pretty=True) (LP: #740072) + * tests/test_debfile.py: + - Disable multi-arch for the test, it fails when run via test_all.py + - Fix mixed tab/spaces indentation in xz test + * tests/test_apt_cache.py: + - Package records 'Package' field now corresponds to shortname + + [ 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 python-apt (0.7.100.2) unstable; urgency=low diff --git a/debian/control b/debian/control index c434e35b..9985a685 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Package: python-apt Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common Recommends: lsb-release, iso-codes, python2.6 -Breaks: debdelta (<< 0.28~), packagekit-backend-apt (<= 0.4.8-0ubuntu4), ${python:Breaks} +Breaks: debdelta (<< 0.28~), packagekit-backend-apt (<= 0.4.8-0ubuntu4) Provides: ${python:Provides} Suggests: python-apt-dbg, python-gtk2, python-vte, python-apt-doc XB-Python-Version: ${python:Versions} diff --git a/debian/python3-apt.install b/debian/python3-apt.install index 352d102b..6335f751 100644 --- a/debian/python3-apt.install +++ b/debian/python3-apt.install @@ -1,4 +1,2 @@ -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 a38b4605..d020e901 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,15 @@ 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_installdocs: set -e; if [ -z $(filter -a,$(DH_INTERNAL_OPTIONS)) ]; then \ python setup.py build_sphinx; \ |