diff -Nru dh-python-1.20140128/debian/changelog dh-python-1.20140128/debian/changelog --- dh-python-1.20140128/debian/changelog 2015-11-26 20:37:17.000000000 +0000 +++ dh-python-1.20140128/debian/changelog 2014-03-27 20:13:15.000000000 +0000 @@ -1,24 +1,17 @@ -dh-python (1.20140128-1ubuntu8.2~precise1) precise; urgency=medium +dh-python (1.20140128-1ubuntu8~ctools1) precise; urgency=medium - * Source backport to precise + * Backport for Ubuntu Cloud Archive, based on Debian Wheezy backports: + - Replace libpython3-stdlib build dependency with python3.2 + - Update default/supported Python versions (in a fallback code, + if python_defaults missing) + - Use dpkg-divert to replace python3's dh_python3 and python's dh_python2 + and drop Breaks/Replaces + - Remove the diversions on removal. + - Patch rtupdate calls for compatibility with Ubuntu py3clean. + - d/p/align-12.04-python-versions.patch: Align python/python3 versions + with those in Ubuntu 12.04. - -- Michael Jeanson Thu, 26 Nov 2015 15:36:41 -0500 - -dh-python (1.20140128-1ubuntu8.2) trusty; urgency=medium - - * Ensure that != dependencies are correctly parsed, avoiding generation - of broken binary package dependencies (LP: #1475375): - - d/p/fix-not-equals-parsing.patch: Cherry pick fix from Debian - bug tracker. - - -- James Page Thu, 16 Jul 2015 17:38:15 +0100 - -dh-python (1.20140128-1ubuntu8.1) trusty; urgency=medium - - * Ensure that argparse dependencies are correctly resolved to - python3 (>= 3.2) for Python 3 (LP: #1467463). - - -- James Page Mon, 22 Jun 2015 13:08:31 +0100 + -- James Page Thu, 27 Mar 2014 14:51:17 +0000 dh-python (1.20140128-1ubuntu8) trusty; urgency=medium @@ -52,12 +45,42 @@ -- Dmitry Shachnev Thu, 27 Feb 2014 11:56:50 +0400 +dh-python (1.20140128-1ubuntu2~cloud0) precise-icehouse; urgency=medium + + * Backport for Ubuntu Cloud Archive, based on Debian Wheezy backports: + - Replace libpython3-stdlib build dependency with python3.2 + - Update default/supported Python versions (in a fallback code, + if python_defaults missing) + - Use dpkg-divert to replace python3's dh_python3 and python's dh_python2 + and drop Breaks/Replaces + - Remove the diversions on removal. + - Patch rtupdate calls for compatibility with Ubuntu py3clean. + - d/p/align-12.04-python-versions.patch: Align python/python3 versions + with those in Ubuntu 12.04. + + -- James Page Mon, 24 Feb 2014 10:57:21 +0000 + dh-python (1.20140128-1ubuntu2) trusty; urgency=medium * Remove empty directories when moving files. -- Matthias Klose Wed, 12 Feb 2014 15:14:23 +0100 +dh-python (1.20140128-1ubuntu1~cloud0) precise-icehouse; urgency=medium + + * Backport for Ubuntu Cloud Archive, based on Debian Wheezy backports: + - Replace libpython3-stdlib build dependency with python3.2 + - Update default/supported Python versions (in a fallback code, + if python_defaults missing) + - Use dpkg-divert to replace python3's dh_python3 and python's dh_python2 + and drop Breaks/Replaces + - Remove the diversions on removal. + - Patch rtupdate calls for compatibility with Ubuntu py3clean. + - d/p/align-12.04-python-versions.patch: Align python/python3 versions + with those in Ubuntu 12.04. + + -- James Page Mon, 10 Feb 2014 11:06:06 +0200 + dh-python (1.20140128-1ubuntu1) trusty; urgency=medium * Merge with Debian unstable, remaining changes: @@ -101,6 +124,21 @@ -- Matthias Klose Tue, 07 Jan 2014 23:11:01 +0100 +dh-python (1.20131021-1ubuntu7~cloud0) precise-icehouse; urgency=medium + + * Backport for Ubuntu Cloud Archive, based on Debian Wheezy backports: + - Replace libpython3-stdlib build dependency with python3.2 + - Update default/supported Python versions (in a fallback code, + if python_defaults missing) + - Use dpkg-divert to replace python3's dh_python3 and python's dh_python2 + and drop Breaks/Replaces + - Remove the diversions on removal. + - Patch rtupdate calls for compatibility with Ubuntu py3clean. + - d/p/align-12.04-python-versions.patch: Align python/python3 versions + with those in Ubuntu 12.04. + + -- James Page Mon, 06 Jan 2014 14:23:02 +0000 + dh-python (1.20131021-1ubuntu7) trusty; urgency=medium * Fix dhpython/_defaults.py. Still doesn't rename 3.4 extensions @@ -134,6 +172,21 @@ -- Matthias Klose Sat, 07 Dec 2013 19:32:35 +0100 +dh-python (1.20131021-1ubuntu2~cloud0) precise-icehouse; urgency=low + + * Backport for Ubuntu Cloud Archive, based on Debian Wheezy backports: + - Replace libpython3-stdlib build dependency with python3.2 + - Update default/supported Python versions (in a fallback code, + if python_defaults missing) + - Use dpkg-divert to replace python3's dh_python3 and python's dh_python2 + and drop Breaks/Replaces + - Remove the diversions on removal. + - Patch rtupdate calls for compatibility with Ubuntu py3clean. + - d/p/align-12.04-python-versions.patch: Align python/python3 versions + with those in Ubuntu 12.04. + + -- James Page Mon, 09 Dec 2013 08:57:53 +0000 + dh-python (1.20131021-1ubuntu2) trusty; urgency=low * Add drop_nonexisting_versions.patch: In tests/Makefile, drop Python 2.6 @@ -174,6 +227,26 @@ -- Piotr Ożarowski Thu, 17 Oct 2013 22:24:25 +0200 +dh-python (1.20131003-1~cloud1) precise-icehouse; urgency=low + + * d/p/align-12.04-python-versions.patch: Align python/python3 versions + with those in Ubuntu 12.04. + + -- James Page Thu, 05 Dec 2013 10:25:52 +0000 + +dh-python (1.20131003-1~cloud0) precise-icehouse; urgency=low + + * Backport for Ubuntu Cloud Archive, based on Debian Wheezy backports. + - Replace libpython3-stdlib build dependency with python3.2 + - Update default/supported Python versions (in a fallback code, + if python_defaults missing) + - Use dpkg-divert to replace python3's dh_python3 and python's dh_python2 + and drop Breaks/Replaces + - Remove the diversions on removal. + - Patch rtupdate calls for compatibility with Ubuntu py3clean. + + -- James Page Wed, 04 Dec 2013 14:33:02 +0000 + dh-python (1.20131003-1) unstable; urgency=low * Revert python-docutils build dependency change (to avoid circular diff -Nru dh-python-1.20140128/debian/control dh-python-1.20140128/debian/control --- dh-python-1.20140128/debian/control 2014-03-10 10:56:25.000000000 +0000 +++ dh-python-1.20140128/debian/control 2014-03-27 20:04:47.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Piotr Ożarowski Uploaders: Stefano Rivera , Barry Warsaw -Build-Depends: debhelper (>= 9), python3-minimal, libpython3-stdlib, +Build-Depends: debhelper (>= 9), python3-minimal, python3.2, # provides rst2man command (python3-docutils not used to avoid circular deps): python-docutils Standards-Version: 3.9.5 @@ -15,12 +15,8 @@ Package: dh-python Architecture: all +Depends: ${misc:Depends}, ${python3:Depends}, python3 (>= 3.2.3-0~) Multi-Arch: foreign -Depends: ${misc:Depends}, ${python3:Depends} -Breaks: -# due to /usr/bin/dh_python3 and debhelper files - python3 (<< 3.3.2-4~) -Replaces: python3 (<< 3.3.2-4~) Description: Debian helper tools for packaging Python libraries and applications This package contains: * pybuild - invokes various build systems for requested Python versions in diff -Nru dh-python-1.20140128/debian/links dh-python-1.20140128/debian/links --- dh-python-1.20140128/debian/links 2014-03-10 10:56:25.000000000 +0000 +++ dh-python-1.20140128/debian/links 2014-03-27 20:04:47.000000000 +0000 @@ -1,4 +1,4 @@ /usr/share/dh-python/pybuild /usr/bin/pybuild /usr/share/dh-python/dh_pypy /usr/bin/dh_pypy -#/usr/share/dh-python/dh_python2 /usr/bin/dh_python2 +/usr/share/dh-python/dh_python2 /usr/bin/dh_python2 /usr/share/dh-python/dh_python3 /usr/bin/dh_python3 diff -Nru dh-python-1.20140128/debian/manpages dh-python-1.20140128/debian/manpages --- dh-python-1.20140128/debian/manpages 2014-03-10 10:56:25.000000000 +0000 +++ dh-python-1.20140128/debian/manpages 2014-03-27 20:04:47.000000000 +0000 @@ -1,4 +1,4 @@ pybuild.1 dh_pypy.1 -#dh_python2.1 +dh_python2.1 dh_python3.1 diff -Nru dh-python-1.20140128/debian/patches/align-12.04-python-versions.patch dh-python-1.20140128/debian/patches/align-12.04-python-versions.patch --- dh-python-1.20140128/debian/patches/align-12.04-python-versions.patch 1970-01-01 00:00:00.000000000 +0000 +++ dh-python-1.20140128/debian/patches/align-12.04-python-versions.patch 2014-03-27 20:04:47.000000000 +0000 @@ -0,0 +1,13 @@ +--- a/dhpython/__init__.py ++++ b/dhpython/__init__.py +@@ -25,8 +25,8 @@ PKG_PREFIX_MAP = {'cpython2': 'python', + 'pypy': 'pypy'} + + # minimum version required for compile/clean scripts: +-MINPYCDEP = {'cpython2': 'python:any (>= 2.7.5-5~)', +- 'cpython3': 'python3:any (>= 3.3.2-2~)', ++MINPYCDEP = {'cpython2': 'python:any (>= 2.7.3-0ubuntu2~)', ++ 'cpython3': 'python3:any (>= 3.2.3-0ubuntu1~)', + 'pypy': 'pypy'} + + PUBLIC_DIR_RE = { diff -Nru dh-python-1.20140128/debian/patches/fix-not-equals-parsing.patch dh-python-1.20140128/debian/patches/fix-not-equals-parsing.patch --- dh-python-1.20140128/debian/patches/fix-not-equals-parsing.patch 2015-07-16 16:31:28.000000000 +0000 +++ dh-python-1.20140128/debian/patches/fix-not-equals-parsing.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -=== modified file 'dhpython/pydist.py' ---- a/dhpython/pydist.py -+++ b/dhpython/pydist.py -@@ -121,7 +121,7 @@ def guess_dependency(impl, req, version= - version = Version(version) - - # some upstreams have weird ideas for distribution name... -- name, rest = re.compile('([^><= \[]+)(.*)').match(req).groups() -+ name, rest = re.compile('([^!><= \[]+)(.*)').match(req).groups() - req = safe_name(name) + rest - - data = load(impl) diff -Nru dh-python-1.20140128/debian/patches/no-pyshared.diff dh-python-1.20140128/debian/patches/no-pyshared.diff --- dh-python-1.20140128/debian/patches/no-pyshared.diff 2014-03-10 10:56:25.000000000 +0000 +++ dh-python-1.20140128/debian/patches/no-pyshared.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -Index: b/dh_python2 -=================================================================== ---- a/dh_python2 -+++ b/dh_python2 -@@ -85,10 +85,13 @@ - share_2x(dir1, dir2, dc) - elif len(pubvers) == 1: - # TODO: remove this once file conflicts will not be needed anymore -- move_to_pyshared(interpreter.sitedir(package, pubvers[0])) -+ # for trusty: don't install into pyshared. -+ #move_to_pyshared(sitedir(pubvers[0], package)) -+ pass - -- for version in stats['ext_vers']: -- create_ext_links(interpreter.sitedir(package, version)) -+ # for trusty: don't install into pyshared. -+ #for version in stats['ext_vers']: -+ # create_ext_links(interpreter.sitedir(package, version)) - - if options.guess_versions and pubvers: - for version in get_requested_versions('cpython2', options.vrange): diff -Nru dh-python-1.20140128/debian/patches/py3clean_compat.patch dh-python-1.20140128/debian/patches/py3clean_compat.patch --- dh-python-1.20140128/debian/patches/py3clean_compat.patch 1970-01-01 00:00:00.000000000 +0000 +++ dh-python-1.20140128/debian/patches/py3clean_compat.patch 2014-03-27 20:04:47.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/dhpython/__init__.py ++++ b/dhpython/__init__.py +@@ -98,7 +98,7 @@ if [ "$1" = rtupdate ]; then + fi''', + 'cpython3': ''' + if [ "$1" = rtupdate ]; then +-\tpy3clean {pkg_arg} {dname} ++\tpy3clean {pkg_arg} + \tpy3compile {pkg_arg} {args} {dname} + fi''', + 'pypy': '' diff -Nru dh-python-1.20140128/debian/patches/python3-argparse.patch dh-python-1.20140128/debian/patches/python3-argparse.patch --- dh-python-1.20140128/debian/patches/python3-argparse.patch 2015-06-22 10:33:10.000000000 +0000 +++ dh-python-1.20140128/debian/patches/python3-argparse.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Description: Resolve argparse correctly -Author: James Page -Forwarded: not-needed -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/dh-python/+bug/1467463 - ---- dh-python-1.20140128.orig/pydist/cpython3_fallback -+++ dh-python-1.20140128/pydist/cpython3_fallback -@@ -1,4 +1,5 @@ - setuptools python3-pkg-resources -+argparse python3 (>= 3.2) - Attic attic - CDApplet cairo-dock-dbus-plug-in-interface-python - CDBashApplet cairo-dock-dbus-plug-in-interface-python diff -Nru dh-python-1.20140128/debian/patches/series dh-python-1.20140128/debian/patches/series --- dh-python-1.20140128/debian/patches/series 2015-07-16 16:29:23.000000000 +0000 +++ dh-python-1.20140128/debian/patches/series 2014-03-27 20:04:47.000000000 +0000 @@ -1,7 +1,4 @@ -no-pyshared.diff -python3.4.diff +update_default_and_supported_python_versions.patch +py3clean_compat.patch +align-12.04-python-versions.patch rmdirs.diff -no-python3.3.diff -no-python2.6.diff -python3-argparse.patch -fix-not-equals-parsing.patch diff -Nru dh-python-1.20140128/debian/patches/update_default_and_supported_python_versions.patch dh-python-1.20140128/debian/patches/update_default_and_supported_python_versions.patch --- dh-python-1.20140128/debian/patches/update_default_and_supported_python_versions.patch 1970-01-01 00:00:00.000000000 +0000 +++ dh-python-1.20140128/debian/patches/update_default_and_supported_python_versions.patch 2014-03-27 20:04:47.000000000 +0000 @@ -0,0 +1,21 @@ +Description: update default/supported Python versions in fallback code +Author: Piotr Ozarowski + +--- dh-python-1.20130819.orig/dhpython/_defaults.py ++++ dh-python-1.20130819/dhpython/_defaults.py +@@ -25,12 +25,12 @@ from os import environ + from subprocess import Popen, PIPE + + SUPPORTED = { +- 'cpython2': [(2, 7)], +- 'cpython3': [(3, 3)], ++ 'cpython2': [(2, 7, 2, 6)], ++ 'cpython3': [(3, 2)], + 'pypy': [(2, 0)]} + DEFAULT = { + 'cpython2': (2, 7), +- 'cpython3': (3, 3), ++ 'cpython3': (3, 2), + 'pypy': (2, 0)} + + log = logging.getLogger('dhpython') diff -Nru dh-python-1.20140128/debian/postrm dh-python-1.20140128/debian/postrm --- dh-python-1.20140128/debian/postrm 1970-01-01 00:00:00.000000000 +0000 +++ dh-python-1.20140128/debian/postrm 2014-03-27 20:04:47.000000000 +0000 @@ -0,0 +1,21 @@ +#!/bin/sh +set -e + +remove_divert() { + dpkg-divert --package dh-python --remove --rename \ + --divert /usr/bin/dh_python3.real /usr/bin/dh_python3 + dpkg-divert --package dh-python --remove --rename \ + --divert /usr/share/man/man1/dh_python3.real.1.gz /usr/share/man/man1/dh_python3.1.gz + dpkg-divert --package dh-python --remove --rename \ + --divert /usr/bin/dh_python2.real /usr/bin/dh_python2 + dpkg-divert --package dh-python --remove --rename \ + --divert /usr/share/man/man1/dh_python2.real.1.gz /usr/share/man/man1/dh_python2.1.gz +} + +if [ abort-upgrade = "$1" ] && dpkg --compare-versions "$2" lt '1.20131003-1~cloud0'; then + remove_divert +elif [ remove = "$1" -o abort-install = "$1" ]; then + remove_divert +fi + +#DEBHELPER# diff -Nru dh-python-1.20140128/debian/preinst dh-python-1.20140128/debian/preinst --- dh-python-1.20140128/debian/preinst 1970-01-01 00:00:00.000000000 +0000 +++ dh-python-1.20140128/debian/preinst 2014-03-27 20:04:47.000000000 +0000 @@ -0,0 +1,21 @@ +#!/bin/sh +set -e + +divert() { + dpkg-divert --package dh-python --add --rename \ + --divert /usr/bin/dh_python3.real /usr/bin/dh_python3 + dpkg-divert --package dh-python --add --rename \ + --divert /usr/share/man/man1/dh_python3.real.1.gz /usr/share/man/man1/dh_python3.1.gz + dpkg-divert --package dh-python --add --rename \ + --divert /usr/bin/dh_python2.real /usr/bin/dh_python2 + dpkg-divert --package dh-python --add --rename \ + --divert /usr/share/man/man1/dh_python2.real.1.gz /usr/share/man/man1/dh_python2.1.gz +} + +if [ install = "$1" ]; then + divert +elif [ upgrade = "$1" ] && dpkg --compare-versions "$2" lt '1.20131003-1~cloud0'; then + divert +fi + +#DEBHELPER# diff -Nru dh-python-1.20140128/debian/rules dh-python-1.20140128/debian/rules --- dh-python-1.20140128/debian/rules 2014-03-10 10:56:25.000000000 +0000 +++ dh-python-1.20140128/debian/rules 2014-03-27 20:04:47.000000000 +0000 @@ -16,5 +16,9 @@ rm debian/dh-python/usr/share/debhelper/autoscripts/postinst-pycompile rm debian/dh-python/usr/share/debhelper/autoscripts/prerm-pyclean rm debian/dh-python/usr/share/perl5/Debian/Debhelper/Sequence/python2.pm + # drop files shipped in python3 (and compatible with dh-python) + rm debian/dh-python/usr/share/debhelper/autoscripts/postinst-py3compile + rm debian/dh-python/usr/share/debhelper/autoscripts/prerm-py3clean + rm debian/dh-python/usr/share/perl5/Debian/Debhelper/Sequence/python3.pm # generate maintainer scripts, etc. ./dh_python3