From b8d0974369fd93db4bf53d25993609c413980890 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <piotr@debian.org>
Date: Thu, 28 Jun 2012 12:12:38 +0200
Subject: [PATCH] no longer generates python2.X | python2.Y depenendies for
public modules (Closes: 625740)
---
debian/changelog | 2 ++
debpython/depends.py | 12 +++++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9da77f9..3fa39dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ python-defaults (2.7.3-1) unstable; urgency=low
+ "/usr/bin/python2" → "/usr/bin/python"
- new --shebang option to replace all shebangs in bin dirs
(example: --shebang /usr/bin/python2.6)
+ - no longer generates python2.X | python2.Y depenendies for public modules
+ (Closes: 625740)
* pyversions, dh_python2, pycompile: allow to override system's list of
supported Python versions via DEBPYTHON_SUPPORTED and default Python
version via DEBPYTHON_DEFAULT env. variables
diff --git a/debpython/depends.py b/debpython/depends.py
index cf146d1..f925cc7 100644
--- a/debpython/depends.py
+++ b/debpython/depends.py
@@ -94,11 +94,13 @@ class Dependencies(object):
tpl = 'python-dbg' if dbgpkg else 'python'
minv = pub_vers[0]
maxv = pub_vers[-1]
- if dbgpkg:
- tpl2 = 'python%d.%d-dbg'
- else:
- tpl2 = 'python%d.%d'
- self.depend(' | '.join(tpl2 % i for i in debsorted(pub_vers)))
+ # generating "python2.X | python2.Y | python2.Z" dependencies
+ # disabled (see #625740):
+ #if dbgpkg:
+ # tpl2 = 'python%d.%d-dbg'
+ #else:
+ # tpl2 = 'python%d.%d'
+ #self.depend(' | '.join(tpl2 % i for i in debsorted(pub_vers)))
# additional Depends to block python package transitions
if minv <= DEFAULT:
--
GitLab