[SCM] Debian package checker branch, master, updated. 2.5.12-31-g3bb8b91

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

The following commit has been merged in the master branch:
commit 3bb8b91ab02eeba4ffb19cede41e1ec780bd6cd3
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Apr 21 10:10:13 2013 +0200

    c/conffiles: On duplicate-conffile skip further tests
    
    When emitting a duplicate-conffile tag, there is no reason to repeat
    other tags said conffile might trigger.  The exception to this is
    relative-conffile, where there is a chance that only one of the
    conffiles will trigger it.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/conffiles b/checks/conffiles
index e89d55a..f13e2ed 100644
--- a/checks/conffiles
+++ b/checks/conffiles
@@ -60,6 +60,7 @@ if (-f $cf) {
 
         if ($conffiles{$filename} > 1) {
             tag 'duplicate-conffile', $filename;
+            next;
         }
 
         if ($filename =~ m{^ usr/ }xsm) {
diff --git a/debian/changelog b/debian/changelog
index ccbe925..a9c83e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ lintian (2.5.13) UNRELEASED; urgency=low
   * checks/conffiles:
     + [NT] Strip whitespace from conffiles similar to how dpkg
       does it.
+    + [NT] When emitting duplicate-conffile, avoid repeating
+      other tags related to that conffile.  The exception to
+      this is relative-conffile where the original file might
+      not have triggered that tag.
   * checks/fields.desc:
     + [NT] Clarify that the "canonical URI" for Vcs fields is
       based on an announcement from the Alioth admins.  Thanks

-- 
Debian package checker