lintian: r652 - in trunk: checks debian testset testset/cdbs-test/debian
Author: rra
Date: 2006-05-01 04:59:53 +0200 (Mon, 01 May 2006)
New Revision: 652
Modified:
trunk/checks/fields
trunk/debian/changelog
trunk/testset/cdbs-test/debian/control
trunk/testset/cdbs-test/debian/rules
trunk/testset/tags.relations
Log:
+ [RA] Allow a build-dependency on patchutils when using CDBS with one
of the patch systems, as patchutils may be optionally used to check
for bad patches. Thanks, Marc Dequ?\195?\168nes (Duck). (Closes: #365466)
+ [RA] Since some packages should be in Build-Depends and some should
be in Build-Depends-Indep, report all of the misplaced ones rather
than just the first one. That way, users know which to move.
Modified: trunk/checks/fields
===================================================================
--- trunk/checks/fields 2006-05-01 02:40:12 UTC (rev 651)
+++ trunk/checks/fields 2006-05-01 02:59:53 UTC (rev 652)
@@ -47,6 +47,14 @@
[ 'quilt (>= 0.40)' => '^include\s+/usr/share/quilt/' ]
);
+# These are similar, but the resulting dependency is only allowed, not
+# required.
+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' ],
+);
+
# 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.
@@ -486,7 +494,7 @@
# The keys in %needed and %needed_clean are the dependencies; the
# values are the tags to use or the empty string to use the default
# tag.
- my (%needed, %needed_clean);
+ my (%needed, %needed_clean, %allowed_clean);
open (RULES, "debfiles/rules") or fail("cannot read debfiles/rules: $!");
my $target = "none";
local $/ = "\n"; # Read this linewise
@@ -497,6 +505,11 @@
$needed_clean{$rule->[0]} = $rule->[2] || $needed_clean{$rule->[0]} || '';
}
}
+ for my $rule (@global_clean_allowed) {
+ if ($_ =~ /$rule->[1]/) {
+ $allowed_clean{$rule->[0]} = 1;
+ }
+ }
for my $rule (@global_depends) {
if ($_ =~ /$rule->[1]/) {
$needed{$rule->[0]} = $rule->[2] || $needed{$rule->[0]} || '';
@@ -611,9 +624,8 @@
my @packages = split /\s*,\s*/, $build_depends;
foreach my $pkg (@packages) {
my ($name) = ($pkg =~ /^(\S+)/);
- unless (defined $needed_clean{$name}) {
+ unless (defined $needed_clean{$name} || defined $allowed_clean{$name}) {
tag "build-depends-without-arch-dep", $name;
- last;
}
}
}
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-05-01 02:40:12 UTC (rev 651)
+++ trunk/debian/changelog 2006-05-01 02:59:53 UTC (rev 652)
@@ -5,6 +5,12 @@
Parsons. (Closes: #365503)
+ [RA] Report errors for dependencies on python-minimal. Thanks to
Steve Langasek for the analysis.
+ + [RA] Allow a build-dependency on patchutils when using CDBS with one
+ of the patch systems, as patchutils may be optionally used to check
+ for bad patches. Thanks, Marc Dequènes (Duck). (Closes: #365466)
+ + [RA] Since some packages should be in Build-Depends and some should
+ be in Build-Depends-Indep, report all of the misplaced ones rather
+ than just the first one. That way, users know which to move.
* checks/files{.desc,}:
+ [RA] Add an explicit check for non-world-readable executables to
provide a more detailed explanation and tighten the accepted
@@ -17,7 +23,7 @@
+ [RA] Report a more specific tag for binaries that are owned by group
games but are not setgid.
- -- Russ Allbery <rra@debian.org> Sun, 30 Apr 2006 19:39:56 -0700
+ -- Russ Allbery <rra@debian.org> Sun, 30 Apr 2006 19:59:02 -0700
lintian (1.23.19) unstable; urgency=low
Modified: trunk/testset/cdbs-test/debian/control
===================================================================
--- trunk/testset/cdbs-test/debian/control 2006-05-01 02:40:12 UTC (rev 651)
+++ trunk/testset/cdbs-test/debian/control 2006-05-01 02:59:53 UTC (rev 652)
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Frank Lichtenheld <djpig@debian.org>
-Build-Depends: cdbs, yada
+Build-Depends: cdbs, yada, patchutils (>= 0.2.25)
Build-Depends-Indep: debhelper, cdbs
Standards-Version: 3.7.0
Modified: trunk/testset/cdbs-test/debian/rules
===================================================================
--- trunk/testset/cdbs-test/debian/rules 2006-05-01 02:40:12 UTC (rev 651)
+++ trunk/testset/cdbs-test/debian/rules 2006-05-01 02:59:53 UTC (rev 652)
@@ -2,4 +2,5 @@
# -*- makefile -*-
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/python-distutils.mk
Modified: trunk/testset/tags.relations
===================================================================
--- trunk/testset/tags.relations 2006-05-01 02:40:12 UTC (rev 651)
+++ trunk/testset/tags.relations 2006-05-01 02:59:53 UTC (rev 652)
@@ -28,6 +28,12 @@
I: relations: unknown-field-in-control bugs
I: relations: unknown-field-in-control origin
W: relations source: ancient-standards-version 3.1.1
+W: relations source: build-depends-without-arch-dep arch-test1
+W: relations source: build-depends-without-arch-dep arch-test2
+W: relations source: build-depends-without-arch-dep bar
+W: relations source: build-depends-without-arch-dep findutils
+W: relations source: build-depends-without-arch-dep foo
+W: relations source: build-depends-without-arch-dep libc6-dev
W: relations source: build-depends-without-arch-dep mail-transport-agent
W: relations source: redundant-origin-field
W: relations source: virtual-package-depends-without-real-package-depends build-depends: mail-transport-agent
Reply to: