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

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



Author: djpig
Date: 2004-12-06 01:43:09 +0100 (Mon, 06 Dec 2004)
New Revision: 374

Modified:
   trunk/checks/scripts
   trunk/checks/scripts.desc
   trunk/debian/changelog
   trunk/testset/scripts/debian/control
   trunk/testset/scripts/debian/rules
   trunk/testset/tags.scripts
Log:
+ Add tclsh8.3 to list of valid interpreters as it is used
  in at least one package. (Closes: #280080)
+ Issue wrong-path-for-{ruby,python} even if the path contained
  a version number. Change the description of the tag to reflect that.
  (Closes: #257904)


Modified: trunk/checks/scripts
===================================================================
--- trunk/checks/scripts	2004-12-06 00:05:00 UTC (rev 373)
+++ trunk/checks/scripts	2004-12-06 00:43:09 UTC (rev 374)
@@ -84,6 +84,7 @@
 			  'sh' => '/bin/sh',
 			  'tcl' => '/usr/bin/tcl',
 			  'tclsh' => '/usr/bin/tclsh',
+			  'tclsh8.3' => '/usr/bin/tclsh8.3',
 			  'tcsh' => '/usr/bin/tcsh',
 			  'tixwish' => '/usr/bin/tixwish',
 			  'trs' => '/usr/bin/trs',
@@ -128,6 +129,7 @@
 				'scsh' => 'scsh',
 				'tcl' => 'tcl',
 				'tclsh' => 'tclsh',
+				'tclsh8.3' => 'tcl8.3',
 				'tcsh' => 'tcsh',
 				'tixwish' => 'tix',
 				'trs' => 'konwert',
@@ -229,9 +231,15 @@
 		$filename =~ m,etc/menu-methods,);
 
     if (exists $valid_interpreters{$base}) {
-	tag_error("wrong-path-for-$base", $filename, "#!$interpreter")
-	    unless ($interpreter eq $valid_interpreters{$base} or
-		    defined $calls_env);
+	unless ($interpreter eq $valid_interpreters{$base} or
+		defined $calls_env) {
+	    # save us from some copy and paste
+	    if ($base =~ /^(ruby|python)(?:\d.\d)?$/) {
+		tag_error("wrong-path-for-$1", $filename, "#!$interpreter");
+	    } else {
+		tag_error("wrong-path-for-$base", $filename, "#!$interpreter");
+	    }
+	}
 	
 	# Do not complain about dependencies for non-executable scripts.
 	if ($executable{$filename}) {

Modified: trunk/checks/scripts.desc
===================================================================
--- trunk/checks/scripts.desc	2004-12-06 00:05:00 UTC (rev 373)
+++ trunk/checks/scripts.desc	2004-12-06 00:43:09 UTC (rev 374)
@@ -329,7 +329,15 @@
 Tag: wrong-path-for-python
 Type: error
 Info: Python is installed as /usr/bin/python on Debian systems.
+ .
+ Specific Python versions are installed as /usr/bin/pythonX.Y
 
+Tag: wrong-path-for-ruby
+Type: error
+Info: Ruby is installed as /usr/bin/ruby on Debian systems.
+ .
+ Specific Ruby versions are installed as /usr/bin/rubyX.Y
+
 Tag: python-script-but-no-python-dep
 Type: error
 Info: Packages with scripts that are executed with python must depend on the
@@ -459,6 +467,10 @@
 Type: error
 Info: Tclsh is installed as /usr/bin/tclsh on Debian systems.
 
+Tag: wrong-path-for-tclsh8.3
+Type: error
+Info: Tclsh 8.3 is installed as /usr/bin/tclsh8.3 on Debian systems.
+
 Tag: tclsh-script-but-no-tclsh-dep
 Type: error
 Info: Packages that use tclsh scripts must depend on the virtual package tclsh.
@@ -466,6 +478,13 @@
  In some cases a weaker relationship, such as Suggests or Recommends, will
  be more appropriate.
 
+Tag: tclsh8.3-script-but-no-tcl8.3-dep
+Type: error
+Info: Packages that use tclsh8.3 scripts must depend on the package tcl8.3.
+ .
+ In some cases a weaker relationship, such as Suggests or Recommends, will
+ be more appropriate.
+
 Tag: wrong-path-for-bltwish
 Type: error
 Info: bltwish is installed as /usr/bin/bltwish on Debian systems.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-12-06 00:05:00 UTC (rev 373)
+++ trunk/debian/changelog	2004-12-06 00:43:09 UTC (rev 374)
@@ -22,10 +22,15 @@
     + [FL] Check for outdated .pot files when using po-debconf.
       This requires a new dependency on intltool-debian. Patch
       by Denis Barbier with corrections by JvW (Closes: #242345)
-  * checks/scripts.desc:
+  * checks/scripts{,.desc}:
     + [FL] Fix copy-and-paste error in description
       of wrong-path-for-gnuplot (Closes: #276945)
       Thanks to Lionel Elie Mamane for reporting.
+    + [FL] Add tclsh8.3 to list of valid interpreters as it is used
+      in at least one package. (Closes: #280080)
+    + [FL] Issue wrong-path-for-{ruby,python} even if the path contained
+      a version number. Change the description of the tag to reflect that.
+      (Closes: #257904)
   
   * frontend/lintian-info:
     + [FL] Overrides start with O:, not with 0:, d'oh!
@@ -42,7 +47,7 @@
   * testset/runtests:
     + [FL] Make checks of udeb packages possible
   
- -- Frank Lichtenheld <frank@lichtenheld.de>  Sun, 17 Oct 2004 20:04:06 +0200
+ -- Frank Lichtenheld <djpig@debian.org>  Mon,  6 Dec 2004 01:41:21 +0100
 
 lintian (1.23.3) unstable; urgency=low
 

Modified: trunk/testset/scripts/debian/control
===================================================================
--- trunk/testset/scripts/debian/control	2004-12-06 00:05:00 UTC (rev 373)
+++ trunk/testset/scripts/debian/control	2004-12-06 00:43:09 UTC (rev 374)
@@ -7,6 +7,6 @@
 
 Package: scripts
 Architecture: all
-Depends: test
+Depends: test, ruby1.8
 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	2004-12-06 00:05:00 UTC (rev 373)
+++ trunk/testset/scripts/debian/rules	2004-12-06 00:43:09 UTC (rev 374)
@@ -16,6 +16,7 @@
 	install -m 755 pyfoo $(tmp)/usr/bin/
 	install -m 755 py2foo $(tmp)/usr/bin/
 	install -m 755 perlfoo $(tmp)/usr/bin/
+	install -m 755 rubyfoo $(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/

Modified: trunk/testset/tags.scripts
===================================================================
--- trunk/testset/tags.scripts	2004-12-06 00:05:00 UTC (rev 373)
+++ trunk/testset/tags.scripts	2004-12-06 00:43:09 UTC (rev 374)
@@ -3,12 +3,14 @@
 E: scripts: python-script-but-no-python-dep ./usr/bin/py2foo
 E: scripts: python-script-but-no-python-dep ./usr/bin/pyfoo
 E: scripts: suid-perl-script-but-no-perl-suid-dep ./usr/bin/suidperlfoo2
+E: scripts: wrong-path-for-ruby ./usr/bin/rubyfoo #!/bin/ruby1.8
 W: scripts source: ancient-standards-version 3.2.1
 W: scripts source: changelog-should-mention-nmu
 W: scripts source: source-nmu-has-incorrect-version-number 5
 W: scripts: binary-without-manpage perlfoo
 W: scripts: binary-without-manpage py2foo
 W: scripts: binary-without-manpage pyfoo
+W: scripts: binary-without-manpage rubyfoo
 W: scripts: binary-without-manpage suidperlfoo
 W: scripts: binary-without-manpage suidperlfoo2
 W: scripts: binary-without-manpage tkfoo



Reply to: