lintian: r1319 - in trunk: checks debian

[djpig@debian.org]

Author: djpig
Date: 2008-05-20 11:47:51 +0200 (Tue, 20 May 2008)
New Revision: 1319

Modified:
   trunk/checks/debhelper
   trunk/debian/changelog
Log:
* checks/debhelper:
  + Suppress maintainer-script-lacks-debhelper-token for
    single-udeb-only packages as well.  (Closes: #471853)


Modified: trunk/checks/debhelper
===================================================================
--- trunk/checks/debhelper	2008-05-20 02:08:16 UTC (rev 1318)
+++ trunk/checks/debhelper	2008-05-20 09:47:51 UTC (rev 1319)
@@ -148,18 +148,21 @@
 
 # We may need to make a difference between deb and udeb packages
 # so try to find out
-my %pkgs;
+my (%pkgs, $single_pkg);
 opendir(BINPKGS, 'control')
     or fail("Can't open control directory.");
 while(my $binpkg = readdir(BINPKGS)) {
+    next if $binpkg =~ /^\.\.?$/;
     if (-d "control/$binpkg") {
         if (open TYPE, "<", "control/$binpkg/xc-package-type") {
             $pkgs{$binpkg} = <TYPE> || 'deb';
         } else {
             $pkgs{$binpkg} = 'deb';
         }
+	$single_pkg = $pkgs{$binpkg};
     }
 }
+$single_pkg = undef unless keys(%pkgs) == 1;
 
 # If we got this far, they need to have #DEBHELPER# in their scripts.  Search
 # for scripts that look like maintainer scripts.  Also collect dependency
@@ -182,8 +185,10 @@
 	close IN;
 
 	if ((! $seentag) and $needtomodifyscripts) {
-	    tag "maintainer-script-lacks-debhelper-token", "debian/$file"
-		unless $binpkg && $pkgs{$binpkg} && ($pkgs{$binpkg} =~ /udeb/i);
+	    unless (($binpkg && $pkgs{$binpkg} && ($pkgs{$binpkg} =~ /udeb/i))
+		    or (!$binpkg && $single_pkg && ($single_pkg =~ /udeb/i))) {
+		tag "maintainer-script-lacks-debhelper-token", "debian/$file";
+	    }
 	}
     } elsif ($file =~ m/^compat$/) {
 	open (IN, '<', "debfiles/$file")

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-05-20 02:08:16 UTC (rev 1318)
+++ trunk/debian/changelog	2008-05-20 09:47:51 UTC (rev 1319)
@@ -11,6 +11,8 @@
       (Closes: #479088)
     + [FL] Add basic support for debhelpers new dh utility.
       (Closes: #477628)
+    + [FL] Suppress maintainer-script-lacks-debhelper-token for
+      single-udeb-only packages as well.  (Closes: #471853)
   * checks/files:
     + [FL] Drop xresources-file-in-etc-without-proper-conflicts, since
       the last package that conflict applies to was released with hamm!