The following commit has been merged in the master branch: commit 4cc4aca61813fb9b9b064dceb155185fb0cfa5ae Author: Russ Allbery <r...@debian.org> Date: Sat Mar 20 16:58:09 2010 -0700
Suppress missing separator tag if substvars are in use * checks/control-file: + [RA] Suppress missing-separator-between-items if either of the items contain substvars other than *:Depends substvars, since substvars may be used to assemble the components of a dependency. Thanks, Matthias Klose. (Closes: #573815) diff --git a/checks/control-file b/checks/control-file index 121e63f..5d86304 100644 --- a/checks/control-file +++ b/checks/control-file @@ -127,12 +127,12 @@ for my $control ($header, @binary_controls) { $value =~ s/\[[^\]]*\]//g; if ($value =~ /(?:^|\s) ( - (?:\w[^\s,|\(]+|\$\{\S+\})\s* + (?:\w[^\s,|\$\(]+|\$\{\S+:Depends\})\s* (?:\([^\)]*\)\s*)? ) \s+ ( - (?:\w[^\s,|\(]+|\$\{\S+\})\s* + (?:\w[^\s,|\$\(]+|\$\{\S+:Depends\})\s* (?:\([^\)]*\)\s*)? )/x) { my ($prev, $next) = ($1, $2); diff --git a/debian/changelog b/debian/changelog index e693ff6..f266c7b 100755 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,10 @@ lintian (2.3.4) UNRELEASED; urgency=low (Closes: #573398) + [RA] Also exclude *-common packages from weak-library-dev-dependency checks. Thanks, Emilio Pozuelo Monfort. (Closes: #570408) + + [RA] Suppress missing-separator-between-items if either of the items + contain substvars other than *:Depends substvars, since substvars + may be used to assemble the components of a dependency. Thanks, + Matthias Klose. (Closes: #573815) * checks/init.d: + [RA] Exclude symlinks to upstart-job from init script syntax checks. Based on a patch by Jos Boumans. (Closes: #569492) diff --git a/t/tests/control-file-general/debian/debian/control.in b/t/tests/control-file-general/debian/debian/control.in index 7b58933..e494c0c 100644 --- a/t/tests/control-file-general/debian/debian/control.in +++ b/t/tests/control-file-general/debian/debian/control.in @@ -2,7 +2,7 @@ Source: {$srcpkg} Priority: extra Maintainer: {$author} Standards-Version: {$standards_version} -Build-Depends: debhelper (>= 7), +Build-Depends: debhelper (>= 7.0.50~), fiddle [amd64 powerpc mips mipsel hppa s390], faddle (>> @@ -49,7 +49,7 @@ Section: {$section} Architecture: {$architecture} Depends: $\{shlibs:Depends\}, $\{misc:Depends\}, foo (>= 1), baz (<< 2), - fizz (= 2.0) + fizz (= 2.0), gcc-$\{pv:gcc\} $\{reqv:gcc\} Description: {$description} (three) This is a test package designed to exercise some feature or tag of Lintian. It is part of the Lintian test suite and may do very odd diff --git a/t/tests/control-file-general/debian/debian/rules b/t/tests/control-file-general/debian/debian/rules new file mode 100644 index 0000000..f5db4bb --- /dev/null +++ b/t/tests/control-file-general/debian/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f +%: + dh $@ + +override_dh_gencontrol: + echo 'pv:gcc=4.3' >> debian/substvars + echo 'reqv:gcc=(>= 4.3-1)' >> debian/substvars + dh_gencontrol -- 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 Archive: http://lists.debian.org/e1nt8z9-0006sx...@alioth.debian.org