lintian: rev 6 - in trunk: checks debian

[djpig@wolffelaar.nl]

Author: djpig
Date: 2004-01-31 21:42:05 +0100 (Sat, 31 Jan 2004)
New Revision: 6

Modified:
   trunk/checks/debhelper
   trunk/debian/changelog
Log:
checks/debhelper:
 + fix parsing debian/compat for needed
   version (Closes: #198611)
 + update list of existing debhelper commands


Modified: trunk/checks/debhelper
===================================================================
--- trunk/checks/debhelper	2004-01-31 13:56:20 UTC (rev 5)
+++ trunk/checks/debhelper	2004-01-31 20:42:05 UTC (rev 6)
@@ -34,6 +34,7 @@
 my $needbuilddepends = '';
 my $needtomodifyscripts = '';
 my $needversiondepends = '';
+my $seenversiondepends = '0';
 my $compat = '';
 
 # Parse the debian/rules file, and try to figure out if debhelper commands
@@ -41,7 +42,8 @@
 # commands can be found by "grep -l autoscript /usr/bin/dh_*", but I'll
 # hardcode them here.
 
-map { $commands{$_}=1 } qw(dh_installdebconf
+map { $commands{$_}=1 } qw(dh_installcatalogs
+			   dh_installdebconf
                            dh_installdefoma
                            dh_installdocs
 			   dh_installemacsen
@@ -53,7 +55,10 @@
 			   dh_installwm
 			   dh_installxfonts
 			   dh_makeshlibs
+			   dh_python
+			   dh_scrollkeeper
 			   dh_suidregister
+			   dh_usrlocal
 			   );
 
 open(RULES, "debfiles/rules") or fail("cannot read debian/rules: $!");
@@ -122,26 +127,17 @@
 	    or fail("Can't open debfiles/$file: $!");
 	while (<IN>) {
 	    if (m/^(Build-Depends|Build-Depends-Indep):/i) {
-	        if ($needversiondepends) {
-		    if ($needversiondepends > 1) {
-			if (m,debhelper\s*\(\s*>(?:>|=)\s*([^)]+), and Dep::versions_lte($needversiondepends, $1)) {
-				$needversiondepends = 0; # seen them, all is good
-			}
-		    } else {
-			$needversiondepends = 0; # don't bother if < 1
-		    }
-		}
-		if ($needbuilddepends and m/debhelper/) {
-		    $needbuilddepends = 0; # seen them, all is good
-		}
+		if (m,debhelper\s*\(\s*>(?:>|=)\s*([^)]+),) {  
+		    $seenversiondepends = $1;
+	        }
 	    }
+	    if ($needbuilddepends and m/debhelper/) {
+		$needbuilddepends = 0; # seen them, all is good
+	    }
 	    if (m/^\s*$/) { # end of first stanza
 		last;
 	    }
 	}
-	if ($needversiondepends) {
-	    print "E: $pkg $type: package-lacks-versioned-build-depends-on-debhelper $needversiondepends\n";
-	}
 	if ($needbuilddepends) {
 	    print "E: $pkg $type: package-uses-debhelper-but-lacks-build-depends\n";
 	}
@@ -152,6 +148,11 @@
 }
 closedir(DEBIAN);
 
+if ($needversiondepends and ($needversiondepends > 1) and ! Dep::versions_lte($needversiondepends, $seenversiondepends)) {
+    print "E: $pkg $type: package-lacks-versioned-build-depends-on-debhelper $needversiondepends\n";
+}
+
+
 # -----------------------------------
 
 sub fail {

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-01-31 13:56:20 UTC (rev 5)
+++ trunk/debian/changelog	2004-01-31 20:42:05 UTC (rev 6)
@@ -9,7 +9,13 @@
      moved sections (Closes: #194257, #208945, #214949)
      (Patch by Nicholas Breen <nbreen@ofb.net>)
    * Support for dash scripts (Closes: #194787)
-     (Patch by Frank Lichtenheld <frank@lichtenheld.de>)
+     (Patch by Frank Lichtenheld <djpig@debian.org>)
+  
+  Frank Lichtenheld <djpig@debian.org>
+   * checks/debhelper: 
+     + fix parsing debian/compat for needed 
+       version (Closes: #198611)
+     + update list of existing debhelper commands
 
  -- Jeroen van Wolffelaar <jeroen@wolffelaar.nl>  Sat, 31 Jan 2004 14:44:55 +0100