From 9142513df1eb4804443ba85a3c3b459aaf9ec6bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <piotr@debian.org>
Date: Wed, 28 Jul 2010 17:38:20 +0200
Subject: [PATCH] dh_python2: rename --depend to --depends, --recommend to
--recommends and --suggest to --suggests
---
debian/changelog | 2 ++
debpython/depends.py | 8 ++++----
dh_python2 | 6 +++---
tests/t1/debian/rules | 8 ++++----
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index aed4e4d..543a5d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ python-defaults (2.6.5-11) unstable; urgency=medium
* Add README.PyDist to python-doc package
* pycompile: compile public module for the right Python version (really
closes: 590224)
+ * dh_python2: rename --depend to --depends, --recommend to --recommends and
+ --suggest to --suggests
-- Piotr Ożarowski <piotr@debian.org> Tue, 27 Jul 2010 21:25:54 +0200
diff --git a/debpython/depends.py b/debpython/depends.py
index fd3bf38..0c9cb55 100644
--- a/debpython/depends.py
+++ b/debpython/depends.py
@@ -119,7 +119,7 @@ class Dependencies(object):
# make sure pycompile binary is available
if stats['compile']:
- self.depend("python (>= 2.6.5-10~)")
+ self.depend("python (>= 2.6.5-11~)")
for interpreter, version in stats['shebangs']:
self.depend(interpreter)
@@ -155,13 +155,13 @@ class Dependencies(object):
for i in parse_pydep(fn):
self.depend(i)
- # add dependencies from --depend
+ # add dependencies from --depends
for item in options.depends or []:
self.depend(guess_dependency(item))
- # add dependencies from --recommend
+ # add dependencies from --recommends
for item in options.recommends or []:
self.recommend(guess_dependency(item))
- # add dependencies from --suggest
+ # add dependencies from --suggests
for item in options.suggests or []:
self.suggest(guess_dependency(item))
diff --git a/dh_python2 b/dh_python2
index a13821d..0ad9181 100755
--- a/dh_python2
+++ b/dh_python2
@@ -418,14 +418,14 @@ def main():
parser.add_option('-X', '--exclude', action='append', dest='regexpr',
help='exclude items that match given REGEXPR. You may use this option'
'multiple times to build up a list of things to exclude.')
- parser.add_option('--depend', action='append', dest='depends',
+ parser.add_option('--depends', action='append', dest='depends',
help='translate given requirements into Debian dependencies '
'and add them to ${python:Depends}. '
'Use it for missing items in requires.txt.')
- parser.add_option('--recommend', action='append', dest='recommends',
+ parser.add_option('--recommends', action='append', dest='recommends',
help='translate given requirements into Debian '
'dependencies and add them to ${python:Recommends}')
- parser.add_option('--suggest', action='append', dest='suggests',
+ parser.add_option('--suggests', action='append', dest='suggests',
help='translate given requirements into Debian '
'dependencies and add them to ${python:Suggests}')
# ignore some debhelper options:
diff --git a/tests/t1/debian/rules b/tests/t1/debian/rules
index c8af0ac..ce6efd1 100755
--- a/tests/t1/debian/rules
+++ b/tests/t1/debian/rules
@@ -6,7 +6,7 @@ override_dh_pysupport:
find debian/ -name jquery.js -exec \
ln -fs /usr/share/javascript/jquery/jquery.js '{}' \;
DH_VERBOSE=1 ../../dh_python2\
- --depend 'SQLAlchemy >= 0.6.1'\
- --recommend Mako\
- --suggest 'Foo >= 0.1'\
- --suggest 'bar >= 1.0'
+ --depends 'SQLAlchemy >= 0.6.1'\
+ --recommends Mako\
+ --suggests 'Foo >= 0.1'\
+ --suggests 'bar >= 1.0'
--
GitLab