lintian: r1140 - in trunk: checks debian testset
Author: rra
Date: 2008-01-22 06:24:02 +0100 (Tue, 22 Jan 2008)
New Revision: 1140
Modified:
trunk/checks/scripts
trunk/checks/scripts.desc
trunk/debian/changelog
trunk/testset/tags.scripts
Log:
* checks/scripts{.desc,}:
+ [RA] Re-add php4-cli as a valid interpreter for those who want to
maintain stable compatibility. Thanks, Thomas Goirand.
+ [RA] Be clearer in the tag name that php-cli dependencies should be
versioned. Add more explanation to the long description of several
interpreter tags about limitations and requested bug filings.
Modified: trunk/checks/scripts
===================================================================
--- trunk/checks/scripts 2008-01-22 05:14:18 UTC (rev 1139)
+++ trunk/checks/scripts 2008-01-22 05:24:02 UTC (rev 1140)
@@ -135,7 +135,7 @@
qr/^octave([\d.]+)$/, 'octave$1', qw(2.1 2.9 3.0)
],
php => [ '/usr/bin', '',
- qr/^php(\d+)$/, 'php$1-cli', qw(5)
+ qr/^php(\d+)$/, 'php$1-cli', qw(4 5)
],
pike => [ '/usr/bin', '',
qr/^pike([\d.]+)$/, 'pike$1 | pike$1-core', qw(7.6 7.7)
@@ -359,7 +359,7 @@
my $depends = join (' | ', $data->[1], @depends);
unless (Dep::implies($deps{all}, Dep::parse($depends))) {
if ($base eq 'php') {
- tag('php-script-but-no-php-cli-dep', $filename);
+ tag('php-script-but-no-phpX-cli-dep', $filename);
} elsif ($base =~ /^(wish|tclsh)/) {
tag("$1-script-but-no-$1-dep", $filename);
} else {
@@ -373,7 +373,7 @@
$depends =~ s/\$1/$version/g;
unless (Dep::implies($deps{all}, Dep::parse($depends))) {
if ($base =~ /^php/) {
- tag('php-script-but-no-php-cli-dep', $filename);
+ tag('php-script-but-no-phpX-cli-dep', $filename);
} elsif ($base =~ /^(python|ruby)/) {
tag("$1-script-but-no-$1-dep", $filename);
} else {
Modified: trunk/checks/scripts.desc
===================================================================
--- trunk/checks/scripts.desc 2008-01-22 05:14:18 UTC (rev 1139)
+++ trunk/checks/scripts.desc 2008-01-22 05:24:02 UTC (rev 1140)
@@ -78,8 +78,10 @@
Tag: missing-dep-for-interpreter
Type: error
Info: You used an interpreter for a script that is not in an essential
- package. In most cases you will need to add a Dependency on the
- package that contains the interpreter.
+ package. In most cases, you will need to add a Dependency on the
+ package that contains the interpreter. If the dependency is already
+ present, please file a bug against Lintian with the details of your
+ package so that its database can be updated.
.
In some cases a weaker relationship, such as Suggests or Recommends, will
be more appropriate.
@@ -121,15 +123,20 @@
In some cases a weaker relationship, such as Suggests or Recommends, will
be more appropriate.
-Tag: php-script-but-no-php-cli-dep
+Tag: php-script-but-no-phpX-cli-dep
Type: error
-Info: Packages with PHP scripts must depend on a php-cli package such as
+Info: Packages with PHP scripts must depend on a phpX-cli package such as
php5-cli. Note that a dependency on a php-cgi package (such as php5-cgi)
is needlessly strict and forces the user to install a package that isn't
needed.
.
In some cases a weaker relationship, such as Suggests or Recommends, will
be more appropriate.
+ .
+ Lintian can only recognize phpX-cli dependencies for values of X that it
+ knows are available in the archive. If this package depends on a php-cli
+ package that Lintian doesn't know about, please file a bug against
+ Lintian so that it can be updated.
Tag: python-script-but-no-python-dep
Type: error
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-01-22 05:14:18 UTC (rev 1139)
+++ trunk/debian/changelog 2008-01-22 05:24:02 UTC (rev 1140)
@@ -35,6 +35,12 @@
* checks/rules.desc:
+ [RA] To fix an ignores-make-clean-error, suggest removing "-" for
static makefiles. Thanks, Andrea Colangelo. (Closes: #458164)
+ * checks/scripts{.desc,}:
+ + [RA] Re-add php4-cli as a valid interpreter for those who want to
+ maintain stable compatibility. Thanks, Thomas Goirand.
+ + [RA] Be clearer in the tag name that php-cli dependencies should be
+ versioned. Add more explanation to the long description of several
+ interpreter tags about limitations and requested bug filings.
* frontend/lintian:
+ [RA] Include info tags in the broken-down description of the
Modified: trunk/testset/tags.scripts
===================================================================
--- trunk/testset/tags.scripts 2008-01-22 05:14:18 UTC (rev 1139)
+++ trunk/testset/tags.scripts 2008-01-22 05:24:02 UTC (rev 1140)
@@ -9,8 +9,8 @@
E: scripts: init.d-script-has-duplicate-lsb-section /etc/init.d/lsb-broken
E: scripts: init.d-script-has-unterminated-lsb-section /etc/init.d/lsb-broken:15
E: scripts: missing-dep-for-interpreter lefty => graphviz (./usr/bin/lefty-foo)
-E: scripts: php-script-but-no-php-cli-dep ./usr/share/scripts/php5foo
-E: scripts: php-script-but-no-php-cli-dep ./usr/share/scripts/phpfoo
+E: scripts: php-script-but-no-phpX-cli-dep ./usr/share/scripts/php5foo
+E: scripts: php-script-but-no-phpX-cli-dep ./usr/share/scripts/phpfoo
E: scripts: python-script-but-no-python-dep ./usr/bin/py2foo
E: scripts: python-script-but-no-python-dep ./usr/bin/pyfoo
E: scripts: shell-script-fails-syntax-check ./usr/bin/sh-broken
Reply to: