[SCM] Debian package checker branch, master, updated. 2.5.0-26-g5388b5d
The following commit has been merged in the master branch:
commit 5388b5d9486dda402f917358b09623b9df55613a
Author: Niels Thykier <niels@thykier.net>
Date: Thu Jun 2 22:54:07 2011 +0200
Fixed the python build-dependency check in checks/rules
diff --git a/checks/rules b/checks/rules
index 0a3bdf2..66e9f34 100644
--- a/checks/rules
+++ b/checks/rules
@@ -20,11 +20,11 @@ use warnings;
use Util;
use Lintian::Tags qw(tag);
-# The allowed Python dependencies currently. This is the list of alternatives
-# that, either directly or through transitive dependencies that can be relied
-# upon, ensure /usr/bin/python will exist for the use of dh_python.
-our $PYTHON_DEPEND = 'python | python-dev | python-all | python-all-dev | '
- . join (' | ', map { "python$_ | python$_-dev" } qw(2.4 2.5 2.6));
+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 = join (' | ', map { "python$_ | python$_-dev" } qw(2.6 2.7));
+our $PYTHON3X_DEPEND = join (' | ', map { "python$_ | python$_-dev" } qw(3.2));
+our $ANYPYTHON_DEPEND = "$PYTHON_DEPEND | $PYTHON2X_DEPEND | $PYTHON3_DEPEND | $PYTHON3X_DEPEND";
# Certain build tools must be listed in Build-Depends even if there are no
# arch-specific packages because they're required in order to run the clean
@@ -50,7 +50,7 @@ our @GLOBAL_CLEAN_DEPENDS =
[ quilt => qr'^include\s+/usr/share/quilt/' ],
[ 'ruby-pkg-tools' => qr'^include\s+/usr/share/ruby-pkg-tools/1/class/' ],
[ 'r-base-dev' => qr'^include\s+/usr/share/R/debian/r-cran\.mk' ],
- [ $PYTHON_DEPEND => qr'/usr/share/cdbs/1/class/python-distutils\.mk', 'missing-python-build-dependency' ],
+ [ $ANYPYTHON_DEPEND => qr'/usr/share/cdbs/1/class/python-distutils\.mk', 'missing-python-build-dependency' ],
);
# A list of packages; regular expressions that, if they match anywhere in the
@@ -76,7 +76,8 @@ my @RULE_CLEAN_DEPENDS =
[ dpatch => qr'^\t\s*(\S+=\S+\s+)*dpatch\s' ],
[ 'po-debconf' => qr'^\t\s*debconf-updatepo\s' ],
[ $PYTHON_DEPEND => qr'^\t\s*python\s', 'missing-python-build-dependency' ],
- [ $PYTHON_DEPEND => qr'\ssetup\.py\b', 'missing-python-build-dependency' ],
+ [ $PYTHON3_DEPEND => qr'^\t\s*python3\s', 'missing-python-build-dependency' ],
+ [ $ANYPYTHON_DEPEND => qr'\ssetup\.py\b', 'missing-python-build-dependency' ],
[ quilt => qr'^\t\s*dh\s.*--with\s+(?:\S+,)*quilt' ],
[ quilt => qr'^\t\s*(\S+=\S+\s+)*quilt\s' ],
[ yada => qr'^\t\s*yada\s' ],
diff --git a/debian/changelog b/debian/changelog
index f03a939..9a499aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,11 @@ lintian (2.5.1) UNRELEASED; urgency=low
* checks/java:
+ [NT] Sort the jar files by name, so they are checked in the same
order.
+ * checks/rules:
+ + [NT] Removed code for handling packages with dh_python.
+ + [NT] Fixed the code for determining Build-Depends for python
+ packages. Thanks to Jakub Wilk for the patch.
+ (Closes: #614876, #616553)
* checks/shared-libs{,.desc}:
+ [NT] Added non-empty-dependency_libs-in-la-file. (Closes: #628673)
--
Debian package checker
Reply to: