[SCM] Debian package checker branch, master, updated. 2.5.0-rc2-17-gb9a759b

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit b9a759bfa0711e1cce31fb43c781144e0ef0462b
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Apr 10 18:10:03 2011 +0200

    Added d/dh/alt-dh_commands with dh_python{2,3} and dh_nativejava

diff --git a/checks/debhelper b/checks/debhelper
index d4b1e53..84084d0 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -40,6 +40,7 @@ my $cdbscompat = 5;
 my $maint_commands = Lintian::Data->new ('debhelper/maint_commands');
 my $dh_commands_depends = Lintian::Data->new ('debhelper/dh_commands', '=');
 my $filename_configs = Lintian::Data->new ('debhelper/filename-config-files');
+my $dh_alt_deps = Lintian::Data->new ('debhelper/alt-dh_commands', '\|\|');
 
 # The version at which debhelper commands were introduced.  Packages that use
 # one of these commands must have a dependency on that version of debhelper or
@@ -122,13 +123,10 @@ while (<RULES>) {
 	unless ($maybe_skipping) {
 	    if ($dh_commands_depends->known($dhcommand)) {
 		my $dep = $dh_commands_depends->value($dhcommand);
+		my $alt = $dh_alt_deps->value($dhcommand)//'';
 
-		# Special-case gcj-native-helper, which is a metapackage to
-		# pull this helper. default-jdk-builddep is obsolete, but
-		# we keep it for backwards compatibility, because it used to
-		# serve this purpose.
-		if ($dhcommand eq 'dh_nativejava') {
-		    $dep = "$dep | gcj-native-helper | default-jdk-builddep";
+		if ($alt) {
+		    $dep = "$dep | $alt";
 		}
 		$missingbdeps{$dep} = $dhcommand;
 	    }
diff --git a/data/debhelper/alt-dh_commands b/data/debhelper/alt-dh_commands
new file mode 100644
index 0000000..9c8acf5
--- /dev/null
+++ b/data/debhelper/alt-dh_commands
@@ -0,0 +1,10 @@
+# Manually maintained list of dh_commands provided by additional
+#  packages beyond the primary one.  The format is:
+#
+#  dh_X || dep1 | dep2 
+#
+# Please keep this sorted.
+
+dh_nativejava||gcj-native-helper | default-jdk-builddep
+dh_python2||python | python-all | python-dev | python-all-dev
+dh_python3||python3 | python3-all | python3-dev | python3-all-dev
diff --git a/debian/changelog b/debian/changelog
index 2f1040d..89777b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ lintian (2.5.0~rc3) UNRELEASED; urgency=low
   * checks/binaries:
     + [NT] Accepted patch from Loïc Minier to support the armhf
       architecture.  (Closes: #618587)
+  * checks/debhelper:
+    + [NT] Use new alt-dh_commands data file to fetch alternative
+      dependencies for dh_commands, which are sometimes provided
+      indirectly by meta or API packages.
   * checks/files{,.desc}:
     + [NT] Added dir-or-file-in-run tag.
   * checks/scripts:
@@ -17,6 +21,9 @@ lintian (2.5.0~rc3) UNRELEASED; urgency=low
   * debian/control:
     + [NT] Bumped Standards-Version to 3.9.2.
 
+  * data/debhelper/alt-dh_commands:
+    + [NT] New file; contains alternative dependencies for
+      dh_python2 and dh_python3.  (Closes: #614879)
   * data/fields/architectures:
     + [NT] Updated to include armhf.
   * data/files/triplets:

-- 
Debian package checker