lintian: r563 - in trunk: checks debian testset testset/maintainer-scripts/debian
Author: rra
Date: 2006-03-05 08:11:27 +0100 (Sun, 05 Mar 2006)
New Revision: 563
Modified:
trunk/checks/fields
trunk/debian/changelog
trunk/testset/maintainer-scripts/debian/control
trunk/testset/maintainer-scripts/debian/rules
trunk/testset/tags.maintainer-scripts
Log:
+ [RA] If clean depends on a rule that calls dh_clean rather than
calling it directly, still allow debhelper in Build-Depends for
arch-independent packages. Reported by Michael Stilkerich.
Modified: trunk/checks/fields
===================================================================
--- trunk/checks/fields 2006-03-05 06:11:42 UTC (rev 562)
+++ trunk/checks/fields 2006-03-05 07:11:27 UTC (rev 563)
@@ -43,8 +43,8 @@
);
# Similarly, these pairs of packages and regexes say that if the regex matches
-# in one of clean, build-arch, or binary-arch, this package is allowed in
-# Build-Depends.
+# in one of clean, build-arch, binary-arch, or a rule they depend on, this
+# package is allowed in Build-Depends.
my @rule_depends = (
[ debhelper => '^\s+dh_.+' ]
);
@@ -432,14 +432,20 @@
} else {
my $target = "none";
local $/ = "\n"; #Read this linewise
+ my @rules = qw(clean binary-arch build-arch);
while (<RULES>) {
for my $rule (@global_depends) {
if ($_ =~ /$rule->[1]/) {
$allowed{$rule->[0]}++;
}
}
- $target = $1 if (/^(\S+):/);
- if (grep ($_ eq $target, qw(clean binary-arch build-arch))) {
+ if (/^(\S+):(.*)/) {
+ $target = $1;
+ if (grep ($_ eq $target, @rules)) {
+ push (@rules, split (' ', $2));
+ }
+ }
+ if (grep ($_ eq $target, @rules)) {
for my $rule (@rule_depends) {
if ($_ =~ /$rule->[1]/) {
$allowed{$rule->[0]}++;
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-03-05 06:11:42 UTC (rev 562)
+++ trunk/debian/changelog 2006-03-05 07:11:27 UTC (rev 563)
@@ -12,6 +12,9 @@
* checks/fields:
+ [RA] Allow a quilt build-dependency for arch-independent packages if
the quilt makefile rules are included. (Closes: #349273)
+ + [RA] If clean depends on a rule that calls dh_clean rather than
+ calling it directly, still allow debhelper in Build-Depends for
+ arch-independent packages. Reported by Michael Stilkerich.
* checks/manpages:
+ [FL] Ignore more warnings ("cannot adjust line", "can't break
line") in non-English manpages. (Closes: #349792)
Modified: trunk/testset/maintainer-scripts/debian/control
===================================================================
--- trunk/testset/maintainer-scripts/debian/control 2006-03-05 06:11:42 UTC (rev 562)
+++ trunk/testset/maintainer-scripts/debian/control 2006-03-05 07:11:27 UTC (rev 563)
@@ -3,6 +3,7 @@
Priority: optional
Maintainer: QA group <packages@qa.debian.org>
Uploaders: Anyone but Jeroen <jeroen@wolffelaar.nl>
+Build-Depends: debhelper
Standards-Version: 3.1.1
Package: maintainer-scripts
Modified: trunk/testset/maintainer-scripts/debian/rules
===================================================================
--- trunk/testset/maintainer-scripts/debian/rules 2006-03-05 06:11:42 UTC (rev 562)
+++ trunk/testset/maintainer-scripts/debian/rules 2006-03-05 07:11:27 UTC (rev 563)
@@ -23,6 +23,12 @@
binary: binary-arch binary-indep
-clean:
+# Make sure we see dh_clean even in a rule clean depends on. Not the point of
+# this test suite, but a convenient place to put it.
+clean: clean1 clean2 clean3
+clean1:
+clean2:
+ dh_clean
+clean3:
.PHONY: build binary-arch binary-indep binary clean
Modified: trunk/testset/tags.maintainer-scripts
===================================================================
--- trunk/testset/tags.maintainer-scripts 2006-03-05 06:11:42 UTC (rev 562)
+++ trunk/testset/tags.maintainer-scripts 2006-03-05 07:11:27 UTC (rev 563)
@@ -19,6 +19,7 @@
I: maintainer-scripts: possible-non-posix-code-in-maintainer-script prerm:25 ' local '
W: maintainer-scripts source: ancient-standards-version 3.1.1
W: maintainer-scripts source: changelog-should-mention-qa
+W: maintainer-scripts source: package-uses-deprecated-debhelper-compat-version 1
W: maintainer-scripts source: qa-upload-has-incorrect-version-number 7-0.1
W: maintainer-scripts: config-does-not-load-confmodule
W: maintainer-scripts: deprecated-chown-usage postinst:33 'chown root.root'
Reply to: