[Reproducible-builds] [dh-python] 125/183: dh_py: do not generate "python2" dependency

[Jérémy Bobbio]

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 e25e94bef8c70b81165fc52dd7581a38d9b75e32
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Tue Sep 10 19:06:55 2013 +0200

    dh_py: do not generate "python2" dependency
---
 debian/changelog | 5 ++++-
 dh_pypy          | 2 +-
 dh_python2       | 2 +-
 dh_python3       | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6767d28..d528264 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
 dh-python (1.20130913-1) UNRELEASED; urgency=low
 
   [ Piotr Ożarowski ]
-  * dh_py*: add --requires option
+  * 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)
diff --git a/dh_pypy b/dh_pypy
index 954e47e..e28148f 100755
--- a/dh_pypy
+++ b/dh_pypy
@@ -218,7 +218,7 @@ def main():
                     ver = str(options.vrange)
                 else:  # try shebang or default PyPy version
                     ver = (list(i.version for i in details.get('shebangs', [])
-                                if i.version) or [None])[0] or DEFAULT
+                                if i.version and i.version.minor) or [None])[0] or DEFAULT
                 dependencies.depend("pypy%s" % ver)
                 args += " -V %s" % ver
             else:
diff --git a/dh_python2 b/dh_python2
index 73c71f8..8279047 100755
--- a/dh_python2
+++ b/dh_python2
@@ -466,7 +466,7 @@ def main():
                     ver = str(options.vrange)
                 else:  # try shebang or default Python version
                     ver = (list(i.version for i in details.get('shebangs', [])
-                                if i.version) or [None])[0] or DEFAULT
+                                if i.version and i.version.minor) or [None])[0] or DEFAULT
                 dependencies.depend("python%s" % ver)
                 args += " -V %s" % ver
             else:
diff --git a/dh_python3 b/dh_python3
index 748a636..34deef4 100755
--- a/dh_python3
+++ b/dh_python3
@@ -219,7 +219,7 @@ def main():
                     ver = str(options.vrange)
                 else:  # try shebang or default Python version
                     ver = (list(i.version for i in details.get('shebangs', [])
-                                if i.version) or [None])[0] or DEFAULT
+                                if i.version and i.version.minor) or [None])[0] or DEFAULT
                 dependencies.depend("python%s" % ver)
                 args += " -V %s" % ver
             else:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dh-python.git