[SCM] Debian package checker branch, master, updated. 2.5.4-143-g4fcdc9c

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

The following commit has been merged in the master branch:
commit 4fcdc9ca71abf6899b23e356a4715ab3f5ad0d07
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Feb 4 15:56:30 2012 +0100

    harness: Also handle gpgv with $LINTIAN_GPG_CHECK
    
    Apparently dpkg-source prefers gpgv to gpg, so ensure that gpgv is
    also linked to /bin/true when skipping gpg checks.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 26c6284..596426f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -261,6 +261,9 @@ lintian (2.5.5) UNRELEASED; urgency=low
     + [NT] Added --dry-run option.
     + [NT] A source package is now only processed if one (or more) of
       its binaries are processed as well.
+    + [NT] Also symlink $LINTIAN_BIN_DIR/gpgv to /bin/true when
+      skipping signature checks.  This avoids issues when some tools
+      (such as dpkg-source) prefers gpgv to gpg.
   * reporting/html_reports:
     + [JW] Properly handle uploader names with commas.
     + [NT] Use the severities from profiles when generating tag pages.
diff --git a/reporting/harness b/reporting/harness
index a6a9efe..a8c5334 100755
--- a/reporting/harness
+++ b/reporting/harness
@@ -125,14 +125,18 @@ unless ($opt{'dry-run'}) {
     system("mkdir -p -m 775 $LINTIAN_BIN_DIR") == 0 || die "$!";
 
     if ($LINTIAN_GPG_CHECK) {
-        if (-l $LINTIAN_BIN_DIR . '/gpg') {
-            unlink($LINTIAN_BIN_DIR . '/gpg');
-        } else {
-            rename($LINTIAN_BIN_DIR . '/gpg', $LINTIAN_BIN_DIR . '/gpg.bkp');
+        foreach my $g (qw(gpg gpgv)) {
+            if (-l "$LINTIAN_BIN_DIR/$g") {
+                unlink "$LINTIAN_BIN_DIR/$g";
+            } else {
+                rename "$LINTIAN_BIN_DIR/$g", "$LINTIAN_BIN_DIR/${g}.bkp";
+            }
         }
     } else {
-        symlink '/bin/true', $LINTIAN_BIN_DIR . '/gpg'
-            unless(-f $LINTIAN_BIN_DIR . '/gpg');
+        foreach my $g (qw(gpg gpgv)) {
+            symlink '/bin/true', "$LINTIAN_BIN_DIR/$g"
+                unless -f "$LINTIAN_BIN_DIR/$g";
+        }
     }
 }
 

-- 
Debian package checker