[SCM] Debian package checker branch, master, updated. 2.5.3-37-ge51d662

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

The following commit has been merged in the master branch:
commit e51d662b4f7b3b0f0364c2ba16ea0ea9cf6d9e88
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Sep 29 20:38:26 2011 +0200

    Merge d/d/alt-dh_commands and d/d/dh_commands-versions
    
    The two files have been merged into d/debhelper/dh_commands-manual
    and it supports arbitrary relations.  These relations will
    completely override those from d/d/dh_commands.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/debhelper b/checks/debhelper
index 766b5ed..1ad4b6a 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -40,8 +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', '\|\|');
-my $dh_ver_deps = Lintian::Data->new ('debhelper/dh_commands-versions', qr/\|\|/o);
+my $dh_ver_deps = Lintian::Data->new ('debhelper/dh_commands-manual', qr/\|\|/o);
 
 # 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
@@ -139,11 +138,6 @@ while (<RULES>) {
                 $missingbdeps{$dep} = $dhcommand;
             } elsif ($dh_commands_depends->known($dhcommand)) {
                 my $dep = $dh_commands_depends->value($dhcommand);
-                my $alt = $dh_alt_deps->value($dhcommand)//'';
-
-                if ($alt) {
-                    $dep = "$dep | $alt";
-                }
                 $missingbdeps{$dep} = $dhcommand;
             }
             if ($versions{$dhcommand}) {
diff --git a/data/debhelper/alt-dh_commands b/data/debhelper/alt-dh_commands
deleted file mode 100644
index 4af13a1..0000000
--- a/data/debhelper/alt-dh_commands
+++ /dev/null
@@ -1,14 +0,0 @@
-# Manually maintained list of dh_commands provided by additional
-# packages beyond the primary one.  The format is:
-#
-#  dh_X||dep1 | dep2
-#
-# Note spaces are not allowed around the "||"-separator
-#
-# Please do not use this together with dh_commands-versions.
-#
-# 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/data/debhelper/dh_commands-versions b/data/debhelper/dh_commands-manual
similarity index 76%
rename from data/debhelper/dh_commands-versions
rename to data/debhelper/dh_commands-manual
index 9b403f0..a0fd8f4 100644
--- a/data/debhelper/dh_commands-versions
+++ b/data/debhelper/dh_commands-manual
@@ -8,8 +8,7 @@
 #
 # The dh_X is the dh_command and the dependency is the full dependency
 # (including both package and version).  This overrules any thing
-# listed in dh_commands (which is auto-generated).  Please do not use
-# this together with alt-dh_commands!
+# listed in dh_commands (which is auto-generated).
 #
 # Please keep this sorted.
 
@@ -17,9 +16,11 @@ dh_dpatch_patch||dpatch (>= 2.0.32~)
 dh_dpatch_unpatch||dpatch (>= 2.0.32~)
 dh_haskell_extra_depends||haskell-devscripts (>= 0.8.8~)
 dh_lv2config||lv2core (>= 4.0-2~)
+dh_nativejava||gcj-native-helper | default-jdk-builddep
 dh_pyppd||pyppd (>= 0.4.9-3~)
 dh_python-ply||python-ply (>= 3.4-1~)
+dh_python2||python | python-all | python-dev | python-all-dev
+dh_python3||python3 | python3-all | python3-dev | python3-all-dev
 dh_sphinxdoc||python-sphinx (>= 1.0.7+dfsg)
 dh_xsf_substvars||xserver-xorg-dev (>= 2:1.9.4-1~)
 
-
diff --git a/debian/changelog b/debian/changelog
index d7d12e5..8caa0a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,8 +30,12 @@ lintian (2.5.4) UNRELEASED; urgency=low
 
   * data/debhelper/{dh_commands,maint_commands,miscDepends_commands}:
     + [NT] Refreshed.
-  * data/debhelper/dh_commands-versions:
-    + [NT] New file.
+  * data/debhelper/alt-dh_commands:
+    + [NT] Renamed to dh_commands-manual.
+  * data/debhelper/dh_commands-manual:
+    + [NT] Support arbitrary dependency relations.  This new change
+      also fixes a "duplicate" in the dependency output.
+      (Closes: #643716)
 
   * lib/Lab.pm:
     + [NT] Updated it to use Lintian::Output::verbosity_level rather

-- 
Debian package checker