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

[SCM] Debian package checker branch, master, updated. 2.5.1-198-g2b04aca



The following commit has been merged in the master branch:
commit 2b04aca8f57708ff0af10f98cc3a6910bc12002d
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Aug 7 13:12:40 2011 +0200

    Ignore lintian-overrides when checking if a package is empty

diff --git a/checks/files b/checks/files
index 7ed88d2..4df987c 100644
--- a/checks/files
+++ b/checks/files
@@ -225,12 +225,14 @@ if ($is_empty) {
             # 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,) {
+            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$,);
 		$is_empty = 0;
 		last;
 	    }
             # Skip if /usr/share/doc/$pkg has files in a subdirectory
-            if ($file =~ m,usr/share/doc/\Q$pkg\E/.*/,) {
+            if ($file =~ m,^usr/share/doc/\Q$pkg\E/[^/]++/,) {
 		$is_empty = 0;
 		last;
 	    }
diff --git a/debian/changelog b/debian/changelog
index acf55af..162faaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -103,6 +103,8 @@ lintian (2.5.2) UNRELEASED; urgency=low
       four additional embedded javascript libraries.
       (Closes: #635447)
     + [NT] Stricten the regex for finding .xvpics dirs.
+    + [NT] Shipping a lintian override is no longer enough to
+      make lintian consider the package for "non-empty".
   * checks/init.d{,.desc}:
     + [NT] Provide a separate tag for upstart-jobs not registered
       via update-rc.d in postinst.  This allows vendors (such as

-- 
Debian package checker


Reply to: