From 195685f96ff84370722026c33b6f864b3746db28 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 23 Aug 2010 10:16:30 +0200 Subject: * po/pt_BR.po: - updated, thanks to Sergio Cipolla --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3906c485..94eebdf2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ python-apt (0.7.97) UNRELEASED; urgency=low - add binding for the "dump()" method to configruation objects * apt/debfile.py: - fix crash in DscFile handling and add regression test + * po/pt_BR.po: + - updated, thanks to Sergio Cipolla -- Julian Andres Klode Fri, 23 Jul 2010 16:14:39 +0200 -- cgit v1.2.3 From 4ed69e597c387b379629ea3dc40e54e6a8a78b8a Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 26 Aug 2010 12:17:17 +0200 Subject: * debian/control: - Adapt to new Python 3 handling (Closes: #593042) --- debian/changelog | 2 ++ debian/control | 15 +++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 94eebdf2..68789fce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ python-apt (0.7.97) UNRELEASED; urgency=low - Bind pkgAcquire::Item::StatTransientNetworkError (Closes: #589010) * doc/library/apt_pkg.rst: - Document Configuration.dump(). + * debian/control: + - Adapt to new Python 3 handling (Closes: #593042) [ Michael Vogt ] * python/configuration.cc: diff --git a/debian/control b/debian/control index a3decb78..ca293f40 100644 --- a/debian/control +++ b/debian/control @@ -4,16 +4,15 @@ Priority: standard Maintainer: APT Development Team Uploaders: Michael Vogt , Julian Andres Klode Standards-Version: 3.8.4 -XS-Python-Version: 2.5, 2.6, 3.1 +XS-Python-Version: >= 2.5 +X-Python3-Version: >= 3.1 Build-Depends: apt-utils, debhelper (>= 7.3.5), libapt-pkg-dev (>= 0.7.22~), - python2.5-dbg, - python2.5-dev, - python2.6-dev, - python2.6-dbg, - python3.1-dev, - python3.1-dbg, + python-all-dev, + python-all-dbg, + python3-all-dev (>= 3.1.2-6~), + python3-all-dbg (>= 3.1.2-6~), python-central (>= 0.5), python-distutils-extra (>= 2.0), python-sphinx (>= 0.5) @@ -25,7 +24,7 @@ Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} Recommends: lsb-release, iso-codes, python2.6 Breaks: debdelta (<< 0.28~), packagekit-backend-apt (<= 0.4.8-0ubuntu4) -Provides: ${python:Provides} +Provides: python3-apt, ${python:Provides} Suggests: python-apt-dbg, python-gtk2, python-vte, python-apt-doc XB-Python-Version: ${python:Versions} Description: Python interface to libapt-pkg -- cgit v1.2.3 From 32a6c32adb02ec4036ebc11890d795679ed0eadc Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 26 Aug 2010 12:19:10 +0200 Subject: Build-depend on APT >= 0.8 to get gzip compression enabled (optional, can be reverted for backports) --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 68789fce..380e66cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ python-apt (0.7.97) UNRELEASED; urgency=low - Document Configuration.dump(). * debian/control: - Adapt to new Python 3 handling (Closes: #593042) + - Build-depend on APT >= 0.8 to get gzip compression enabled (optional, + can be reverted for backports) [ Michael Vogt ] * python/configuration.cc: diff --git a/debian/control b/debian/control index ca293f40..2d3d1b70 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ XS-Python-Version: >= 2.5 X-Python3-Version: >= 3.1 Build-Depends: apt-utils, debhelper (>= 7.3.5), - libapt-pkg-dev (>= 0.7.22~), + libapt-pkg-dev (>= 0.8), python-all-dev, python-all-dbg, python3-all-dev (>= 3.1.2-6~), -- cgit v1.2.3 From 58675fd6d67c11fde570cac02031a7eecf9916d5 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 26 Aug 2010 12:23:09 +0200 Subject: * Merge translation updates: - pt_BR.po by Sérgio Cipolla (Closes: #593754) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 380e66cb..5669642b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,7 +22,7 @@ python-apt (0.7.97) UNRELEASED; urgency=low * apt/debfile.py: - fix crash in DscFile handling and add regression test * po/pt_BR.po: - - updated, thanks to Sergio Cipolla + - updated, thanks to Sergio Cipolla (Closes: #593754) -- Julian Andres Klode Fri, 23 Jul 2010 16:14:39 +0200 -- cgit v1.2.3 From a3d187201040910d662bc7d469d946034f4d3d75 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 26 Aug 2010 12:32:48 +0200 Subject: Set Standards-Version to 3.9.1 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5669642b..7190f63d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ python-apt (0.7.97) UNRELEASED; urgency=low - Adapt to new Python 3 handling (Closes: #593042) - Build-depend on APT >= 0.8 to get gzip compression enabled (optional, can be reverted for backports) + - Set Standards-Version to 3.9.1 [ Michael Vogt ] * python/configuration.cc: diff --git a/debian/control b/debian/control index 2d3d1b70..842f32fb 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python Priority: standard Maintainer: APT Development Team Uploaders: Michael Vogt , Julian Andres Klode -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 XS-Python-Version: >= 2.5 X-Python3-Version: >= 3.1 Build-Depends: apt-utils, -- cgit v1.2.3 From 0b0ab7a7f24f2d95e68c1e94e27feef7bc0fd13c Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 26 Aug 2010 12:32:54 +0200 Subject: Upload to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7190f63d..068cf379 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.97) UNRELEASED; urgency=low +python-apt (0.7.97) unstable; urgency=low [ Julian Andres Klode ] * python/tag.cc: @@ -25,7 +25,7 @@ python-apt (0.7.97) UNRELEASED; urgency=low * po/pt_BR.po: - updated, thanks to Sergio Cipolla (Closes: #593754) - -- Julian Andres Klode Fri, 23 Jul 2010 16:14:39 +0200 + -- Julian Andres Klode Thu, 26 Aug 2010 12:32:54 +0200 python-apt (0.7.96.1) unstable; urgency=low -- cgit v1.2.3 From 1da80475cabf37da411aff8983d427773cfc0a80 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 26 Aug 2010 14:08:02 +0200 Subject: * tests/test_apt_cache.py: - Do not insert ".." into sys.path, fixes FTBFS --- debian/changelog | 7 +++++++ tests/test_apt_cache.py | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 068cf379..1c9598fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.7.97.1) unstable; urgency=low + + * tests/test_apt_cache.py: + - Do not insert ".." into sys.path, fixes FTBFS + + -- Julian Andres Klode Thu, 26 Aug 2010 14:08:01 +0200 + python-apt (0.7.97) unstable; urgency=low [ Julian Andres Klode ] diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index a43e92d2..81d64bc6 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -10,8 +10,9 @@ import os import tempfile import unittest +from test_all import get_library_dir import sys -sys.path.insert(0, "..") +sys.path.insert(0, get_library_dir()) import apt import apt_pkg -- cgit v1.2.3 From 8cd715add7f85fb67cc30e42449d83a2ef7cf0bd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 27 Aug 2010 11:22:47 +0200 Subject: * apt/debfile.py: - add missing init for _installed_conflicts (LP: #618597) --- apt/debfile.py | 1 + debian/changelog | 8 ++++++++ 2 files changed, 9 insertions(+) (limited to 'debian') diff --git a/apt/debfile.py b/apt/debfile.py index 33f0f04d..9bf27da3 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -598,6 +598,7 @@ class DscSrcPackage(DebPackage): self.filename = filename self._depends = [] self._conflicts = [] + self._installed_conflicts = set() self.pkgname = "" self.binaries = [] if self.filename is not None: diff --git a/debian/changelog b/debian/changelog index 1c9598fb..6f3ea91e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-apt (0.7.97.2) UNRELEASED; urgency=low + + [ Michael Vogt ] + * apt/debfile.py: + - add missing init for _installed_conflicts (LP: #618597) + + -- Michael Vogt Fri, 27 Aug 2010 11:22:23 +0200 + python-apt (0.7.97.1) unstable; urgency=low * tests/test_apt_cache.py: -- cgit v1.2.3 From e381c072e22a8117f1310997a328dc0d4ffeab8d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 31 Aug 2010 17:13:59 +0200 Subject: debian/changelog: add missing changelog entry --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5e16f349..616404e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ python-apt (0.7.97.2) UNRELEASED; urgency=low [ Michael Vogt ] + * python/acquire.cc: + - return long long when calling TotalNeeded(), FetchNeeded() and + PartialPresent() from pkgAcquire(). This follows the change + in libapt. * apt/debfile.py: - add missing init for _installed_conflicts (LP: #618597) * add "provides" property to the apt.Version objects -- cgit v1.2.3 From ec2fa33ed76e14e14d9c7d78f008147c6e10475c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 28 Sep 2010 16:18:38 +0200 Subject: releasing version 0.7.98 --- debian/changelog | 4 ++-- tests/test_aptsources.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d5a3e31f..b78a58af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.98) UNRELEASED; urgency=low +python-apt (0.7.98) unstable; urgency=low [ Michael Vogt ] * python/acquire.cc: @@ -38,7 +38,7 @@ python-apt (0.7.98) UNRELEASED; urgency=low * apt/debfile: - don't fail if we conflict with the pkgs we are reinstalling - -- Michael Vogt Fri, 27 Aug 2010 11:22:23 +0200 + -- Michael Vogt Tue, 28 Sep 2010 15:47:51 +0200 python-apt (0.7.97.1) unstable; urgency=low diff --git a/tests/test_aptsources.py b/tests/test_aptsources.py index e56761f3..331df935 100644 --- a/tests/test_aptsources.py +++ b/tests/test_aptsources.py @@ -20,6 +20,8 @@ class TestAptSources(unittest.TestCase): apt_pkg.config.set("Dir::Etc::sourceparts", "/xxx") if os.path.exists("./build/data/templates"): self.templates = os.path.abspath("./build/data/templates") + elif os.path.exists("../build/data/templates"): + self.templates = os.path.abspath("../build/data/templates") else: self.templates = "/usr/share/python-apt/templates/" -- cgit v1.2.3 From f524c86be889810aed2126834dade38badcbcde5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 29 Sep 2010 20:39:59 +0200 Subject: merged patch from Piotr, many thanks --- debian/changelog | 10 +++++ debian/control | 60 +++++++++++++++++++++++++++--- debian/python-apt-common.install | 4 ++ debian/python-apt-common.lintian-overrides | 2 + debian/python-apt-dbg.install | 2 +- debian/python-apt.install | 12 ++---- debian/python3-apt-dbg.install | 1 + debian/python3-apt.install | 4 ++ debian/rules | 14 ++++--- 9 files changed, 88 insertions(+), 21 deletions(-) create mode 100644 debian/python-apt-common.install create mode 100644 debian/python-apt-common.lintian-overrides create mode 100644 debian/python3-apt-dbg.install create mode 100644 debian/python3-apt.install (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b78a58af..008ff99e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +python-apt (0.7.98.1) unstable; urgency=low + + [ Piotr Ozarowski ] + * Use dh_python3 to handle Python 3 files + - bump minimum required versions of python-central and python3-all-dev + - add new python3-apt, python3-apt-bdg and python-common binary packages + * Replace python-central with dh_python2 + + -- Michael Vogt Wed, 29 Sep 2010 20:38:25 +0200 + python-apt (0.7.98) unstable; urgency=low [ Michael Vogt ] diff --git a/debian/control b/debian/control index d478a30d..2e5226af 100644 --- a/debian/control +++ b/debian/control @@ -9,11 +9,10 @@ X-Python3-Version: >= 3.1 Build-Depends: apt-utils, debhelper (>= 7.3.5), libapt-pkg-dev (>= 0.8), - python-all-dev, + python-all-dev (>= 2.6.6-3~), python-all-dbg, - python3-all-dev (>= 3.1.2-6~), + python3-all-dev (>= 3.1.2-10~), python3-all-dbg (>= 3.1.2-6~), - python-central (>= 0.5), python-distutils-extra (>= 2.0), python-sphinx (>= 0.5), python-debian @@ -22,10 +21,10 @@ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes Package: python-apt Architecture: any -Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} +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) -Provides: python3-apt, ${python:Provides} +Breaks: debdelta (<< 0.28~), packagekit-backend-apt (<= 0.4.8-0ubuntu4), ${python:Breaks} +Provides: ${python:Provides} Suggests: python-apt-dbg, python-gtk2, python-vte, python-apt-doc XB-Python-Version: ${python:Versions} Description: Python interface to libapt-pkg @@ -82,3 +81,52 @@ Description: Python interface to libapt-pkg (development files) . This package contains the header files needed to use python-apt objects from C++ applications. + +Package: python-apt-common +Priority: optional +Architecture: all +Depends: ${misc:Depends}, python | python3 +Enhances: python-apt, python3-apt +Breaks: python-apt (<< 0.7.98+nmu1) +Description: Python interface to libapt-pkg (locales) + The apt_pkg Python interface will provide full access to the internal + libapt-pkg structures allowing Python programs to easily perform a + variety of functions. + . + This package contains locales. + +Package: python3-apt +Architecture: any +Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common +Recommends: lsb-release, iso-codes +Provides: ${python3:Provides} +Suggests: python3-apt-dbg, python-apt-doc +Breaks: python-apt (<< 0.7.98+nmu1) +Replaces: python-apt (<< 0.7.98+nmu1) +Description: Python 3 interface to libapt-pkg + The apt_pkg Python 3 interface will provide full access to the internal + libapt-pkg structures allowing Python 3 programs to easily perform a + variety of functions, such as: + . + - Access to the APT configuration system + - Access to the APT package information database + - Parsing of Debian package control files, and other files with a + similar structure + . + The included 'aptsources' Python interface provides an abstraction of + the sources.list configuration on the repository and the distro level. + +Package: python3-apt-dbg +Priority: extra +Architecture: any +Section: debug +Breaks: python-apt (<< 0.7.98+nmu1) +Depends: python3-dbg, python3-apt (= ${binary:Version}), ${shlibs:Depends}, + ${misc:Depends} +Description: Python 3 interface to libapt-pkg (debug extension) + The apt_pkg Python 3 interface will provide full access to the internal + libapt-pkg structures allowing Python 3 programs to easily perform a + variety of functions. + . + This package contains the extension built for the Python debug interpreter. + diff --git a/debian/python-apt-common.install b/debian/python-apt-common.install new file mode 100644 index 00000000..bea48037 --- /dev/null +++ b/debian/python-apt-common.install @@ -0,0 +1,4 @@ +usr/share/locale +usr/share/python-apt +# Install the migration helper +utils/migrate-0.8.py usr/share/python-apt diff --git a/debian/python-apt-common.lintian-overrides b/debian/python-apt-common.lintian-overrides new file mode 100644 index 00000000..3ae30560 --- /dev/null +++ b/debian/python-apt-common.lintian-overrides @@ -0,0 +1,2 @@ +# package depends on python | python3 +python-script-but-no-python-dep ./usr/share/python-apt/migrate-0.8.py diff --git a/debian/python-apt-dbg.install b/debian/python-apt-dbg.install index 1bbba721..91faafc7 100644 --- a/debian/python-apt-dbg.install +++ b/debian/python-apt-dbg.install @@ -1 +1 @@ -usr/lib/python*/*/*_d.so +usr/lib/python2.*/*/*_d.so diff --git a/debian/python-apt.install b/debian/python-apt.install index 29028531..0d713e3c 100644 --- a/debian/python-apt.install +++ b/debian/python-apt.install @@ -1,8 +1,4 @@ -usr/lib/python*/*/apt_pkg.so -usr/lib/python*/*/apt_inst.so -usr/lib/python*/*/*/ -usr/lib/python*/*/*.egg-info -usr/share/locale -usr/share/python-apt -# Install the migration helper -utils/migrate-0.8.py usr/share/python-apt +usr/lib/python2.*/*/apt_pkg.so +usr/lib/python2.*/*/apt_inst.so +usr/lib/python2.*/*/*/ +usr/lib/python2.*/*/*.egg-info diff --git a/debian/python3-apt-dbg.install b/debian/python3-apt-dbg.install new file mode 100644 index 00000000..011ab164 --- /dev/null +++ b/debian/python3-apt-dbg.install @@ -0,0 +1 @@ +usr/lib/python3*/*/*_d.so diff --git a/debian/python3-apt.install b/debian/python3-apt.install new file mode 100644 index 00000000..16c3317a --- /dev/null +++ b/debian/python3-apt.install @@ -0,0 +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 f7cca130..a38b4605 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,12 @@ #!/usr/bin/make -f # Should be include-links, but that somehow fails. -export DH_PYCENTRAL=nomove export DEBVER=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') export CFLAGS=-Wno-write-strings -DCOMPAT_0_7 export PATH :=$(CURDIR)/utils:$(PATH) export SHELL = env PATH=$(PATH) sh %: - dh --with python-central $@ + dh --with python2,python3 $@ override_dh_auto_build: dh_auto_build @@ -18,10 +17,13 @@ override_dh_installdocs: dh_installdirs -ppython-apt-doc usr/share/doc/python-apt; \ fi dh_installdirs -ppython-apt-dev usr/share/doc/python-apt - dh_installdocs --link-doc=python-apt + dh_installdocs -Npython-apt-common -Npython3-apt -Npython3-apt-dbg --link-doc=python-apt + dh_installdocs -p python3-apt -p python3-apt-dbg --link-doc=python3-apt + dh_installdocs -p python-apt-common override_dh_strip: - dh_strip --dbg-package=python-apt-dbg + dh_strip -p python-apt --dbg-package=python-apt-dbg + dh_strip -p python3-apt --dbg-package=python3-apt-dbg override_dh_compress: dh_compress -X.js -X_static/* -X _sources/* -X_sources/*/* -X.inv @@ -31,5 +33,5 @@ override_dh_auto_test: $$python tests/test_all.py -q; \ done; -override_dh_pycentral: - dh_pycentral --exclude=migrate-0.8.py +override_dh_python2: + dh_python2 -N python-apt-common -- cgit v1.2.3