[SCM] Debian package checker branch, master, updated. 2.5.0-rc1-23-g87e51ff
The following commit has been merged in the master branch:
commit 87e51ffa1ff848f577fbe89f3868194493ec8c47
Author: Niels Thykier <niels@thykier.net>
Date: Fri Mar 25 14:01:52 2011 +0100
Made menu-format output icon filenames consistently
However, menu-format still have some other consistency hick-ups
left.
diff --git a/checks/menu-format b/checks/menu-format
index bc659fb..be2a73b 100644
--- a/checks/menu-format
+++ b/checks/menu-format
@@ -694,6 +694,8 @@ sub VerifyIcon {
return;
}
+ $icon =~ s|^/*||og;
+
if (not ($icon =~ m/\.xpm$/i)) {
tag 'menu-icon-not-in-xpm-format', $icon;
return;
diff --git a/t/COVERAGE b/t/COVERAGE
index e82a2ef..9615308 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,4 +1,4 @@
-Last generated 2011-02-07
+Last generated 2011-03-25
The following tags are not tested by the test suite:
@@ -115,14 +115,12 @@ manpages manpage-in-wrong-directory
menu-format bad-test-in-menu-item
menu-format duplicated-tag-in-menu-item
menu-format menu-icon-cannot-be-parsed
-menu-format menu-icon-missing
menu-format menu-icon-not-in-xpm-format
menu-format menu-icon-too-big
menu-format menu-item-contains-unknown-tag
menu-format menu-item-creates-new-root-section
menu-format menu-item-needs-dwww
menu-format menu-item-uses-apps-games-section
-menu-format menu-item-uses-icon-none
menu-format old-format-menu-file
menu-format pkg-not-in-package-test
menu-format unparsable-menu-item
@@ -221,6 +219,7 @@ debconf using-first-person-in-templates
debconf using-imperative-form-in-templates
debconf using-question-in-extended-description-in-templates
+debhelper package-lacks-versioned-build-depends-on-debhelper
debhelper uses-dh-python-with-no-pycompat
fields build-depends-indep-without-arch-indep
@@ -496,6 +495,7 @@ libbaz
maintainer-shell-script-fails-syntax-check
missing-dependency-on-perlapi
missing-depends-line
+ package-lacks-versioned-build-depends-on-debhelper
package-name-doesnt-match-sonames
postinst-should-not-set-usr-doc-link
shlib-with-executable-bit
diff --git a/t/tests/menu-format-general/debian/Makefile b/t/tests/menu-format-general/debian/Makefile
new file mode 100644
index 0000000..a483ab9
--- /dev/null
+++ b/t/tests/menu-format-general/debian/Makefile
@@ -0,0 +1,5 @@
+all: pargs
+ pod2man --section=1 pargs pargs.1
+
+clean:
+ rm -f pargs.1
diff --git a/t/tests/files-python-modules/debian/debian/control.in b/t/tests/menu-format-general/debian/debian/control.in
similarity index 92%
copy from t/tests/files-python-modules/debian/debian/control.in
copy to t/tests/menu-format-general/debian/debian/control.in
index 1b72861..1b99b7f 100644
--- a/t/tests/files-python-modules/debian/debian/control.in
+++ b/t/tests/menu-format-general/debian/debian/control.in
@@ -1,11 +1,11 @@
Source: {$srcpkg}
Priority: extra
-Section: python
+Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
Build-Depends: debhelper (>= 7.0.50~)
-Package: python-foo
+Package: menu-none
Architecture: all
Depends: $\{misc:Depends\},
Description: {$description}
diff --git a/t/tests/menu-format-general/debian/debian/menu-none.install b/t/tests/menu-format-general/debian/debian/menu-none.install
new file mode 100644
index 0000000..bf2c0f6
--- /dev/null
+++ b/t/tests/menu-format-general/debian/debian/menu-none.install
@@ -0,0 +1 @@
+pargs usr/bin
diff --git a/t/tests/menu-format-general/debian/debian/menu-none.manpages b/t/tests/menu-format-general/debian/debian/menu-none.manpages
new file mode 100644
index 0000000..6fb56bc
--- /dev/null
+++ b/t/tests/menu-format-general/debian/debian/menu-none.manpages
@@ -0,0 +1 @@
+pargs.1
diff --git a/t/tests/menu-format-general/debian/debian/menu-none.menu b/t/tests/menu-format-general/debian/debian/menu-none.menu
new file mode 100644
index 0000000..440ffb5
--- /dev/null
+++ b/t/tests/menu-format-general/debian/debian/menu-none.menu
@@ -0,0 +1,10 @@
+?package(menu-none):needs="X11" section="Applications/Programming"\
+ title="pargs (icon none)" command="/usr/bin/pargs"\
+ longtitle="Argument printer"\
+ icon="none"
+?package(menu-none):needs="X11" section="Applications/Programming"\
+ title="pargs (mis. icon)" command="/usr/bin/pargs"\
+ longtitle="Argument printer"\
+ icon="non-existent.xpm"\
+ icon32x32="/usr/share/menu-none/non-existent32.xpm"\
+ icon16x16="/usr/share/menu-none/non-existent16.xpm"
diff --git a/t/tests/menu-format-general/debian/pargs b/t/tests/menu-format-general/debian/pargs
new file mode 100644
index 0000000..5a0017c
--- /dev/null
+++ b/t/tests/menu-format-general/debian/pargs
@@ -0,0 +1,22 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+print join("\n", @ARGV), "\n";
+exit 0;
+
+=head1 NAME
+
+pargs - print arguments (similar to echo)
+
+=head1 SYNOPSIS
+
+pargs [...]
+
+=head1 DESCRIPTION
+
+Prints all arguments separated by newlines.
+
+=cut
+
diff --git a/t/tests/menu-format-general/desc b/t/tests/menu-format-general/desc
new file mode 100644
index 0000000..adb9db2
--- /dev/null
+++ b/t/tests/menu-format-general/desc
@@ -0,0 +1,7 @@
+Testname: menu-format-general
+Sequence: 6000
+Version: 1.0
+Description: Test menu file tags
+Test-For:
+ menu-icon-missing
+ menu-item-uses-icon-none
diff --git a/t/tests/menu-format-general/tags b/t/tests/menu-format-general/tags
new file mode 100644
index 0000000..ca0c893
--- /dev/null
+++ b/t/tests/menu-format-general/tags
@@ -0,0 +1,4 @@
+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
+W: menu-none: menu-item-uses-icon-none usr/share/menu/menu-none:4
--
Debian package checker
Reply to: