[lintian] 01/02: Add missing ":any" to some python relations
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 8d53737cf912fcde1b3731e182b484f678f8c349
Author: Niels Thykier <niels@thykier.net>
Date: Fri Apr 22 18:54:11 2016 +0000
Add missing ":any" to some python relations
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/rules.pm | 11 +++++++----
data/debhelper/dh_addons-manual | 4 ++--
debian/changelog | 6 ++++++
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/checks/rules.pm b/checks/rules.pm
index 3414284..6060838 100644
--- a/checks/rules.pm
+++ b/checks/rules.pm
@@ -25,10 +25,13 @@ use Lintian::Data;
use Lintian::Tags qw(tag);
use Lintian::Util qw(rstrip);
-our $PYTHON_DEPEND = 'python | python-dev | python-all | python-all-dev';
-our $PYTHON3_DEPEND = 'python3 | python3-dev | python3-all | python3-all-dev';
-our $PYTHON2X_DEPEND = 'python2.7 | python2.7-dev';
-our $PYTHON3X_DEPEND = join(' | ', map { "python$_ | python$_-dev" } qw(3.2));
+our $PYTHON_DEPEND
+ = 'python:any | python-dev:any | python-all:any | python-all-dev:any';
+our $PYTHON3_DEPEND
+ = 'python3:any | python3-dev:any | python3-all:any | python3-all-dev:any';
+our $PYTHON2X_DEPEND = 'python2.7:any | python2.7-dev:any';
+our $PYTHON3X_DEPEND
+ = join(' | ', map { "python${_}:any | python${_}-dev:any" } qw(3.2));
our $ANYPYTHON_DEPEND
= "$PYTHON_DEPEND | $PYTHON2X_DEPEND | $PYTHON3_DEPEND | $PYTHON3X_DEPEND";
diff --git a/data/debhelper/dh_addons-manual b/data/debhelper/dh_addons-manual
index a74da35..3a6d2fa 100644
--- a/data/debhelper/dh_addons-manual
+++ b/data/debhelper/dh_addons-manual
@@ -5,7 +5,7 @@
# Please keep this sorted.
apache2||dh-apache2 | apache2-dev
lv2config||lv2core
-python2||python | python-all | python-dev | python-all-dev
-python3||python3 | python3-all | python3-dev | python3-all-dev
+python2||python:any | python-all:any | python-dev:any | python-all-dev:any
+python3||python3:any | python3-all:any | python3-dev:any | python3-all-dev:any
python_support||python-support
sphinxdoc||python-sphinx | python3-sphinx
diff --git a/debian/changelog b/debian/changelog
index 6a5f844..b728c16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,9 @@ lintian (2.5.44) UNRELEASED; urgency=medium
* checks/phppear.{desc,pm}:
+ [JW] Apply patch from Mathieu Parent to make dh-php* and php*-dev
package names unversioned.
+ * checks/rules.pm:
+ + [NT] Add ":any" to all python dependencies. Thanks to Barry Warsaw
+ for reporting the bug.
* checks/scripts.desc:
+ [NT] Suggest dh_python2 / dh_python3 instead of dh_pysupport and
dh_pycentral. Thanks to Neil Williams for the report.
@@ -67,6 +70,9 @@ lintian (2.5.44) UNRELEASED; urgency=medium
* data/debhelper/*:
+ [JW] Refresh against unstable. Thanks to Mathieu Parent for the bug
report.
+ * data/debhelper/dh_commands-manual:
+ + [NT] Add ":any" to the dependencies for the python add-ons. Thanks
+ to Barry Warsaw for reporting the bug. (Closes: #803164)
* data/menu-format/known-desktop-keys:
+ [NT] Accept "DesktopNames" as a known key in desktop files. Thanks
to Yves-Alexis Perez for the suggestion. (Closes: #766099)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: