lintian: r576 - in trunk: checks debian

[rra@debian.org]

Author: rra
Date: 2006-03-12 07:10:12 +0100 (Sun, 12 Mar 2006)
New Revision: 576

Modified:
   trunk/checks/po-debconf
   trunk/debian/changelog
Log:
* checks/po-debconf:
  + [RA] If there are template files in debian, assume the package uses
    debconf; don't require a dependency or config script.  Patch by
    Thomas Huriaux.  (Closes: #353294)

Modified: trunk/checks/po-debconf
===================================================================
--- trunk/checks/po-debconf	2006-03-12 04:14:16 UTC (rev 575)
+++ trunk/checks/po-debconf	2006-03-12 06:10:12 UTC (rev 576)
@@ -34,27 +34,13 @@
 my $has_template = my $has_depends = my $has_config = 0;
 for my $file (readdir(DEB)) {
 	if ($file =~ m/^(.+\.)?templates(\..+)?$/) {
-# TODO: out of this loop, use fields/*?
 	        $has_template = 1;
-		open(IN,"debfiles/control")
-			or fail("Can't open debfiles/control.");
-		while (<IN>) {
-			if (m/^Depends:/i) {
-				$has_depends = 1
-					if m/\bdebconf(-[.\d]+)?\b/;
-			}
-		}
-		close(IN);
-	} elsif ($file =~ m/^(.+\.)?config(\..+)?$/) {
-	    $has_config = 1;
 	}
 }
 closedir(DEB);
 
-my $probably_uses_debconf = $has_depends || ($has_template && $has_config);
-
 #TODO: check whether all templates are named in TEMPLATES.pot
-if ( $probably_uses_debconf ) {
+if ( $has_template ) {
     if ( ! -d "debfiles/po" ) {
 	tag "not-using-po-debconf", "";
 	return 0;

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-03-12 04:14:16 UTC (rev 575)
+++ trunk/debian/changelog	2006-03-12 06:10:12 UTC (rev 576)
@@ -38,6 +38,10 @@
   * checks/menu-format.desc:
     + [RA] Use "menu manual" rather than "menu" for references to more
       clearly distinguish from the Debian Menu Policy.  (Closes: #347510)
+  * checks/po-debconf:
+    + [RA] If there are template files in debian, assume the package uses
+      debconf; don't require a dependency or config script.  Patch by
+      Thomas Huriaux.  (Closes: #353294)
   * checks/scripts:
     + [RA] Allow /tmp in variable settings.  It's likely to be a false
       positive.  Reported by Frank Küster.  (Closes: #344998)