[SCM] Debian package checker branch, master, updated. 1.24.2-62-gf0a6a22

["Adam D. Barratt" <adam@adam-barratt.org.uk>]

The following commit has been merged in the master branch:
commit f0a6a22e446e405e365b2b4261ecc4f093f88920
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Thu Jul 31 21:45:26 2008 +0100

    Using sh and sensible-browser shouldn't cause menu-command-not-in-package
    
      + [ADB] Don't raise menu-command-not-in-package for 'sensible-browser' or
       'sh'.  Thanks Raphael Geissert.

diff --git a/checks/menu-format b/checks/menu-format
index fd03b31..3035894 100644
--- a/checks/menu-format
+++ b/checks/menu-format
@@ -894,7 +894,9 @@ sub VerifyCmd {
     } else {
         $cmd = $com[0];
     }
-    my $okay = $cmd && ($cmd =~ /^[\'\"]/ || $file_index{$cmd} || grep { $file_index{$_ . $cmd} } @path);
+    my $okay = $cmd && ($cmd =~ /^[\'\"]/ || $file_index{$cmd} || $cmd =~ m,^(/bin/)?sh,
+	|| $cmd =~ m,^(/usr/bin/)?sensible-(pager|editor|browser),
+	|| grep { $file_index{$_ . $cmd} } @path);
     return ($okay, $cmd);
 }
 
diff --git a/debian/changelog b/debian/changelog
index f9f0479..6e5ee43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,6 +63,8 @@ lintian (1.24.3) unstable; urgency=low
     + [ADB] Update the Policy reference for manpage-has-wrong-extension.
   * checks/menu-format:
     + [ADB] Use Lintian::Collect to parse the list of files in the package.
+    + [ADB] Don't raise menu-command-not-in-package for 'sensible-browser'
+      or 'sh'.  Thanks Raphael Geissert.
   * checks/menus.desc:
     + [ADB] Fix a typo; thanks Jordà Polo.
   * checks/nmu{,.desc}:
diff --git a/testset/binary/debian/menu b/testset/binary/debian/menu
index 652381a..e8972f4 100644
--- a/testset/binary/debian/menu
+++ b/testset/binary/debian/menu
@@ -23,3 +23,4 @@
 ?package(binary):needs="fvwmmodule" section="Window Maker" title="Fake Module"\
  command="hello"
 ?package(binary):needs="x11" section="Applications/System/Hardware" title="Run xfdisk" command="su-to-root -c 'xfdisk -f'"
+?package(binary):needs="text" section="Applications/System/Administration" title="foo" command="sh /path/to/foo"

-- 
Debian package checker