lintian: r1081 - in trunk: debian lib testset testset/relations/debian
Author: rra
Date: 2007-12-18 21:02:14 +0100 (Tue, 18 Dec 2007)
New Revision: 1081
Modified:
trunk/debian/changelog
trunk/lib/Dep.pm
trunk/testset/relations/debian/control
trunk/testset/tags.relations
Log:
* lib/Dep.pm:
+ [RA] Allow substvars instead of package names so that dependency
checks against the source debian/control file don't treat all
substvars as equivalent. Thanks, Julien Cristau. (Closes: #456802)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-12-10 04:16:58 UTC (rev 1080)
+++ trunk/debian/changelog 2007-12-18 20:02:14 UTC (rev 1081)
@@ -1,3 +1,12 @@
+lintian (1.23.42) UNRELEASED; urgency=low
+
+ * lib/Dep.pm:
+ + [RA] Allow substvars instead of package names so that dependency
+ checks against the source debian/control file don't treat all
+ substvars as equivalent. Thanks, Julien Cristau. (Closes: #456802)
+
+ -- Russ Allbery <rra@debian.org> Tue, 18 Dec 2007 12:02:01 -0800
+
lintian (1.23.41) unstable; urgency=low
The "it would be lovely if there were an actual desktop file standard"
Modified: trunk/lib/Dep.pm
===================================================================
--- trunk/lib/Dep.pm 2007-12-10 04:16:58 UTC (rev 1080)
+++ trunk/lib/Dep.pm 2007-12-18 20:02:14 UTC (rev 1081)
@@ -26,10 +26,16 @@
# ---------------------------------
# public routines
+# We permit substvars for package names so that we can use the routines in
+# this library against the unparsed debian/control file.
sub Pred {
$_[0] =~
/^\s* # skip leading whitespace
- ([a-zA-Z0-9][a-zA-Z0-9+.-]+) # package name
+ ( # package name or substvar
+ [a-zA-Z0-9][a-zA-Z0-9+.-]+ # package name
+ | # or
+ (?:\$\{[a-zA-Z0-9:-]+\}) # substvar
+ ) # end of package name or substvar
(?: # start of optional part
\s* \( # open parenthesis for version part
\s* (<<|<=|=|>=|>>|<|>) # relation part
Modified: trunk/testset/relations/debian/control
===================================================================
--- trunk/testset/relations/debian/control 2007-12-10 04:16:58 UTC (rev 1080)
+++ trunk/testset/relations/debian/control 2007-12-18 20:02:14 UTC (rev 1081)
@@ -17,13 +17,13 @@
Architecture: all
Section: contrib/misc
Pre-Depends: awk|gawk
-Depends: relations(<< 3), dpkg, bash (>> 2.0 ), mail-transport-agent, gawk | awk, foo (>> 2.0), foo (<< 2.2), coreutils, null (>= 0)
+Depends: relations(<< 3), dpkg, bash (>> 2.0 ), mail-transport-agent, gawk | awk, foo (>> 2.0), foo (<< 2.2), coreutils, null (>= 0), ${misc:Depends}
Provides: mail-reader
Replaces: relations
Conflicts: foobar (<< 5&5), foo, relations,
gnuwdf,
Suggests: alpha, gnu (>= 44-3-4-8-11.4) | ung (<< 89beta) | nug | ngu, beta, some-other-package
-Recommends: emacs21 | emacsen, dpkg, null, some-other-package
+Recommends: emacs21 | emacsen, dpkg, null, some-other-package, ${f-oo:b-ar}
Description: Strange dependency relationships
This package declares relationships designed to tickle lintian's "fields"
check. It should generate a number of tags for these.
@@ -34,9 +34,10 @@
Package: relations-multiple-libs
Architecture: all
Section: non-free/misc
-Depends: libstdc++2.10, libstdc++2.10-glibc2.2, libstdc++3.0, tk8.2, tk8.3, tcl8.0, tcl8.2, tkx8.2, tkx8.3, tclx8.2, libpng2, libpng3, xorg
+Depends: libstdc++2.10, libstdc++2.10-glibc2.2, libstdc++3.0, tk8.2, tk8.3, tcl8.0, tcl8.2, tkx8.2, tkx8.3, tclx8.2, libpng2, libpng3, xorg, ${shlibs:Depends}
Provides: awk
Provides: awk
+Recommends: ${shlibs:Depends}
Description: Duplicate library dependency relationships.
Duplicate library dependency relationships.
This tests the depending on different versions of the same library
Modified: trunk/testset/tags.relations
===================================================================
--- trunk/testset/tags.relations 2007-12-10 04:16:58 UTC (rev 1080)
+++ trunk/testset/tags.relations 2007-12-18 20:02:14 UTC (rev 1081)
@@ -40,6 +40,7 @@
W: relations source: package-has-a-duplicate-build-relation foo (= 3) [!amd64 !i386], foo (<< 4) [!amd64 !i386]
W: relations source: package-has-a-duplicate-build-relation perl, perl (>= 5.0)
W: relations source: redundant-origin-field
+W: relations source: stronger-dependency-implies-weaker depends -> recommends ${shlibs:Depends}
W: relations source: stronger-dependency-implies-weaker depends -> recommends dpkg
W: relations source: stronger-dependency-implies-weaker depends -> recommends null
W: relations source: stronger-dependency-implies-weaker pre-depends -> depends gawk | awk
Reply to: