lintian: r979 - in trunk: checks debian testset testset/binary/debian
Author: rra
Date: 2007-10-15 23:38:51 +0200 (Mon, 15 Oct 2007)
New Revision: 979
Modified:
trunk/checks/menu-format
trunk/debian/changelog
trunk/testset/binary/debian/menu
trunk/testset/tags.binary
Log:
* checks/menu-format:
+ [RA] Fix detection of commands for menu entries when the command is
given with its full path. (Closes: #446796)
Modified: trunk/checks/menu-format
===================================================================
--- trunk/checks/menu-format 2007-10-15 05:42:10 UTC (rev 978)
+++ trunk/checks/menu-format 2007-10-15 21:38:51 UTC (rev 979)
@@ -362,7 +362,7 @@
);
# Path in which to search for binaries referenced in menu entries.
-my @path = qw(usr/local/bin/ usr/bin/ bin/ usr/X11R6/bin/ usr/games/);
+my @path = qw(/usr/local/bin/ /usr/bin/ /bin/ /usr/X11R6/bin/ /usr/games/);
my %known_tags_hash = map { $_ => 1 } @known_tags;
my %needs_tag_vals_hash = map { $_ => 1 } @needs_tag_vals;
@@ -395,7 +395,7 @@
while (<IN>) {
chomp;
my ($perm, $owner, $size, $date, $time, $file) = split(' ', $_, 6);
- $file =~ s,^\./,,;
+ $file =~ s,^\./,/,;
$file =~ s/ link to .*//;
$file =~ s/ -> .*//;
my $operm = perm2oct($perm);
@@ -867,7 +867,7 @@
} else {
$cmd = $com[0];
}
- my $okay = $cmd && ($file_index{".$cmd"} || grep { $file_index{$_ . $cmd} } @path);
+ my $okay = $cmd && ($file_index{$cmd} || grep { $file_index{$_ . $cmd} } @path);
return ($okay, $cmd);
}
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-10-15 05:42:10 UTC (rev 978)
+++ trunk/debian/changelog 2007-10-15 21:38:51 UTC (rev 979)
@@ -1,3 +1,11 @@
+lintian (1.23.36) UNRELEASED; urgency=low
+
+ * checks/menu-format:
+ + [RA] Fix detection of commands for menu entries when the command is
+ given with its full path. (Closes: #446796)
+
+ -- Russ Allbery <rra@debian.org> Mon, 15 Oct 2007 14:38:45 -0700
+
lintian (1.23.35) unstable; urgency=low
The "frantic bug catchup" release.
Modified: trunk/testset/binary/debian/menu
===================================================================
--- trunk/testset/binary/debian/menu 2007-10-15 05:42:10 UTC (rev 978)
+++ trunk/testset/binary/debian/menu 2007-10-15 21:38:51 UTC (rev 979)
@@ -18,3 +18,4 @@
title="I'm not root!" command="su-to-root -c imnothere"
?package(binary):needs="text" section="Applications/System/Administration"\
title="Run cfdisk (0)" command="cfdisk"
+?package(binary):needs="text" section="Applications/System/Administration" title="Hello World" command="/usr/bin/hello"
Modified: trunk/testset/tags.binary
===================================================================
--- trunk/testset/tags.binary 2007-10-15 05:42:10 UTC (rev 978)
+++ trunk/testset/tags.binary 2007-10-15 21:38:51 UTC (rev 979)
@@ -3,7 +3,7 @@
E: binary: debian-changelog-file-missing-or-wrong-name
E: binary: debian-news-file-uses-obsolete-national-encoding at line 3
E: binary: depends-on-x-metapackage depends: xorg
-E: binary: desktop-entry-missing-required-key usr/share/applications/goodbye.desktop Name
+E: binary: desktop-entry-missing-required-key /usr/share/applications/goodbye.desktop Name
E: binary: doc-base-document-field-ends-in-whitespace binary:1
E: binary: doc-base-file-no-format binary:22
E: binary: doc-base-file-no-index binary:31
@@ -13,7 +13,7 @@
E: binary: doc-base-file-references-missing-file binary:27 /usr/share/doc/binary/hml/*.html
E: binary: doc-base-file-references-missing-file binary:30 /usr/share/info/binary.info.gz
E: binary: doc-base-index-references-multiple-files binary:21
-E: binary: executable-desktop-file usr/share/applications/goodbye.desktop 0755
+E: binary: executable-desktop-file /usr/share/applications/goodbye.desktop 0755
E: binary: file-directly-in-usr-share usr/share/baz
E: binary: lengthy-symlink usr/share/doc/binary/html/ch2.html ../html/./ch1.html
E: binary: menu-item-missing-required-tag needs /usr/lib/menu/binary:6
@@ -39,8 +39,8 @@
I: binary: arch-dep-package-has-big-usr-share
I: binary: binary-has-unneeded-section ./usr/bin/hello-static .comment
I: binary: description-contains-homepage
-I: binary: desktop-entry-contains-encoding-key usr/share/applications/goodbye.desktop:11 Encoding
-I: binary: desktop-entry-contains-encoding-key usr/share/applications/hello.desktop:13 Encoding
+I: binary: desktop-entry-contains-encoding-key /usr/share/applications/goodbye.desktop:11 Encoding
+I: binary: desktop-entry-contains-encoding-key /usr/share/applications/hello.desktop:13 Encoding
I: binary: no-md5sums-control-file
W: binary source: ancient-standards-version 3.2.1 (current is 3.7.2)
W: binary source: debian-rules-uses-pwd line 9
@@ -57,11 +57,11 @@
W: binary: binary-without-manpage usr/bin/static-hello
W: binary: changelog-file-not-compressed changelog
W: binary: debian-news-entry-has-strange-distribution UNRELEASED
-W: binary: desktop-command-not-in-package usr/share/applications/goodbye.desktop goodbye
-W: binary: desktop-entry-contains-unknown-key usr/share/applications/goodbye.desktop:5 SpecialTag
-W: binary: desktop-entry-contains-unknown-key usr/share/applications/goodbye.desktop:7 icon
-W: binary: desktop-entry-invalid-category WeirdStuff usr/share/applications/goodbye.desktop
-W: binary: desktop-entry-uses-reserved-category Screensaver usr/share/applications/goodbye.desktop
+W: binary: desktop-command-not-in-package /usr/share/applications/goodbye.desktop goodbye
+W: binary: desktop-entry-contains-unknown-key /usr/share/applications/goodbye.desktop:5 SpecialTag
+W: binary: desktop-entry-contains-unknown-key /usr/share/applications/goodbye.desktop:7 icon
+W: binary: desktop-entry-invalid-category WeirdStuff /usr/share/applications/goodbye.desktop
+W: binary: desktop-entry-uses-reserved-category Screensaver /usr/share/applications/goodbye.desktop
W: binary: doc-base-file-unknown-format binary:16 esp
W: binary: executable-not-elf-or-script ./usr/bin/iminusrbin
W: binary: executable-not-elf-or-script ./usr/share/applications/goodbye.desktop
Reply to: