merged from debian-sid

9 files changed, 104 insertions, 21 deletions

diff --git a/debian/changelog b/debian/changelog
index a198781b..8c8613d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+python-apt (0.7.100) unstable; urgency=low
+
+  * Final 0.7.100 release; targeted at Squeeze.
+  * apt/debfile.py:
+    - Replace (undocumented) use of python-debian debfile.DebFile API with
+      the equivalent apt_inst.DebFile API (Closes: #603043)
+  * apt/package.py:
+    - Fix docstring of Package.mark_delete() (Closes: #599042)
+  * doc:
+    - Various documentation updates.
+    - The C++ API/ABI is stable now.
+  * po
+    - Update sl.po (Closes: #603359)
+
+ -- Julian Andres Klode <jak@debian.org>  Wed, 17 Nov 2010 16:53:55 +0100
+
+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 <mvo@debian.org>  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