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

lintian: r547 - in trunk: checks debian testset testset/debconf/debian testset/dh-test/debian



Author: djpig
Date: 2006-01-19 15:11:59 +0100 (Thu, 19 Jan 2006)
New Revision: 547

Modified:
   trunk/checks/debhelper
   trunk/debian/changelog
   trunk/testset/debconf/debian/rules
   trunk/testset/dh-test/debian/rules
   trunk/testset/tags.debconf
Log:
Try a little harder to find the DH_COMPAT setting in debian/rules
(Closes: #348380)


Modified: trunk/checks/debhelper
===================================================================
--- trunk/checks/debhelper	2006-01-19 13:54:50 UTC (rev 546)
+++ trunk/checks/debhelper	2006-01-19 14:11:59 UTC (rev 547)
@@ -69,6 +69,7 @@
 			   );
 
 open(RULES, "debfiles/rules") or fail("cannot read debian/rules: $!");
+my $dhcompatvalue;
 while (<RULES>) {
     if (m/^\s+(dh_\w+)/) {
         my $dhcommand = $1;
@@ -94,6 +95,10 @@
 	$needtomodifyscripts = 1;
     } elsif (/^\s*export\s+DH_COMPAT\s*=\s*(\d+)/) {
 	$needversiondepends = $1;
+    } elsif (/^\s*export\s+DH_COMPAT/) {
+	$needversiondepends = $dhcompatvalue if $dhcompatvalue;
+    } elsif (/^\s*DH_COMPAT\s*=\s*(\d+)/) {
+	$dhcompatvalue = $1;
     }
 }
 close RULES;

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-01-19 13:54:50 UTC (rev 546)
+++ trunk/debian/changelog	2006-01-19 14:11:59 UTC (rev 547)
@@ -18,6 +18,8 @@
       (Closes: #329953)
     + [FL] Add dh_installtexfonts to list of commands that modfiy
       the maintainer scripts
+    + [FL] Try a little harder to find the DH_COMPAT setting in debian/rules
+      (Closes: #348380)
   * checks/fields:
     + [FL] Allow version numbers of 0 by correctly checking the output
       of _valid_version for definedness and not the boolean value

Modified: trunk/testset/debconf/debian/rules
===================================================================
--- trunk/testset/debconf/debian/rules	2006-01-19 13:54:50 UTC (rev 546)
+++ trunk/testset/debconf/debian/rules	2006-01-19 14:11:59 UTC (rev 547)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export DH_COMPAT = 4
+
 deb_dir		=	debian/debconf
 udeb_dir	=	debian/debconf-udeb
 build_dirs	=	$(deb_dir) $(udeb_dir)

Modified: trunk/testset/dh-test/debian/rules
===================================================================
--- trunk/testset/dh-test/debian/rules	2006-01-19 13:54:50 UTC (rev 546)
+++ trunk/testset/dh-test/debian/rules	2006-01-19 14:11:59 UTC (rev 547)
@@ -9,7 +9,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DH_COMPAT=3
+DH_COMPAT=3
+export DH_COMPAT
 
 CFLAGS = -Wall -g
 

Modified: trunk/testset/tags.debconf
===================================================================
--- trunk/testset/tags.debconf	2006-01-19 13:54:50 UTC (rev 546)
+++ trunk/testset/tags.debconf	2006-01-19 14:11:59 UTC (rev 547)
@@ -1,3 +1,4 @@
+E: debconf source: declares-possibly-conflicting-debhelper-compat-versions rules=4 compat=4
 E: debconf-test: extended-description-is-empty
 E: debconf-test: mismatch-translated-choices debconf/testmulti choices-de.utf-8
 E: debconf-test: settitle-requires-versioned-depends config



Reply to: