[SCM] Debian package checker branch, master, updated. 1.24.2-48-g8c78dd3

["Frank Lichtenheld" <djpig@debian.org>]

The following commit has been merged in the master branch:
commit 8c78dd3bb64a2ec8079325ff1d881fa0cc0e4db8
Author: Frank Lichtenheld <djpig@debian.org>
Date:   Wed Jul 30 17:47:28 2008 +0200

    checks/watch-file: Suppress mangle warning for empty watch files

diff --git a/checks/watch-file b/checks/watch-file
index 37c1afe..0177bd9 100644
--- a/checks/watch-file
+++ b/checks/watch-file
@@ -51,7 +51,7 @@ if ($version =~ /(dfsg|debian|ds)/) {
 # diagnose on the first time through.
 open(WATCH, '<', 'debfiles/watch') or fail("cannot open watch file: $!");
 local $_;
-my ($watchver, $mangle, $dmangle);
+my ($watchver, $mangle, $dmangle, $nonempty);
 while (<WATCH>) {
     next if /^\s*\#/;
     next if /^\s*$/;
@@ -71,6 +71,8 @@ while (<WATCH>) {
             tag 'debian-watch-file-unknown-version', $watchver;
         }
     } else {
+        $nonempty = 1;
+
         unless (defined($watchver)) {
             tag 'debian-watch-file-missing-version';
             $watchver = 1;
@@ -99,7 +101,7 @@ close WATCH;
 
 # If the version of the package contains dfsg, assume that it needs to be
 # mangled to get reasonable matches with upstream.
-if ($repack and not $mangle) {
+if ($nonempty and $repack and not $mangle) {
     tag 'debian-watch-file-should-mangle-version';
 }
 if ($repack and $mangle and not $dmangle) {
diff --git a/debian/changelog b/debian/changelog
index af61f75..9f61ab8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -66,6 +66,9 @@ lintian (1.24.3) unstable; urgency=low
     + [ADB] Disable ldconfig-symlink-before-shlib-in-deb as it can never be
       tested correctly using the information currently available to the
       scripts
+  * checks/watch-file:
+    + [FL] Do not issue debian-watch-file-should-mangle-version for
+      empty watch files.
 
   * data/doc-base/sections:
     + [ADB] Resynchronize with doc-base's section list (adding

-- 
Debian package checker