This is an automated email from the git hooks/post-receive script. lunar pushed a commit to branch pu/reproducible_builds in repository dh-python.
commit b51a32b7779dc10f7b6374cd2c844f41d9d7d6a4 Author: Piotr Ożarowski <pi...@debian.org> Date: Mon Sep 2 18:44:08 2013 +0200 fix Interpreter.suggest_pkg_name with non-default versions --- debian/changelog | 6 ++++++ dhpython/interpreter.py | 14 +++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 15252a8..f5d2945 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dh-python (1.20130902-1) unstable; urgency=low + + * Fix DESTDIR guessing (from --name) for non-default interpreter versions + + -- Piotr Ożarowski <pi...@debian.org> Mon, 02 Sep 2013 18:22:14 +0200 + dh-python (1.20130901-1) unstable; urgency=low [ Dmitrijs Ledkovs ] diff --git a/dhpython/interpreter.py b/dhpython/interpreter.py index 415c4e5..8d9a574 100644 --- a/dhpython/interpreter.py +++ b/dhpython/interpreter.py @@ -426,16 +426,20 @@ class Interpreter: def suggest_pkg_name(self, name): """Suggest binary package name with for given library name + >>> Interpreter('python3.1').suggest_pkg_name('foo') + 'python3-foo' >>> Interpreter('python3.3').suggest_pkg_name('foo') 'python3-foo' >>> Interpreter('python2.7-dbg').suggest_pkg_name('bar') 'python-bar-dbg' """ - binary = self._vstr(consider_default_ver=True) - if '-' in binary: - tmp = binary.split('-', 1) - return '{}-{}-{}'.format(tmp[0], name, tmp[1]) - return '{}-{}'.format(binary, name) + if self.impl == 'pypy': + return 'pypy-{}'.format(name) + version = '3' if self.impl == 'cpython3' else '' + result = 'python{}-{}'.format(version, name) + if self.debug: + result += '-dbg' + return result def _get_config(self, version=None): version = Version(version or self.version) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dh-python.git _______________________________________________ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds