[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#598432: python-apt: upgrade fails



tags 598432 + patch
thanks

[Piotr Ożarowski, 2010-09-29]
> I'll try to send you a patch this evening

attached

Luca: If python-apt maintainers will decide to use my patch, please
fast-process it in NEW if possible (it's part of the python3 in Squeeze
goal we talked about before, TIA)
diff -Nru python-apt-0.7.98/debian/changelog python-apt-0.7.98+nmu1/debian/changelog
--- python-apt-0.7.98/debian/changelog	2010-09-28 15:47:51.000000000 +0200
+++ python-apt-0.7.98+nmu1/debian/changelog	2010-09-29 18:23:59.000000000 +0200
@@ -1,3 +1,12 @@
+python-apt (0.7.98+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * 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
+
+ -- Piotr Ożarowski <piotr@debian.org>  Wed, 29 Sep 2010 18:23:25 +0200
+
 python-apt (0.7.98) unstable; urgency=low
 
   [ Michael Vogt ]
diff -Nru python-apt-0.7.98/debian/control python-apt-0.7.98+nmu1/debian/control
--- python-apt-0.7.98/debian/control	2010-09-07 14:03:20.000000000 +0200
+++ python-apt-0.7.98+nmu1/debian/control	2010-09-29 19:34:37.000000000 +0200
@@ -11,9 +11,9 @@
                libapt-pkg-dev (>= 0.8),
                python-all-dev,
                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-central (>= 0.6.16+nmu1),
                python-distutils-extra (>= 2.0),
                python-sphinx (>= 0.5),
                python-debian
@@ -22,10 +22,10 @@
 
 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}
+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 +82,52 @@
  .
  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 -Nru python-apt-0.7.98/debian/python3-apt-dbg.install python-apt-0.7.98+nmu1/debian/python3-apt-dbg.install
--- python-apt-0.7.98/debian/python3-apt-dbg.install	1970-01-01 01:00:00.000000000 +0100
+++ python-apt-0.7.98+nmu1/debian/python3-apt-dbg.install	2010-09-29 15:59:03.000000000 +0200
@@ -0,0 +1 @@
+usr/lib/python3*/*/*_d.so
diff -Nru python-apt-0.7.98/debian/python3-apt.install python-apt-0.7.98+nmu1/debian/python3-apt.install
--- python-apt-0.7.98/debian/python3-apt.install	1970-01-01 01:00:00.000000000 +0100
+++ python-apt-0.7.98+nmu1/debian/python3-apt.install	2010-09-29 16:17:19.000000000 +0200
@@ -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 -Nru python-apt-0.7.98/debian/python-apt-common.install python-apt-0.7.98+nmu1/debian/python-apt-common.install
--- python-apt-0.7.98/debian/python-apt-common.install	1970-01-01 01:00:00.000000000 +0100
+++ python-apt-0.7.98+nmu1/debian/python-apt-common.install	2010-09-29 16:17:10.000000000 +0200
@@ -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 -Nru python-apt-0.7.98/debian/python-apt-common.lintian-overrides python-apt-0.7.98+nmu1/debian/python-apt-common.lintian-overrides
--- python-apt-0.7.98/debian/python-apt-common.lintian-overrides	1970-01-01 01:00:00.000000000 +0100
+++ python-apt-0.7.98+nmu1/debian/python-apt-common.lintian-overrides	2010-09-29 19:37:37.000000000 +0200
@@ -0,0 +1,2 @@
+# package depends on python | python3
+python-script-but-no-python-dep ./usr/share/python-apt/migrate-0.8.py
diff -Nru python-apt-0.7.98/debian/python-apt-dbg.install python-apt-0.7.98+nmu1/debian/python-apt-dbg.install
--- python-apt-0.7.98/debian/python-apt-dbg.install	2010-02-18 22:10:31.000000000 +0100
+++ python-apt-0.7.98+nmu1/debian/python-apt-dbg.install	2010-09-29 15:58:44.000000000 +0200
@@ -1 +1 @@
-usr/lib/python*/*/*_d.so
+usr/lib/python2.*/*/*_d.so
diff -Nru python-apt-0.7.98/debian/python-apt.install python-apt-0.7.98+nmu1/debian/python-apt.install
--- python-apt-0.7.98/debian/python-apt.install	2010-05-06 15:26:06.000000000 +0200
+++ python-apt-0.7.98+nmu1/debian/python-apt.install	2010-09-29 16:17:31.000000000 +0200
@@ -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 -Nru python-apt-0.7.98/debian/rules python-apt-0.7.98+nmu1/debian/rules
--- python-apt-0.7.98/debian/rules	2010-07-09 22:25:22.000000000 +0200
+++ python-apt-0.7.98+nmu1/debian/rules	2010-09-29 19:35:08.000000000 +0200
@@ -7,7 +7,7 @@
 export SHELL = env PATH=$(PATH) sh
 
 %:
-	dh --with python-central $@
+	dh --with python-central,python3 $@
 
 override_dh_auto_build:
 	dh_auto_build
@@ -18,10 +18,13 @@
 		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
@@ -32,4 +35,4 @@
 	done;
 
 override_dh_pycentral:
-	dh_pycentral --exclude=migrate-0.8.py
+	dh_pycentral -N python-apt-common

Attachment: signature.asc
Description: Digital signature


Reply to: