[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.11-86-g3af9214



The following commit has been merged in the master branch:
commit 3af9214402041361af95b6838ee02098e912514e
Author: Niels Thykier <niels@thykier.net>
Date:   Mon Jan 21 17:07:08 2013 +0100

    c/files: Ignore gzipped compressed overrides
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/files b/checks/files
index f3b605a..7fcb5b5 100644
--- a/checks/files
+++ b/checks/files
@@ -215,12 +215,10 @@ if (!$is_dummy) {
     for my $file ($info->sorted_index) {
         # Ignore directories
         unless ($file =~ m,/$,) {
-            # Skip if $file is an empty string
-            next if not $file;
             # Skip if $file is outside /usr/share/doc/$pkg directory
             if ($file !~ m,^usr/share/doc/\Q$pkg\E,) {
                 # - except if it is an lintian override.
-                next if ($file =~ m,^usr/share/lintian/overrides/\Q$pkg\E$,);
+                next if $file =~ m,^usr/share/lintian/overrides/\Q$pkg\E(?:\.gz)?$,;
                 $is_empty = 0;
                 last;
             }
diff --git a/debian/changelog b/debian/changelog
index 23f6e21..e631ea1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,6 +46,8 @@ lintian (2.5.12) UNRELEASED; urgency=low
       to suppress empty-binary-package.  Lintian will still
       accept it the phrase for now.
     + [NT] Accept libx32 as an bi-arch directory.
+    + [NT] Ignore gzipped lintian overrides when checking whether
+      a package is empty.
   * checks/init.d:
     + [NT] Fix regression where Lintian would not properly match
       init.d passed to update-rc.d.  Thanks to Michael Meskes for

-- 
Debian package checker


Reply to: