[SCM] Debian package checker branch, master, updated. 2.2.13-55-g480e1b0

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

The following commit has been merged in the master branch:
commit 480e1b0ec00540aeaf841244c26df2bc31f6b755
Author: Russ Allbery <rra@debian.org>
Date:   Sat Aug 15 20:49:04 2009 -0700

    Don't warn about build dependencies for optional debhelper commands
    
    * checks/debhelper{,.desc}:
      + [RA] Don't warn about missing build dependencies for commands in
        possibly optional portions of debian/rules.  (Closes: #537608)

diff --git a/checks/debhelper b/checks/debhelper
index 47c1e15..d6f7e17 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -118,18 +118,24 @@ while (<RULES>) {
 	if ($miscDeps_commands->known($dhcommand)) {
 	    $needmiscdepends = 1;
 	}
-	if ($dh_commands_depends->known($dhcommand)) {
-	    my $dep = $dh_commands_depends->value($dhcommand);
 
-	    # Special-case default-jdk-builddep.  It appears to be a sort of
-	    # build-essential for Java applications.
-	    if ($dhcommand eq 'dh_nativejava') {
-		$dep = "$dep | default-jdk | default-jdk-builddep";
+	# If debhelper commands are wrapped in make conditionals, assume the
+	# maintainer knows what they're doing and don't check build
+	# dependencies.
+	unless ($maybe_skipping) {
+	    if ($dh_commands_depends->known($dhcommand)) {
+		my $dep = $dh_commands_depends->value($dhcommand);
+
+		# Special-case default-jdk-builddep.  It appears to be a sort
+		# of build-essential for Java applications.
+		if ($dhcommand eq 'dh_nativejava') {
+		    $dep = "$dep | default-jdk | default-jdk-builddep";
+		}
+		$missingbdeps{$dep} = $dhcommand;
+	    }
+	    if ($versions{$dhcommand}) {
+		push (@versioncheck, $dhcommand);
 	    }
-	    $missingbdeps{$dep} = $dhcommand;
-	}
-	if ($versions{$dhcommand}) {
-	    push (@versioncheck, $dhcommand);
 	}
 	$seencommand = 1;
 	$needbuilddepends = 1;
diff --git a/debian/changelog b/debian/changelog
index 03b6772..92a13a2 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ lintian (2.2.14) UNRELEASED; urgency=low
       debhelper 7.0.50.
     + [RA] Don't warn about recently deprecated debhelper commands in
       possibly optional portions of debian/rules.  (Closes: #537607)
+    + [RA] Don't warn about missing build dependencies for commands in
+      possibly optional portions of debian/rules.  (Closes: #537608)
   * checks/description:
     + [RA] Decode descriptions from UTF-8 before checking length.  Thanks,
       Charles Plessy.  (Closes: #537207)
diff --git a/t/tests/debhelper-no-depends/debian/debian/rules b/t/tests/debhelper-no-depends/debian/debian/rules
index 18dc726..595af91 100755
--- a/t/tests/debhelper-no-depends/debian/debian/rules
+++ b/t/tests/debhelper-no-depends/debian/debian/rules
@@ -9,4 +9,13 @@ binary-indep:
 	-dh_clideps
 	-dh_gtkmodules
 	dh_lisp || true
+# We don't warn about commands inside make conditionals, so none of these
+# get any warnings.
+ifeq "$(USE_PYCENTRAL)" "y"
+	dh_pycentral
+else
+  ifeq "$(USE_PYSUPPORT)" "y"
+	dh_pysupport
+  endif
+endif
 	dh binary-indep --remaining

-- 
Debian package checker