The following commit has been merged in the master branch:
commit 33633979240ecdee3c45a2e1e3d9c4e1142bce03
Author: Russ Allbery <r...@debian.org>
Date: Tue Dec 30 23:18:20 2008 -0800
dh-make-php may qualify for Build-Depends
* checks/fields:
+ [RA] dh-make-php provides a CDBS rule fragment and hence should go
into Build-Depends, not Build-Depends-Indep. Thanks, Mathieu
Parent. (Closes: #509286)
Also clean up regexes to escape periods.
diff --git a/checks/fields b/checks/fields
index 84ed8c3..0a650ac 100644
--- a/checks/fields
+++ b/checks/fields
@@ -46,15 +46,16 @@ my $python_depend = 'python | python-dev | python-all |
python-all-dev | '
# optional tags to use for reporting the problem if some information other
# than the default is required.
my @global_clean_depends = (
- [ ant => '^include\s*/usr/share/cdbs/1/rules/ant.mk' ],
+ [ ant => '^include\s*/usr/share/cdbs/1/rules/ant\.mk' ],
[ cdbs => '^include\s+/usr/share/cdbs/' ],
[ dbs => '^include\s+/usr/share/dbs/' ],
- [ debhelper => '^include\s+/usr/share/cdbs/1/rules/debhelper.mk' ],
- [ dpatch => '^include\s+/usr/share/cdbs/1/rules/dpatch.mk' ],
- [ quilt => '^include\s+/usr/share/cdbs/1/rules/patchsys-quilt.mk' ],
+ [ 'dh-make-php' => '^include\s+/usr/share/cdbs/1/class/pear\.mk' ],
+ [ debhelper => '^include\s+/usr/share/cdbs/1/rules/debhelper\.mk' ],
+ [ dpatch => '^include\s+/usr/share/cdbs/1/rules/dpatch\.mk' ],
+ [ quilt => '^include\s+/usr/share/cdbs/1/rules/patchsys-quilt\.mk' ],
[ dpatch => '^include\s+/usr/share/dpatch/' ],
[ quilt => '^include\s+/usr/share/quilt/' ],
- [ $python_depend => '/usr/share/cdbs/1/class/python-distutils.mk',
'missing-python-build-dependency' ],
+ [ $python_depend => '/usr/share/cdbs/1/class/python-distutils\.mk',
'missing-python-build-dependency' ],
);
# These are similar, but the resulting dependency is only allowed, not
@@ -63,12 +64,12 @@ my @global_clean_depends = (
# The xsfclean rule is specific to the packages maintained by the X Strike
# Force, but there are enough of those to make the rule worthwhile.
my @global_clean_allowed = (
- [ patchutils => '^include\s+/usr/share/cdbs/1/rules/dpatch.mk' ],
- [ patchutils => '^include\s+/usr/share/cdbs/1/rules/patchsys-quilt.mk'
],
- [ patchutils => '^include\s+/usr/share/cdbs/1/rules/simple-patchsys.mk'
],
+ [ patchutils => '^include\s+/usr/share/cdbs/1/rules/dpatch\.mk' ],
+ [ patchutils => '^include\s+/usr/share/cdbs/1/rules/patchsys-quilt\.mk'
],
+ [ patchutils =>
'^include\s+/usr/share/cdbs/1/rules/simple-patchsys\.mk' ],
[ 'python-central' => '^DEB_PYTHON_SYSTEM\s*:?=\s*pycentral' ],
[ 'python-support' => '^DEB_PYTHON_SYSTEM\s*:?=\s*pysupport' ],
- [ 'python-setuptools' => '/usr/share/cdbs/1/class/python-distutils.mk'
],
+ [ 'python-setuptools' => '/usr/share/cdbs/1/class/python-distutils\.mk'
],
[ quilt => '^clean:\s+xsfclean\b' ],
);
@@ -112,7 +113,7 @@ my @rule_clean_allowed = (
# enough that we can't know what packages are permitted in Build-Depends and
# should bypass the build-depends-without-arch-dep check completely.
my @global_clean_bypass = (
- '^include\s*/usr/share/cdbs/1/class/ant.mk',
+ '^include\s*/usr/share/cdbs/1/class/ant\.mk',
'^\s+dh\s+'
);
diff --git a/debian/changelog b/debian/changelog
index f54f2c7..0419400 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,6 +46,10 @@ lintian (2.1.4) UNRELEASED; urgency=low
files that list filenames, which is not supported. Based on a patch
from Raphael Geissert. (Closes: #480939)
+ [RA] If dh is used, require debhelper tokens in maintainer scripts.
+ * checks/fields:
+ + [RA] dh-make-php provides a CDBS rule fragment and hence should go
+ into Build-Depends, not Build-Depends-Indep. Thanks, Mathieu
+ Parent. (Closes: #509286)
* checks/files{,.desc}:
+ [RA] Packages whose executables are all in /usr/games should
probably be in section games. (Closes: #509147)
--
Debian package checker
--
To UNSUBSCRIBE, email to debian-lint-maint-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
