[SCM] Debian package checker branch, master, updated. 2.5.0-rc1-24-gb482290

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit b48229031657506560d869c47c6439dddf556c47
Author: Niels Thykier <niels@thykier.net>
Date:   Fri Mar 25 21:54:32 2011 +0100

    Extended menu-format test and corrected another inconsistency

diff --git a/checks/menu-format b/checks/menu-format
index be2a73b..9f82e15 100644
--- a/checks/menu-format
+++ b/checks/menu-format
@@ -920,7 +920,7 @@ sub VerifyCmd {
 	    || $cmd =~ m,^(/bin/)?sh,
 	    || $cmd =~ m,^(/usr/bin/)?sensible-(pager|editor|browser),
 	    || grep { $info->index->{$_ . $cmd} } @path);
-    return ($okay, $cmd);
+    return ($okay, $cmd_file);
 }
 
 1;
diff --git a/t/tests/menu-format-general/debian/debian/control.in b/t/tests/menu-format-general/debian/debian/control.in
index 1b99b7f..66a055d 100644
--- a/t/tests/menu-format-general/debian/debian/control.in
+++ b/t/tests/menu-format-general/debian/debian/control.in
@@ -8,8 +8,22 @@ Build-Depends: debhelper (>= 7.0.50~)
 Package: menu-none
 Architecture: all
 Depends: $\{misc:Depends\},
-Description: {$description}
+Description: {$description} (no icon)
  This is a test package designed to exercise some feature or tag of
  Lintian.  It is part of the Lintian test suite and may do very odd
  things.  It should not be installed like a regular package.  It may
  be an empty package.
+ .
+ Test for "none" icon and missing icons.
+
+Package: menu-cmd
+Architecture: all
+Depends: $\{misc:Depends\},
+Description: {$description} (cmd)
+ This is a test package designed to exercise some feature or tag of
+ Lintian.  It is part of the Lintian test suite and may do very odd
+ things.  It should not be installed like a regular package.  It may
+ be an empty package.
+ .
+ Test for command not being in the package.
+
diff --git a/t/tests/menu-format-general/debian/debian/menu-cmd.menu b/t/tests/menu-format-general/debian/debian/menu-cmd.menu
new file mode 100644
index 0000000..2f8449a
--- /dev/null
+++ b/t/tests/menu-format-general/debian/debian/menu-cmd.menu
@@ -0,0 +1,3 @@
+?package(menu-cmd):needs="X11" section="Applications/Programming"\
+  title="pargs (icon none)" command="/usr/bin/not-here"\
+  longtitle="Argument printer"
diff --git a/t/tests/menu-format-general/desc b/t/tests/menu-format-general/desc
index adb9db2..5b1ea5b 100644
--- a/t/tests/menu-format-general/desc
+++ b/t/tests/menu-format-general/desc
@@ -3,5 +3,6 @@ Sequence: 6000
 Version: 1.0
 Description: Test menu file tags
 Test-For:
+ menu-command-not-in-package
  menu-icon-missing
  menu-item-uses-icon-none
diff --git a/t/tests/menu-format-general/tags b/t/tests/menu-format-general/tags
index ca0c893..e751298 100644
--- a/t/tests/menu-format-general/tags
+++ b/t/tests/menu-format-general/tags
@@ -1,3 +1,4 @@
+W: menu-cmd: menu-command-not-in-package usr/share/menu/menu-cmd:3 usr/bin/not-here
 W: menu-none: menu-icon-missing non-existent.xpm
 W: menu-none: menu-icon-missing usr/share/menu-none/non-existent16.xpm
 W: menu-none: menu-icon-missing usr/share/menu-none/non-existent32.xpm

-- 
Debian package checker