lintian: r429 - in trunk: checks debian testset/scripts/debian

[he@debian.org]

Author: he
Date: 2005-07-09 09:25:39 +0200 (Sat, 09 Jul 2005)
New Revision: 429

Modified:
   trunk/checks/scripts
   trunk/debian/changelog
   trunk/testset/scripts/debian/control
   trunk/testset/scripts/debian/rules
Log:
checks/scripts: 
  + [HE] Fix to work $interpreter-script-but-no-$pkg-dep with more than one
    dependency if needed. First use case is depending on build-essential
    to provide /usr/bin/make. (Closes: #294894)


Modified: trunk/checks/scripts
===================================================================
--- trunk/checks/scripts	2005-07-09 07:09:40 UTC (rev 428)
+++ trunk/checks/scripts	2005-07-09 07:25:39 UTC (rev 429)
@@ -112,7 +112,7 @@
 				'kforth' => 'kforth',
 				'ksh' => 'pdksh',
 				'magicfilter' => 'magicfilter',
-				'make' => 'make',
+				'make' => 'make,build-essential',
 				'mawk' => 'mawk',
 				'ocaml' => 'ocaml',
 				'perl-5.005' => 'perl-5.005',
@@ -248,9 +248,9 @@
 	# Do not complain about dependencies for non-executable scripts.
 	if ($executable{$filename}) {
 	    if (exists $interpreter_dependencies{$base}) {
-		my $dep = $interpreter_dependencies{$base};
-		tag_error("$base-script-but-no-$dep-dep", $filename)
-		    unless ($deps{$dep});
+		my @deps = split(/,/,$interpreter_dependencies{$base});
+		tag_error("$base-script-but-no-".$deps[0]."-dep", $filename)
+		    unless (scalar map { $deps{$_}?$_:() } @deps);
 	    } elsif ($base =~ /^python(\d.\d)?$/) {
 		my $ver = $1 ? $1 : "";
 		tag_error("python-script-but-no-python-dep", $filename)
@@ -351,10 +351,10 @@
 		    or $base eq 'perl');
 	
 	if (exists $interpreter_dependencies{$base}) {
-	    my $dep = $interpreter_dependencies{$base};
+	    my @deps = split(/,/,$interpreter_dependencies{$base});
 	    tag_error("interpreter-without-predep", $filename,
 		      "#!$interpreter")
-		unless (exists $deps{$dep} and $deps{$dep} eq 'pre-depends');
+		unless (scalar map { ($deps{$_} && $deps{$_} eq 'pre-depends')?$_:() } @deps);
 	} elsif ($base eq 'python') {
 	    tag_error("interpreter-without-predep", $filename,
 		      "#!$interpreter")

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-07-09 07:09:40 UTC (rev 428)
+++ trunk/debian/changelog	2005-07-09 07:25:39 UTC (rev 429)
@@ -29,6 +29,9 @@
       thanks for the work. (Closes: #308569)
     + [HE] Check for use of "." as a deprecated separator between user and
       group names in chown call. (Closes: #88340)
+    + [HE] Fix to work $interpreter-script-but-no-$pkg-dep with more than one
+      dependency if needed. First use case is depending on build-essential
+      to provide /usr/bin/make. (Closes: #294894)
 
   * checks/shared-libs:
     + [HE] Don't allow non-PIC shared libraries. This conforms to the new

Modified: trunk/testset/scripts/debian/control
===================================================================
--- trunk/testset/scripts/debian/control	2005-07-09 07:09:40 UTC (rev 428)
+++ trunk/testset/scripts/debian/control	2005-07-09 07:25:39 UTC (rev 429)
@@ -7,6 +7,6 @@
 
 Package: scripts
 Architecture: all
-Depends: test, ruby1.8
+Depends: test, ruby1.8, build-essential
 Description: test lintian's script file checks
  Regression test lintian's script file checks.

Modified: trunk/testset/scripts/debian/rules
===================================================================
--- trunk/testset/scripts/debian/rules	2005-07-09 07:09:40 UTC (rev 428)
+++ trunk/testset/scripts/debian/rules	2005-07-09 07:25:39 UTC (rev 429)
@@ -18,6 +18,7 @@
 	install -m 755 py2foo $(tmp)/usr/bin/
 	install -m 755 perlfoo $(tmp)/usr/bin/
 	install -m 755 rubyfoo $(tmp)/usr/bin/
+	install -m 755 make-foo $(tmp)/usr/bin/
 	install -m 4755 perlfoo $(tmp)/usr/bin/suidperlfoo2
 	install -m 4755 suidperlfoo $(tmp)/usr/bin/
 	install -m 755 tkfoo $(tmp)/usr/bin/