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

[SCM] Debian package checker branch, master, updated. 2.2.13-58-g72ef805



The following commit has been merged in the master branch:
commit 680bd29512b6500535b824c713d2f55109060569
Author: Russ Allbery <rra@debian.org>
Date:   Sat Aug 15 21:01:11 2009 -0700

    Improve recognition of metapackages
    
    * checks/fields{,.desc}:
      + [RA] Recognize packages as metapackages even if they contain Lintian
        overrides, thus fixing two packages that added a Lintian override
        for having dependencies only permitted for metapackages, which in
        turn ensures that they keep getting that tag.
      + [RA] Recognize packages as metapackages even if they contain files
        in /usr/share/cdd.

diff --git a/checks/fields b/checks/fields
index d8bc1f3..da202a8 100644
--- a/checks/fields
+++ b/checks/fields
@@ -462,13 +462,17 @@ if (defined $info->field('installer-menu-item')) {
 
 # Check whether the package looks like a meta-package, used for later
 # dependency checks.  We consider a package to possibly be a meta-package if
-# it is a binary package, arch: all, with no files outside of /usr/share/doc.
+# it is a binary package, arch: all, with no files outside of /usr/share/doc
+# and a few other directories found in metapackges.
 my $metapackage = 0;
 if ($type eq 'binary' && $arch_indep) {
 	$metapackage = 1;
 	foreach my $file (keys %{$info->index}) {
-		$metapackage = 0 unless ($info->index->{$file}->{type} =~ /^d/
-		    || $file =~ m%^usr/share/doc/%);
+		next if $info->index->{$file}->{type} =~ /^d/;
+		next if $file =~ m%^usr/share/doc/%;
+		next if $file =~ m%^usr/share/lintian/overrides/%;
+		next if $file =~ m%^usr/share/cdd/%;
+		$metapackage = 0;
 	}
 }
 if (($type eq "binary") || ($type eq 'udeb')) {
diff --git a/debian/changelog b/debian/changelog
index 92a13a2..94c3231 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,12 @@ lintian (2.2.14) UNRELEASED; urgency=low
     + [RA] Allow any package to be in section oldlibs without triggering
       warnings.  Thanks, Rene Engelhard.  (Closes: #537606)
     + [RA] Lower wrong-section-according-to-package-name to possible.
+    + [RA] Recognize packages as metapackages even if they contain Lintian
+      overrides, thus fixing two packages that added a Lintian override
+      for having dependencies only permitted for metapackages, which in
+      turn ensures that they keep getting that tag.
+    + [RA] Recognize packages as metapackages even if they contain files
+      in /usr/share/cdd.
   * checks/files{,.desc}:
     + [CW] /var/lock and /var/run are not temporary filesystems in d-i, so
       don't emit errors about their use in udebs.

-- 
Debian package checker


Reply to: