lintian: r1082 - in trunk: checks debian testset

[rra@debian.org]

Author: rra
Date: 2007-12-18 21:58:27 +0100 (Tue, 18 Dec 2007)
New Revision: 1082

Modified:
   trunk/checks/control-file
   trunk/checks/control-file.desc
   trunk/debian/changelog
   trunk/testset/tags.relations
Log:
* checks/control-file{.desc,}:
  + [RA] Include the package name in stronger-dependency-implies-weaker.


Modified: trunk/checks/control-file
===================================================================
--- trunk/checks/control-file	2007-12-18 20:02:14 UTC (rev 1081)
+++ trunk/checks/control-file	2007-12-18 20:58:27 UTC (rev 1082)
@@ -89,7 +89,7 @@
         for my $weak (($strong + 1) .. $#dep_fields) {
             next unless $control->{$dep_fields[$weak]};
             for my $dependency (split /\s*,\s*/, $control->{$dep_fields[$weak]}) {
-                tag "stronger-dependency-implies-weaker", "$dep_fields[$strong] -> $dep_fields[$weak]", $dependency
+                tag "stronger-dependency-implies-weaker", $control->{package}, "$dep_fields[$strong] -> $dep_fields[$weak]", $dependency
                     if Dep::implies($parsed, Dep::parse($dependency));
             }
         }

Modified: trunk/checks/control-file.desc
===================================================================
--- trunk/checks/control-file.desc	2007-12-18 20:02:14 UTC (rev 1081)
+++ trunk/checks/control-file.desc	2007-12-18 20:58:27 UTC (rev 1082)
@@ -66,11 +66,13 @@
 Tag: stronger-dependency-implies-weaker
 Type: warning
 Ref: 7.2
-Info: A stronger dependency field implies one of the dependencies in a
- weaker dependency field.  In other words, the Depends field of the
- package requires that one of the packages listed in Recommends or
- Suggests be installed, or a package is listed in Recommends as well as
- Recommends.  Current versions of dpkg-gencontrol will silently fix this
- problem by removing the weaker dependency, but it may indicate a more
- subtle bug (misspelling or forgetting to remove the stronger dependency
- when it was moved to the weaker field).
+Info: In the <tt>debian/control</tt> stanza for the given package, a
+ stronger dependency field implies one of the dependencies in a weaker
+ dependency field.  In other words, the Depends field of the package
+ requires that one of the packages listed in Recommends or Suggests be
+ installed, or a package is listed in Recommends as well as Recommends.
+ .
+ Current versions of dpkg-gencontrol will silently fix this problem by
+ removing the weaker dependency, but it may indicate a more subtle bug
+ (misspelling or forgetting to remove the stronger dependency when it was
+ moved to the weaker field).

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-12-18 20:02:14 UTC (rev 1081)
+++ trunk/debian/changelog	2007-12-18 20:58:27 UTC (rev 1082)
@@ -1,11 +1,14 @@
 lintian (1.23.42) UNRELEASED; urgency=low
 
+  * checks/control-file{.desc,}:
+    + [RA] Include the package name in stronger-dependency-implies-weaker.
+  
   * 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
+ -- Russ Allbery <rra@debian.org>  Tue, 18 Dec 2007 12:58:17 -0800
 
 lintian (1.23.41) unstable; urgency=low
 

Modified: trunk/testset/tags.relations
===================================================================
--- trunk/testset/tags.relations	2007-12-18 20:02:14 UTC (rev 1081)
+++ trunk/testset/tags.relations	2007-12-18 20:58:27 UTC (rev 1082)
@@ -40,11 +40,11 @@
 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
-W: relations source: stronger-dependency-implies-weaker recommends -> suggests some-other-package
+W: relations source: stronger-dependency-implies-weaker relations depends -> recommends dpkg
+W: relations source: stronger-dependency-implies-weaker relations depends -> recommends null
+W: relations source: stronger-dependency-implies-weaker relations pre-depends -> depends gawk | awk
+W: relations source: stronger-dependency-implies-weaker relations recommends -> suggests some-other-package
+W: relations source: stronger-dependency-implies-weaker relations-multiple-libs depends -> recommends ${shlibs:Depends}
 W: relations source: virtual-package-depends-without-real-package-depends build-depends: mail-transport-agent
 W: relations-multiple-libs: bad-homepage lintian.debian.org
 W: relations-multiple-libs: description-synopsis-might-not-be-phrased-properly