[SCM] Debian package checker branch, master, updated. 2.2.12-26-gced4a14
The following commit has been merged in the master branch:
commit ced4a14fc576f098638748ec529b9d15b2bf1f01
Author: Russ Allbery <rra@debian.org>
Date: Wed Jul 1 20:51:44 2009 -0700
Ignore variable settings when checking debian/rules for programs
* checks/fields:
+ [RA] Allow variable settings before ant, dpatch, and dh when
checking debian/rules for dependencies. Thanks, Ryan Niebur.
(Closes: #535432)
Also fix some formatting and alignment in checks/fields.
diff --git a/checks/fields b/checks/fields
index 20af81a..98afb77 100644
--- a/checks/fields
+++ b/checks/fields
@@ -166,9 +166,9 @@ my @GLOBAL_DEPENDS = (
# regex matches in one of clean, build-arch, binary-arch, or a rule they
# depend on, this package is allowed (and required) in Build-Depends.
my @RULE_CLEAN_DEPENDS = (
- [ ant => qr'^\t\s*ant\s' ],
+ [ ant => qr'^\t\s*(\S+=\S+\s+)*ant\s' ],
[ debhelper => qr'^\t\s*dh_.+' ],
- [ dpatch => qr'^\t\s*dpatch\s' ],
+ [ 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' ],
@@ -194,23 +194,23 @@ my @RULE_CLEAN_ALLOWED = (
# should bypass the build-depends-without-arch-dep check completely.
my @GLOBAL_CLEAN_BYPASS = (
qr'^include\s*/usr/share/cdbs/1/class/ant\.mk',
- qr'^\s+dh\s+'
+ qr'^\s+(\S+=\S+\s+)*dh\s+'
);
# Mapping of package names to section names
my @NAME_SECTION_MAPPINGS = (
- [ qr/-docs?$/ => 'doc' ],
- [ qr/-dbg$/ => 'debug' ],
- [ qr/^python-/ => 'python' ],
- [ qr/^r-cran-/ => 'gnu-r' ],
- [ qr/^lib.*-perl$/ => 'perl' ],
- [ qr/^lib.*-cil$/ => 'cli-mono' ],
- [ qr/^lib.*-java$/ => 'java' ],
- [ qr/^(?:lib)php-/ => 'php' ],
- [ qr/^lib(?:hugs|ghc6)-/ => 'haskell' ],
- [ qr/^lib.*-ruby(?:1\.\d)?$/ => 'ruby' ],
- [ qr/^lib.*-ocaml-dev$/ => 'ocaml' ],
- [ qr/^lib.*-dev$/ => 'libdevel' ],
+ [ qr/-docs?$/ => 'doc' ],
+ [ qr/-dbg$/ => 'debug' ],
+ [ qr/^python-/ => 'python' ],
+ [ qr/^r-cran-/ => 'gnu-r' ],
+ [ qr/^lib.*-perl$/ => 'perl' ],
+ [ qr/^lib.*-cil$/ => 'cli-mono' ],
+ [ qr/^lib.*-java$/ => 'java' ],
+ [ qr/^(?:lib)php-/ => 'php' ],
+ [ qr/^lib(?:hugs|ghc6)-/ => 'haskell' ],
+ [ qr/^lib.*-ruby(?:1\.\d)?$/ => 'ruby' ],
+ [ qr/^lib.*-ocaml-dev$/ => 'ocaml' ],
+ [ qr/^lib.*-dev$/ => 'libdevel' ],
);
# Valid URI formats for the Vcs-* fields
diff --git a/debian/changelog b/debian/changelog
index 52be0a3..346a5c9 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ lintian (2.2.13) UNRELEASED; urgency=low
+ [ADB] If the Debian r-cran makefile include is used in the rules file,
cdbs, debhelper and r-base-dev are required in Build-Depends. Thanks,
Charles Plessy. (Closes: #534684)
+ + [RA] Allow variable settings before ant, dpatch, and dh when
+ checking debian/rules for dependencies. Thanks, Ryan Niebur.
+ (Closes: #535432)
* checks/files{,.desc}:
+ [RA] Allow non-core Python packages to install files into
/usr/lib/python*/dist-packages, the extension location for Python
--
Debian package checker
Reply to: