[SCM] Debian package checker branch, master, updated. 2.5.3-68-g392e9fd

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

The following commit has been merged in the master branch:
commit 392e9fd5cd5ac1373f26337f0926250c4b5e8382
Author: Andreas Beckmann <debian@abeckmann.de>
Date:   Mon Oct 17 22:28:18 2011 +0200

    distinguish between is_empty and is_dummy
    
    The $is_empty variable can't be used to distinguish transitional packages.
    Instead add a $is_dummy variable for tracking the result from analyzing
    the description for dummy/transitional/meta package keywords.
    
    Fix the files-arch-indep-not-marked-all test to use a package that
    is neither transitional nor empty.
    
    Acked-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/files b/checks/files
index 97c70a8..432599e 100644
--- a/checks/files
+++ b/checks/files
@@ -213,17 +213,18 @@ my @devhelp_links;
 my %x11_font_dirs;
 
 # Check if package is empty
-my $is_empty = 1;
+my $is_dummy = 0;
 my $description = $info->field('description');
 if ($description) {
     for my $regex (@METAPKG_REGEX) {
         if ($description =~ /$regex/) {
-            $is_empty = 0;
+            $is_dummy = 1;
             last;
         }
     }
 }
-if ($is_empty) {
+if (!$is_dummy) {
+    my $is_empty = 1;
     for my $file (@{$info->sorted_index}) {
         # Ignore directories
         unless ($file =~ m,/$,) {
@@ -1334,7 +1335,7 @@ foreach my $file (@{$info->sorted_index}) {
     }
 }
 
-if (!$is_empty && !$arch_dep_files && ($info->field('architecture')//'') ne 'all') {
+if (!$is_dummy && !$arch_dep_files && ($info->field('architecture')//'') ne 'all') {
     tag 'package-contains-no-arch-dependent-files' unless $type eq 'udeb';
 }
 
diff --git a/debian/changelog b/debian/changelog
index 0e59f19..8c78ce5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,8 +39,9 @@ lintian (2.5.4) UNRELEASED; urgency=low
       (Closes: #641983)
     + [JW] Improve "linked against libvga.so" test.  This avoid
       setuid-binary false-positives.  (Closes: #642038)
-    + [NT] Skip package-contains-no-arch-dependent-files for empty
-      packages.  (Closes: #642339)
+    + [NT] Skip package-contains-no-arch-dependent-files for
+      transitional packages.  Thanks to Andreas Beckmann for the patch.
+      (Closes: #642339)
   * checks/rules:
     + [JW] Fixed false negative "missing-build-dependency" when using
       "dh --with=X" rather than "dh --with X".  (Closes: #643714)
diff --git a/testset/tags.debconf b/testset/tags.debconf
index b0bb806..632377c 100644
--- a/testset/tags.debconf
+++ b/testset/tags.debconf
@@ -72,7 +72,3 @@ W: debconf-test: using-imperative-form-in-templates debconf/1st-person
 W: debconf-test: using-imperative-form-in-templates debconf/should-be-boolean
 W: debconf-test: using-question-in-extended-description-in-templates debconf/testboolean
 W: debconf-udeb udeb: missing-debconf-dependency
-X: debconf-test-noscripts: package-contains-no-arch-dependent-files
-X: debconf-test-postinst: package-contains-no-arch-dependent-files
-X: debconf-test-preinst: package-contains-no-arch-dependent-files
-X: debconf-test: package-contains-no-arch-dependent-files
diff --git a/testset/tags.debug b/testset/tags.debug
index 1171a16..191f3de 100644
--- a/testset/tags.debug
+++ b/testset/tags.debug
@@ -47,5 +47,3 @@ W: libhello0: symbols-declares-dependency-on-other-package libhello2 (>= 1:2.3)
 W: libhello0: symbols-declares-dependency-on-other-package libhelloc0c2 (<< 1.3)
 W: libhello0: symbols-declares-dependency-on-other-package libhelloc0c3
 W: libhello0: unused-shlib-entry-in-symbols-control-file libhello 2
-X: hello-hello-dbg: package-contains-no-arch-dependent-files
-X: hi-dbg: package-contains-no-arch-dependent-files

-- 
Debian package checker