From 43994f3a9093411b49a6f2b98d15be9c8c5802ee Mon Sep 17 00:00:00 2001
From: Steve Langasek <vorlon@debian.org>
Date: Fri, 6 Sep 2013 17:18:45 -0700
Subject: [PATCH] * Non-maintainer upload. * Adjust debpython/depends.py to be
multiarch-friendly.
---
debian/changelog | 7 +++++++
debpython/depends.py | 14 +++++++-------
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 013f316..83a9d9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-defaults (2.7.5-4.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Adjust debpython/depends.py to be multiarch-friendly.
+
+ -- Steve Langasek <vorlon@debian.org> Fri, 06 Sep 2013 17:18:18 -0700
+
python-defaults (2.7.5-4) unstable; urgency=low
* Add libpython-all-dbg.postinst to convert the doc directory to a symlink
diff --git a/debpython/depends.py b/debpython/depends.py
index 8324e68..d46c896 100644
--- a/debpython/depends.py
+++ b/debpython/depends.py
@@ -24,7 +24,7 @@ from debpython.pydist import parse_pydep, guess_dependency
from debpython.version import DEFAULT, SUPPORTED, debsorted, vrepr, vrange_str
# minimum version required for pycompile/pyclean
-MINPYCDEP = 'python (>= 2.6.6-7~)'
+MINPYCDEP = 'python:any (>= 2.6.6-7~)'
log = logging.getLogger(__name__)
@@ -115,20 +115,20 @@ class Dependencies(object):
self.depend(MINPYCDEP)
for interpreter, version in stats['shebangs']:
- self.depend(interpreter)
+ self.depend("%s:any" % interpreter)
for private_dir, details in stats['private_dirs'].iteritems():
versions = list(v for i, v in details.get('shebangs', []) if v)
for v in versions:
if v in SUPPORTED:
- self.depend("python%d.%d" % v)
+ self.depend("python%d.%d:any" % v)
else:
log.info('dependency on python%s (from shebang) ignored'
' - it\'s not supported anymore', vrepr(v))
# /usr/bin/python shebang → add python to Depends
if any(True for i, v in details.get('shebangs', []) if v is None):
- self.depend('python')
+ self.depend('python:any')
if details.get('compile', False):
self.depend(MINPYCDEP)
@@ -144,12 +144,12 @@ class Dependencies(object):
if vr == (None, None):
pass
elif vr[0] == vr[1]:
- self.depend("python%s" % vrepr(vr[0]))
+ self.depend("python%s:any" % vrepr(vr[0]))
else:
if vr[0]: # minimum version specified
- self.depend("python (>= %s)" % vrepr(vr[0]))
+ self.depend("python:any (>= %s)" % vrepr(vr[0]))
if vr[1]: # maximum version specified
- self.depend("python (<< %d.%d)" % \
+ self.depend("python:any (<< %d.%d)" % \
(vr[1][0], vr[1][1] + 1))
for pattern in options.regexpr or []:
--
GitLab