debian/0000775000000000000000000000000012314057432007171 5ustar debian/changelog0000664000000000000000000002530612314057432011051 0ustar dh-python (1.20140128-1ubuntu8) trusty; urgency=medium * Add no-python2.6.diff: Fix test failures on checking for python2.6 specific bits. -- Martin Pitt Mon, 24 Mar 2014 17:36:23 +0100 dh-python (1.20140128-1ubuntu7) trusty; urgency=medium * Run tests with python3.4 instead of python3.3. -- Matthias Klose Mon, 24 Mar 2014 11:10:25 +0100 dh-python (1.20140128-1ubuntu5) trusty; urgency=medium * Drop Python 3.3 as a supported Python 3 version. -- Matthias Klose Sun, 23 Mar 2014 09:17:26 +0100 dh-python (1.20140128-1ubuntu4) trusty; urgency=medium * Update supported Python 3 versions in tests, to fix autopkgtest failure. -- Dmitry Shachnev Fri, 07 Mar 2014 22:53:55 +0400 dh-python (1.20140128-1ubuntu3) trusty; urgency=medium * Make dh-python autopkgtest depend on build-essential and fakeroot. -- Dmitry Shachnev Thu, 27 Feb 2014 11:56:50 +0400 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) trusty; urgency=medium * Merge with Debian unstable, remaining changes: - debian/control: Make dh-python Multi-Arch: foreign. - Add patch debian/patches/no-pyshare.diff: + Don't move files to /usr/share/pyshared anymore. + Don't create extension symlinks in /usr/lib/pyshared/pythonX.Y anymore. - Add patch debian/patches/python3.4.diff: + Add python3.4 as a supported version. -- Dmitry Shachnev Wed, 29 Jan 2014 17:24:45 +0400 dh-python (1.20140128-1) unstable; urgency=low * dh_python3, dh_pypy: add support for debian/package.pyremove files (closes: 730777) * dh_python3: add multiarch tuples to all already tagged extensions if when more than one Python 3 version is supported (closes: 733128) * Make sure only first line is taken into account while checking shebangs (closes: 732308) * Assume UTF-8 encoding also in non UTF-8 environments while opening text files (closes: 735370) * Mention in pybuild's manpage that disabling anything for python3 doesn't disable python3-dbg as well (closes: 735899) * pybuild's distutils build plugin: set install-scripts to /usr/bin by default * Test Python 2.7 only in test203 if /usr/bin/python2.6 is missing (closes: 727674) * Generate dependencies for minimum required interpreter version that are satisfied by alpha/beta/rc releases (i.e. generate ">= X.Y~") * pybuild build plugins: show executed command (not only in --verbose), closes: 733755 * Standards-Version bumped to 3.9.5 (no changes needed) -- Piotr Ożarowski Tue, 28 Jan 2014 18:20:19 +0100 dh-python (1.20131021-1ubuntu8) trusty; urgency=medium * Taken from upstream: dh_python3: add multiarch tuples to all already tagged extensions if when more than one Python 3 version is supported (closes: 733128). -- Matthias Klose Tue, 07 Jan 2014 23:11:01 +0100 dh-python (1.20131021-1ubuntu7) trusty; urgency=medium * Fix dhpython/_defaults.py. Still doesn't rename 3.4 extensions to the multiarch name. -- Matthias Klose Mon, 30 Dec 2013 20:55:17 +0100 dh-python (1.20131021-1ubuntu6) trusty; urgency=medium * Disable the correct failing test. -- Matthias Klose Sat, 21 Dec 2013 17:15:02 +0100 dh-python (1.20131021-1ubuntu5) trusty; urgency=low * Don't create extension symlinks in /usr/lib/pyshared/pythonX.Y anymore. * Disable nosetests in autopkg tests until these are fixed. * dhpython/_defaults.py: Add python3.4 as a supported version. -- Matthias Klose Sat, 21 Dec 2013 14:50:06 +0100 dh-python (1.20131021-1ubuntu4) trusty; urgency=medium * Don't move files to /usr/share/pyshared anymore. -- Matthias Klose Fri, 20 Dec 2013 00:39:05 +0100 dh-python (1.20131021-1ubuntu3) trusty; urgency=medium * Make the package Multi-Arch: foreign. -- Matthias Klose Sat, 07 Dec 2013 19:32:35 +0100 dh-python (1.20131021-1ubuntu2) trusty; urgency=low * Add drop_nonexisting_versions.patch: In tests/Makefile, drop Python 2.6 and 3.2 as supported, we do not have them in Debian and Ubuntu any more. (Closes: #727674) -- Martin Pitt Tue, 05 Nov 2013 08:52:12 +0100 dh-python (1.20131021-1ubuntu1) trusty; urgency=low * Add missing python3-all-dbg test dependency for debian/tests/nosetests. -- Martin Pitt Thu, 24 Oct 2013 09:44:27 +0200 dh-python (1.20131021-1) unstable; urgency=low * dh_python2: fix renaming debug extensions with multiarch tuples -- Piotr Ożarowski Mon, 21 Oct 2013 20:52:04 +0200 dh-python (1.20131017-1) unstable; urgency=low [ Stefano Rivera ] * distutils build plugin: use default interpreter symlink in build step as well as the install step (if interpreter version matches the default one). So that shebangs in setuptools scripts. [ Piotr Ożarowski ] * dh_python2: searching for packages with egg-info fixed * dh_python2: fix public module version detection (regression) * dh_py*: "so" files no longer detected as extensions (closes: 726616) * pybuild: set PYTHON_LIBRARY and PYTHON_INCLUDE_DIR in cmake build plugin's configure step [ B. Clausius ] * pybuild: no longer fails if source directory path contains braces (closes: 726458) -- Piotr Ożarowski Thu, 17 Oct 2013 22:24:25 +0200 dh-python (1.20131003-1) unstable; urgency=low * Revert python-docutils build dependency change (to avoid circular dependencies) * Install PyDist fallback files -- Piotr Ożarowski Thu, 03 Oct 2013 18:06:37 +0200 dh-python (1.20130917-1) unstable; urgency=low * dh_python{2,3}: - bump minimum required python{,3}:any version to workaround #723586 - generate :any dependencies to specify range of supported Python versions (doesn't include extensions case), closes: 723070 -- Piotr Ożarowski Tue, 17 Sep 2013 19:29:05 +0200 dh-python (1.20130913-1) unstable; urgency=low [ Piotr Ożarowski ] * dh_py*: - add --requires option - do not generate "python2" dependency while guessing private extension's version using shebangs in other files (closes: #722307) [ Steve Langasek ] * Adjust dh_python to be multiarch-friendly (closes: 722045) [ B. Clausius ] * pybuild: fix --test when LC_ALL=C and setup.py contains non-ascii characters (closes: 722214) -- Piotr Ożarowski Fri, 13 Sep 2013 20:47:46 +0200 dh-python (1.20130903-1) unstable; urgency=low * dh_python2, dh_python3, dh_pypy: - do not rename extensions in directories that include architecture triplet as part of the path (closes: 721696) - add --no-ext-rename option -- Piotr Ożarowski Tue, 03 Sep 2013 20:20:43 +0200 dh-python (1.20130902-1) unstable; urgency=low * Fix DESTDIR guessing (from --name) for non-default interpreter versions * Add {package} to supported variables in command templates -- Piotr Ożarowski Mon, 02 Sep 2013 18:22:14 +0200 dh-python (1.20130901-1) unstable; urgency=low [ Dmitrijs Ledkovs ] * Fix pybuild.pm when PYBUILD_INTERPRETERS is set (broken in previous upload, closes: #720744) * Bump doctests s/3.2/3.3/ [ Piotr Ożarowski ] * Add Barry Warsaw to co-maintainers * pybuild: - mention {version.major} and {version.minor} in pybuild's manpage (closes: 721068) - add --test-tox option (PYBUILD_TEST_TOX=1 works too, like with other pybuild options), closes: 721067 - set https_proxy to 127.0.0.1 if it's not set (similar to http_proxy) - distutils build plugin: use default interpreter symlink in install step (if interpreter version matches the default one) - this will force distutils to not hardcode interpreter version in shebangs - fix problem with relative paths when dh's --sourcedirectory is used - add --name (PYBUILD_NAME) option * dh_python{2,3} and dh_pypy: generate "interpreter (>= X.Y), interpreter (<< X.Z)" dependency if private directory contains extensions even if there are no .py files inside (closes: 720258) * Disable two tests in test201 dir if /usr/bin/python2.6 is not available * Replace python-docutils build dependency with python3-docutils (both provide rst2man) [ Dmitry Shachnev ] * Make sure tests do not require python-support. * Add "dh-python" and "nosetests" autopkgtests. -- Piotr Ożarowski Sun, 01 Sep 2013 20:51:17 +0200 dh-python (1.20130819-1) unstable; urgency=low * Do not translate X-Python{,3}-Version into Depends if there are no Python files in the package * pybuild's distutils build plugin: set --root only in install step. dh doesn't pass DESTDIR in other steps and hence files for single binary packages ended in debian/tmp by default (closes: 719434) * Fix typo in plugin_cmake.py (thanks to D. Barbier, closes: #719528) * pybuild: --test-nose/--test-pytest have higher priority than setup.py's test_suite now * pybuild.pm: remove .pyc files in clean target * pybuild: directory paths escaping fixed * install README.PyDist file in dh-python package (closes: #698144) * Replace "libpython3.3-stdlib, python3.2" build depentency with libpython3-stdlib (which is already in unstable) -- Piotr Ożarowski Mon, 19 Aug 2013 10:55:56 +0200 dh-python (1.20130807-1) unstable; urgency=low * dh_python3: do not add multiarch triplets in python3.2's extensions - multiarch support was disabled in this interpreter * dh_pypy: fix prerm script to remove .pyc files (thanks to Jakub Wilk) * pybuild: - rename PYBUILD_DEBUG env. var. to PYBUILD_VERBOSE - run `pypy -m unittest discover -v` in test target for pypy interpreter - add --test-nose and --test-pytest options (can be enabled also via PYBUILD_TEST_NOSE=1 or PYBUILD_TEST_PYTEST=1) -- Piotr Ożarowski Thu, 07 Aug 2013 23:59:37 +0200 dh-python (1.20130728-1) unstable; urgency=low * Upload to unstable, breaks/replaces python3 << 3.3.2-4~ * Ignore missing or broken /usr/share/python{,3}/debian_defaults config files while checking for default/supported Python {2,3} versions * dh_python3: fix renaming (tagging) non-default public extensions that were not installed directly in dist-packages/ (../dist-packages/foo/bar.so, etc.) -- Piotr Ożarowski Wed, 31 Jul 2013 22:13:05 +0200 dh-python (1.0~b1-1) experimental; urgency=low * Initial release. -- Piotr Ożarowski Sun, 07 Jul 2013 21:47:50 +0200 debian/control0000664000000000000000000000266012307315131010573 0ustar Source: dh-python Section: python Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Piotr Ożarowski Uploaders: Stefano Rivera , Barry Warsaw Build-Depends: debhelper (>= 9), python3-minimal, libpython3-stdlib, # provides rst2man command (python3-docutils not used to avoid circular deps): python-docutils Standards-Version: 3.9.5 Vcs-Git: git://anonscm.debian.org/dh-python/dh-python.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=dh-python/dh-python.git X-Python3-Version: >= 3.2 XS-Testsuite: autopkgtest Package: dh-python Architecture: all 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 order to build modules and extensions * dh_python2 - calculates Python 2.X dependencies for Debian packages, adds maintainer scripts to byte compile files, etc. * dh_python3 - calculates Python 3.X dependencies for Debian packages, adds maintainer scripts to byte compile files, etc. * dh_pypy - calculates PyPy dependencies for Debian packages, adds maintainer scripts to byte compile files, etc. debian/patches/0000775000000000000000000000000012314057403010616 5ustar debian/patches/no-python2.6.diff0000664000000000000000000000405312314057403013633 0ustar Index: dh-python-1.20140128/tests/t202/Makefile =================================================================== --- dh-python-1.20140128.orig/tests/t202/Makefile 2014-01-28 18:20:25.000000000 +0100 +++ dh-python-1.20140128/tests/t202/Makefile 2014-03-24 17:24:28.459439873 +0100 @@ -4,7 +4,7 @@ clean: clean-common check: - test -f debian/python-foo/usr/lib/python2.6/dist-packages/foo.py - test -f debian/python-foo/usr/lib/python2.6/dist-packages/bar/bar.py + test -f debian/python-foo/usr/lib/python2.7/dist-packages/foo.py + test -f debian/python-foo/usr/lib/python2.7/dist-packages/bar/bar.py grep -q pycompile debian/python-foo/DEBIAN/postinst grep -q pyclean debian/python-foo/DEBIAN/prerm Index: dh-python-1.20140128/tests/t204/Makefile =================================================================== --- dh-python-1.20140128.orig/tests/t204/Makefile 2014-01-28 18:20:25.000000000 +0100 +++ dh-python-1.20140128/tests/t204/Makefile 2014-03-24 17:32:41.815422300 +0100 @@ -5,7 +5,7 @@ check: grep -q python2.6 debian/foo/usr/share/foo/foo.py - grep -q Depends:.*python2.6 debian/foo/DEBIAN/control + grep -q Depends:.*python debian/foo/DEBIAN/control #grep -q python2.5 debian/foo/usr/share/bar/bar.py #grep -q Depends:.*python2.5 debian/foo/DEBIAN/control grep -q python2.4 debian/foo/usr/share/foo/baz.py Index: dh-python-1.20140128/tests/t206/Makefile =================================================================== --- dh-python-1.20140128.orig/tests/t206/Makefile 2014-01-28 18:20:25.000000000 +0100 +++ dh-python-1.20140128/tests/t206/Makefile 2014-03-24 17:34:39.211418118 +0100 @@ -13,6 +13,6 @@ grep -q '\-V 2.5 /usr/share/bar25' debian/foo/usr/share/python/runtime.d/foo.rtupdate grep -q '/usr/share/bar25 \-V 2.5' debian/foo/DEBIAN/postinst # python2.6 hardcoded via shebang - grep -q Depends:.*python2.6 debian/foo/DEBIAN/control + #grep -q Depends:.*python2.6 debian/foo/DEBIAN/control grep -q '\-V 2.6 /usr/share/foo' debian/foo/usr/share/python/runtime.d/foo.rtupdate grep -q '/usr/share/foo \-V 2.6' debian/foo/DEBIAN/postinst debian/patches/python3.4.diff0000664000000000000000000000212112313514223013207 0ustar Index: b/dhpython/_defaults.py =================================================================== --- a/dhpython/_defaults.py +++ b/dhpython/_defaults.py @@ -27,11 +27,11 @@ SUPPORTED = { 'cpython2': [(2, 7)], - 'cpython3': [(3, 3)], + 'cpython3': [(3, 4)], 'pypy': [(2, 0)]} DEFAULT = { 'cpython2': (2, 7), - 'cpython3': (3, 3), + 'cpython3': (3, 4), 'pypy': (2, 0)} log = logging.getLogger('dhpython') Index: b/tests/Makefile =================================================================== --- a/tests/Makefile +++ b/tests/Makefile @@ -3,9 +3,9 @@ # hardcode default/supported Python versions to make tests more reliable # Note that all these packages have to be installed during tests export DEBPYTHON_DEFAULT=2.7 -export DEBPYTHON_SUPPORTED=2.6,2.7 -export DEBPYTHON3_DEFAULT=3.3 -export DEBPYTHON3_SUPPORTED=3.2,3.3 +export DEBPYTHON_SUPPORTED=2.7 +export DEBPYTHON3_DEFAULT=3.4 +export DEBPYTHON3_SUPPORTED=3.4 # enable or disable tests here: TESTS := test101 test201 test202 test203 test204 test205 test206 test207 test301 test302 test303 test304 debian/patches/rmdirs.diff0000664000000000000000000000332012307315131012743 0ustar --- a/dhpython/fs.py +++ b/dhpython/fs.py @@ -22,7 +22,7 @@ import os import re from filecmp import cmp as cmpfile -from os.path import exists, isdir, islink, join, split, splitext +from os.path import exists, dirname, isdir, islink, join, split, splitext from shutil import rmtree from stat import ST_MODE, S_IXUSR, S_IXGRP, S_IXOTH from dhpython import MULTIARCH_DIR_TPL @@ -47,8 +47,12 @@ log.debug('moving files from %s to %s', srcdir, dstdir) share_files(srcdir, dstdir, interpreter, options) parent_dir = '/'.join(srcdir.split('/')[:-1]) - if exists(parent_dir) and not os.listdir(parent_dir): - os.rmdir(parent_dir) + while parent_dir: + if exists(parent_dir): + if os.listdir(parent_dir): + break + os.rmdir(parent_dir) + parent_dir = dirname(parent_dir) # do the same with debug locations dstdir = interpreter.sitedir(package, gdb=True) @@ -57,8 +61,12 @@ log.debug('moving files from %s to %s', srcdir, dstdir) share_files(srcdir, dstdir, interpreter, options) parent_dir = '/'.join(srcdir.split('/')[:-1]) - if exists(parent_dir) and not os.listdir(parent_dir): - os.rmdir(parent_dir) + while parent_dir: + if exists(parent_dir): + if os.listdir(parent_dir): + break + os.rmdir(parent_dir) + parent_dir = dirname(parent_dir) def share_files(srcdir, dstdir, interpreter, options): debian/patches/no-python3.3.diff0000664000000000000000000001564012314040745013636 0ustar Index: b/dhpython/interpreter.py =================================================================== --- a/dhpython/interpreter.py +++ b/dhpython/interpreter.py @@ -309,8 +309,8 @@ >>> i = Interpreter('python') >>> i.cache_file('foo.py', Version('3.1')) 'foo.pyc' - >>> i.cache_file('bar/foo.py', '3.3') - 'bar/__pycache__/foo.cpython-33.pyc' + >>> i.cache_file('bar/foo.py', '3.4') + 'bar/__pycache__/foo.cpython-34.pyc' """ version = Version(version or self.version) last_char = 'o' if '-O' in self.options else 'c' @@ -335,8 +335,8 @@ """Return Python magic tag (used in __pycache__ dir to tag files). >>> i = Interpreter('python') - >>> i.magic_tag(version='3.3') - 'cpython-33' + >>> i.magic_tag(version='3.4') + 'cpython-34' """ version = Version(version or self.version) if self.impl.startswith('cpython') and version << Version('3.2'): @@ -378,8 +378,8 @@ >>> Interpreter('python2.7').include_dir '/usr/include/python2.7' - >>> Interpreter('python3.3-dbg').include_dir - '/usr/include/python3.3dm' + >>> Interpreter('python3.4-dbg').include_dir + '/usr/include/python3.4dm' """ if self.impl == 'pypy': return '/usr/lib/pypy/include' @@ -482,7 +482,7 @@ >>> Interpreter('python3.1').suggest_pkg_name('foo') 'python3-foo' - >>> Interpreter('python3.3').suggest_pkg_name('foo') + >>> Interpreter('python3.4').suggest_pkg_name('foo') 'python3-foo' >>> Interpreter('python2.7-dbg').suggest_pkg_name('bar') 'python-bar-dbg' Index: b/pybuild =================================================================== --- a/pybuild +++ b/pybuild @@ -102,7 +102,7 @@ def get_option(name, interpreter=None, version=None, default=None): if interpreter: - # try PYBUILD_NAME_python3.3-dbg (or hardcoded interpreter) + # try PYBUILD_NAME_python3.4-dbg (or hardcoded interpreter) i = interpreter.format(version=version or '') opt = "PYBUILD_{}_{}".format(name.upper(), i) if opt in environ: Index: b/pybuild.rst =================================================================== --- a/pybuild.rst +++ b/pybuild.rst @@ -191,8 +191,8 @@ * `--disable test/python2.5-dbg` - disables tests for python2.5-dbg * `--disable '2.4 2.7'` - disables all actions for version 2.4 and 2.7 * `PYBUILD_DISABLE_python2=1` - disables all actions for Python 2.X -* `PYBUILD_DISABLE_python3.3=test` - disables tests for Python 3.3 -* `PYBUILD_DISABLE=test/python3.3` - same as above +* `PYBUILD_DISABLE_python3.4=test` - disables tests for Python 3.3 +* `PYBUILD_DISABLE=test/python3.4` - same as above * `PYBUILD_DISABLE=configure/python3 2.4 pypy` - disables configure action for all python3 interpreters, all actions for version 2.4, and all actions for pypy Index: b/tests/t304/Makefile =================================================================== --- a/tests/t304/Makefile +++ b/tests/t304/Makefile @@ -6,10 +6,10 @@ check: # python3.2 hardcoded via `dh_python3 --shebang ...python3.2` grep -q '#! /usr/bin/python3.2 -OO' debian/foo/usr/share/baz32/baz.py - # python3.3 hardcoded via shebang - grep -q '/usr/share/foo \-V 3.3' debian/foo/DEBIAN/postinst + # python3.4 hardcoded via shebang + grep -q '/usr/share/foo \-V 3.4' debian/foo/DEBIAN/postinst # /env removed from shebang grep -q '#! /usr/bin/python3' debian/foo/usr/share/bar/bar.py # /local removed from shebang grep -q '#! /usr/bin/python3' debian/foo/usr/share/foo/baz.py - grep -q '#! /usr/bin/python3.3' debian/foo/usr/share/foo/foo.py + grep -q '#! /usr/bin/python3.4' debian/foo/usr/share/foo/foo.py Index: b/tests/t304/foo.py =================================================================== --- a/tests/t304/foo.py +++ b/tests/t304/foo.py @@ -1,2 +1,2 @@ -#!/usr/local/bin/python3.3 -"/usr/local/bin/python3.3 hardcoded in shebang" +#!/usr/local/bin/python3.4 +"/usr/local/bin/python3.4 hardcoded in shebang" Index: b/tests/test_interpreter.py =================================================================== --- a/tests/test_interpreter.py +++ b/tests/test_interpreter.py @@ -93,26 +93,26 @@ self.assertIsNone(i.check_extname('foo.abi3.so')) self.assertEqual(i.check_extname('foo/bar/bazmodule.so'), r'foo/bar/bazmodule.cpython-32dmu.so') - @unittest.skipUnless(exists('/usr/bin/python3.3'), 'python3.3 is not installed') - def test_python33(self): - i = Interpreter('python3.3') - self.assertEqual(i.soabi(), 'cpython-33m') - self.assertEqual(i.check_extname('foo.so'), r'foo.cpython-33m-MYARCH.so') + @unittest.skipUnless(exists('/usr/bin/python3.4'), 'python3.4 is not installed') + def test_python34(self): + i = Interpreter('python3.4') + self.assertEqual(i.soabi(), 'cpython-34m') + self.assertEqual(i.check_extname('foo.so'), r'foo.cpython-34m-MYARCH.so') self.assertIsNone(i.check_extname('foo.cpython-32m.so')) # different version - self.assertIsNone(i.check_extname('foo.cpython-33m-OTHER.so')) # different architecture - self.assertEqual(i.check_extname('foo.cpython-33m.so'), r'foo.cpython-33m-MYARCH.so') + self.assertIsNone(i.check_extname('foo.cpython-34m-OTHER.so')) # different architecture + self.assertEqual(i.check_extname('foo.cpython-34m.so'), r'foo.cpython-34m-MYARCH.so') self.assertIsNone(i.check_extname('foo.abi3.so')) - self.assertEqual(i.check_extname('foo/bar/bazmodule.so'), r'foo/bar/baz.cpython-33m-MYARCH.so') + self.assertEqual(i.check_extname('foo/bar/bazmodule.so'), r'foo/bar/baz.cpython-34m-MYARCH.so') - @unittest.skipUnless(exists('/usr/bin/python3.3-dbg'), 'python3.3-dbg is not installed') - def test_python33dbg(self): - i = Interpreter('python3.3-dbg') - self.assertEqual(i.soabi(), 'cpython-33dm') - self.assertEqual(i.check_extname('foo.so'), r'foo.cpython-33dm-MYARCH.so') + @unittest.skipUnless(exists('/usr/bin/python3.4-dbg'), 'python3.4-dbg is not installed') + def test_python34dbg(self): + i = Interpreter('python3.4-dbg') + self.assertEqual(i.soabi(), 'cpython-34dm') + self.assertEqual(i.check_extname('foo.so'), r'foo.cpython-34dm-MYARCH.so') self.assertIsNone(i.check_extname('foo.cpython-32m.so')) # different version - self.assertIsNone(i.check_extname('foo.cpython-33m-OTHER.so')) # different architecture + self.assertIsNone(i.check_extname('foo.cpython-34m-OTHER.so')) # different architecture self.assertIsNone(i.check_extname('foo.abi3.so')) - self.assertEqual(i.check_extname('foo/bar/bazmodule.so'), r'foo/bar/baz.cpython-33dm-MYARCH.so') + self.assertEqual(i.check_extname('foo/bar/bazmodule.so'), r'foo/bar/baz.cpython-34dm-MYARCH.so') def test_version(self): i = Interpreter(impl='cpython2') debian/patches/no-pyshared.diff0000664000000000000000000000153612307315131013703 0ustar 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): debian/patches/series0000664000000000000000000000012012314056050012021 0ustar no-pyshared.diff python3.4.diff rmdirs.diff no-python3.3.diff no-python2.6.diff debian/links0000664000000000000000000000031012307315131010221 0ustar /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_python3 /usr/bin/dh_python3 debian/manpages0000664000000000000000000000005712307315131010704 0ustar pybuild.1 dh_pypy.1 #dh_python2.1 dh_python3.1 debian/source/0000775000000000000000000000000012307315162010470 5ustar debian/source/lintian-overrides0000664000000000000000000000006012307315131014041 0ustar python3-depends-but-no-python3-helper dh-python debian/source/format0000664000000000000000000000001412307315131011672 0ustar 3.0 (quilt) debian/copyright0000664000000000000000000000225612307315131011124 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Files: * Copyright: 2010-2013 Piotr Ożarowski License: Expat Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. debian/rules0000775000000000000000000000077012307315131010250 0ustar #! /usr/bin/make -f %: dh $@ clean: make clean dh_clean override_dh_auto_test: # FIXME override_dh_auto_install: DESTDIR=debian/dh-python PREFIX=/usr make install manpages # disable dh_python2 for now (shipped in python-defaults) 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 # generate maintainer scripts, etc. ./dh_python3 debian/compat0000664000000000000000000000000212307315131010362 0ustar 9 debian/docs0000664000000000000000000000002512307315131010034 0ustar pydist/README.PyDist debian/tests/0000775000000000000000000000000012307315162010332 5ustar debian/tests/control0000664000000000000000000000044112307315131011730 0ustar Tests: dh-python Depends: python-all-dev, python3-all-dev, python-all-dbg, python3-all-dbg, pypy, build-essential, fakeroot, debhelper, libjs-jquery Tests: nosetests Depends: python3-nose, python-all, python-all-dbg, python3-all, python3-all-dbg, pypy Restrictions: allow-stderr debian/tests/dh-python0000775000000000000000000000073212307315131012170 0ustar #!/bin/sh set -eu cp -r tests "$ADTTMP" cd "$ADTTMP/tests" sed -i "s/\.\.\/\.\.\/debian/\/usr\/share\/python3/g" common.mk sed -i "s/\.\.\/\.\.\/dhpython/\/usr\/share\/dh-python\/dhpython/g" common.mk sed -i "s/PYTHONPATH=\.\.\/\.\.\//PYTHONPATH=\/usr\/share\/python3/g" t*/debian/rules sed -i "s/\.\.\/\.\.\/debian\///g" t*/debian/rules sed -i "s/\.\.\/\.\.\/dh_py/\/usr\/share\/dh-python\/dh_py/g" t*/debian/rules sed -i "s/\.\.\/\.\.\///g" t*/debian/rules make all 2>&1 debian/tests/nosetests0000664000000000000000000000024712307315131012303 0ustar #!/bin/sh set -eu nosetests3 /usr/share/dh-python/dhpython --with-doctest -v cp -r tests "$ADTTMP" cd "$ADTTMP/tests" PYTHONPATH=/usr/share/dh-python nosetests3 -v