[SCM] Debian package checker branch, master, updated. 2.5.2-44-g9cce597

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

The following commit has been merged in the master branch:
commit 9cce59761c81efadf29777fb67c2b3f2c21e68c6
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Aug 20 12:15:31 2011 +0200

    Ignore all empty files instead of just __init__.py
    
    Lintian now ignores all empty files instead of just __init__.py
    files, when checking for duplicate files.  The original bug
    report only requested an exception for "empty __init__.py" files,
    so it should not cause regressions.
      As for excluding empty files in general; they are unlikely to
    cause a real size waste and are most likely not worth the effort
    to symlink.

diff --git a/checks/duplicate-files b/checks/duplicate-files
index 65ebed6..8c8aad7 100644
--- a/checks/duplicate-files
+++ b/checks/duplicate-files
@@ -38,10 +38,11 @@ foreach my $file (@{ $info->sorted_index }){
     my $fs;
     next unless defined $md5;
     next unless $info->index->{$file}->{type} eq '-';
+    # Ignore empty files; in some cases (e.g. python) a file is
+    # required even if it is empty and we are never looking at a
+    # substantial gain in such a case.  Also see #632789
+    next unless $info->index->{$file}->{size};
     next unless $file =~ m@usr/share/doc/@o;
-    # skip __init__.py files; if they trigger this, they are
-    # most likely empty (see #632789)
-    next if $file =~ m,/__init__\.py$,o;
     $fs = $hashmap{$md5};
     unless (defined $fs){
         $fs = [$file];
diff --git a/checks/duplicate-files.desc b/checks/duplicate-files.desc
index 153e325..047e2fc 100644
--- a/checks/duplicate-files.desc
+++ b/checks/duplicate-files.desc
@@ -11,6 +11,8 @@ Certainty: possible
 Experimental: yes
 Info: The package ships the two (or more) files with the exact same
  contents.
+ .
+ Note: empty files are exempt from this check.
 
 Tag: duplicate-changelog-files
 Severity: normal
diff --git a/debian/changelog b/debian/changelog
index 86cf4a6..14b64d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,11 @@ lintian (2.5.3) UNRELEASED; urgency=low
       LANG.  (Closes: #637595)
   * checks/{conffile,etcfiles}{,.desc}:
     + [JW] Merged etcfiles into conffile.  (Closes: #637590)
+  * checks/duplicate-files{,.desc}:
+    + [NT] Replace the exception for "__init__.py" files by excluding
+      all empty files from the check.  The bug (#632789) only requests
+      an exception for "empty __init__.py" files and generally empty
+      files are unlikely to cause a serious size-waste.
   * checks/fields.desc:
     + [NT] Mention that perl modules included in perl itself should
       be the first dependency if it is only included in the perl

-- 
Debian package checker