[SCM] Debian package checker branch, master, updated. 2.3.0-49-g8d6bb4a

["Russ Allbery" <rra@debian.org>]

The following commit has been merged in the master branch:
commit 8d6bb4aa7feaf2c4edc432b891696b6ae75c6744
Author: Russ Allbery <rra@debian.org>
Date:   Fri Jan 1 20:25:08 2010 -0800

    Always warn if debhelper is in use without ${misc:Depends}
    
    * checks/debhelper:
      + [RA] Always warn if debhelper is in use but no ${misc:Depends}
        dependency is present rather than checking which specific debhelper
        commands use it.  Any debhelper command may start adding
        dependencies to ${misc:Depends} at any time.  Lower the certainty to
        possible, since a missing ${misc:Depends} may not cause problems.

diff --git a/checks/debhelper b/checks/debhelper
index 3cf4090..e35cac1 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -33,7 +33,6 @@ use Lintian::Tags qw(tag);
 my $cdbscompat = 5;
 
 my $maint_commands = Lintian::Data->new ('debhelper/maint_commands');
-my $miscDeps_commands = Lintian::Data->new ('debhelper/miscDepends_commands');
 my $dh_commands_depends = Lintian::Data->new ('debhelper/dh_commands', '=');
 my $filename_configs = Lintian::Data->new ('debhelper/filename-config-files');
 
@@ -68,7 +67,6 @@ my $usescdbs = '';
 my $seendhpython = '';
 my $usescdbspython = '';
 my $seendhcleank = '';
-my $needmiscdepends = 0;
 my $overridetargets = 0;
 my %missingbdeps;
 
@@ -118,9 +116,6 @@ while (<RULES>) {
 	if ($maint_commands->known($dhcommand) and not m/\s+\-n\s+/) {
 	    $needtomodifyscripts = 1;
 	}
-	if ($miscDeps_commands->known($dhcommand)) {
-	    $needmiscdepends = 1;
-	}
 
 	# If debhelper commands are wrapped in make conditionals, assume the
 	# maintainer knows what they're doing and don't check build
@@ -146,13 +141,11 @@ while (<RULES>) {
 	$seencommand = 1;
 	$needbuilddepends = 1;
 	$needtomodifyscripts = 1;
-	$needmiscdepends = 1;
 	push (@versioncheck, 'dh');
     } elsif (m,^include\s+/usr/share/cdbs/1/rules/debhelper.mk,) {
 	$seencommand = 1;
 	$needbuilddepends = 1;
 	$needtomodifyscripts = 1;
-	$needmiscdepends = 1;
 
 	# CDBS sets DH_COMPAT but doesn't export it.  It does, however, create
 	# a debian/compat file if none was found; that logic is handled later.
@@ -195,8 +188,7 @@ for my $binpkg (keys %$pkgs) {
     $depends = $weak_depends . $strong_depends;
 
     tag 'debhelper-but-no-misc-depends', $binpkg
-	if $needmiscdepends and $depends !~ m/\$\{misc:Depends\}/
-	   and $pkgs->{$binpkg} eq 'deb';
+	if $depends !~ m/\$\{misc:Depends\}/ and $pkgs->{$binpkg} eq 'deb';
 
     tag 'weak-dependency-on-misc-depends', $binpkg
 	if $weak_depends =~ m/\$\{misc:Depends\}/
diff --git a/checks/debhelper.desc b/checks/debhelper.desc
index de4c34e..c9fdc7d 100644
--- a/checks/debhelper.desc
+++ b/checks/debhelper.desc
@@ -142,12 +142,14 @@ Info: This package uses dh_python but apparently does not tell it to use
 
 Tag: debhelper-but-no-misc-depends
 Severity: normal
-Certainty: certain
+Certainty: possible
 Ref: debhelper(7)
-Info: The source package uses debhelper but it does not use ${misc:Depends} in
- the given binary package's debian/control entry.  This is required so the
- dependencies are set correctly in case the result of a call to any of the dh_
- commands cause the package to depend on another package.
+Info: The source package uses debhelper, but it does not include
+ ${misc:Depends} in the given binary package's debian/control entry.  Any
+ debhelper command may add dependencies to ${misc:Depends} that are
+ required for the work that it does, so recommended best practice is to
+ always add ${misc:Depends} to the dependencies of each binary package if
+ debhelper is in use.
 
 Tag: missing-build-dependency-for-dh_-command
 Severity: important
diff --git a/debian/changelog b/debian/changelog
index f37bfdb..925664f 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,12 @@ lintian (2.3.1) UNRELEASED; urgency=low
       directory.  Thanks, Aaron M. Ucko.  (Closes: #553264)
     + [RA] Check for a non-native package with a native version.  Thanks,
       Andreas Beckmann.
+  * checks/debhelper:
+    + [RA] Always warn if debhelper is in use but no ${misc:Depends}
+      dependency is present rather than checking which specific debhelper
+      commands use it.  Any debhelper command may start adding
+      dependencies to ${misc:Depends} at any time.  Lower the certainty to
+      possible, since a missing ${misc:Depends} may not cause problems.
   * checks/fields.desc:
     + [RA] Fix spelling error in dfsg-version-with-period tag description.
       Thanks, Jakub Wilk.  (Closes: #563185)

-- 
Debian package checker