[SCM] Debian package checker branch, master, updated. 2.5.12-30-g0438e92

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

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

    c/conffiles: strip whitespace like dpkg
    
    dpkg strips whitespace from the right hand side of each line in the
    "conffiles" control file.  Update the check to emulate this behaviour.
    
    This also fixes a regression in the previous for "whitespace only"
    lines.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/conffiles b/checks/conffiles
index 506a93f..e89d55a 100644
--- a/checks/conffiles
+++ b/checks/conffiles
@@ -25,6 +25,7 @@ use warnings;
 use autodie;
 
 use Lintian::Tags qw(tag);
+use Lintian::Util qw(rstrip);
 
 sub run {
 
@@ -43,7 +44,9 @@ if (-f $cf) {
 
     open(my $fd, '<', $cf);
     while (my $filename = <$fd>) {
-        chomp($filename);
+        # dpkg strips whitespace (using isspace) from the right hand
+        # side of the file name.
+        rstrip($filename);
 
         next if $filename eq q{};
 
diff --git a/debian/changelog b/debian/changelog
index e5763a2..ccbe925 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ lintian (2.5.13) UNRELEASED; urgency=low
     + [NT] Recognise "<dist>-backports-sloppy" as a valid
       distribution.  Thanks to Romain Francoise for the
       report and the patch.  (Closes: #705170)
+  * checks/conffiles:
+    + [NT] Strip whitespace from conffiles similar to how dpkg
+      does it.
   * 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