The following commit has been merged in the master branch:
commit c82d7f2311454924eba49b085ca55ae7beaafc2b
Author: Niels Thykier <ni...@thykier.net>
Date: Sun Jan 22 13:54:57 2012 +0100
Removed two tags related to wm-menu{,-config}
The menu package no longer ships these executables (not even in
Squeeze). According to lintian.d.o, the tags are no longer
emitted.
Signed-off-by: Niels Thykier <ni...@thykier.net>
diff --git a/checks/menus b/checks/menus
index d641b18..b0ae559 100644
--- a/checks/menus
+++ b/checks/menus
@@ -583,7 +583,7 @@ sub delink {
sub check_script {
my ($pkg, $spath, $script, $pres) = @_;
- my ($no_check_menu,$no_check_installdocs,$no_check_wmmenu,$calls_wmmenu);
+ my ($no_check_menu,$no_check_installdocs);
my $interp;
open(IN, '<', $spath) or
@@ -612,8 +612,8 @@ sub check_script {
s/\#.*$//o;
##
- # either update-menus or wm-menu-config will satisfy
- # the checks that the menu file installed is properly used
+ # update-menus will satisfy the checks that the menu file
+ # installed is properly used
##
# does the script check whether update-menus exists?
@@ -636,24 +636,6 @@ sub check_script {
}
}
- # does the script check whether wm-menu-config exists?
- if (s/-x\s+\S*wm-menu-config//o or /(?:which|type)\s+wm-menu-config/o
- or s/command\s+.*?wm-menu-config//o) {
- # yes, it does.
- $pres->{'checks-for-wmmenuconfig'} = 1;
- }
-
- # does the script call wm-menu-config?
- if
(m/(?:^\s*|[;&|]\s*|(?:then|do)\s+)(?:\/usr\/sbin\/)?wm-menu-config(?:\s|[;&|<>]|$)/)
{
- # yes, it does.
- tag 'maintainer-script-calls-deprecated-wm-menu-config',
"$script:$." unless $calls_wmmenu++;
-
- # checked first?
- if (not $pres->{'checks-for-wmmenuconfig'} and $pkg ne 'menu') {
- tag
'maintainer-script-does-not-check-for-existence-of-wm-menu-config',
"$script:$." unless $no_check_wmmenu++;
- }
- }
-
# does the script set a link in /usr/doc?
# does the script remove a link in /usr/doc?
if ($interp eq 'sh') {
diff --git a/checks/menus.desc b/checks/menus.desc
index affe594..c8e2c45 100644
--- a/checks/menus.desc
+++ b/checks/menus.desc
@@ -23,16 +23,6 @@ Info: The maintainer script calls the <tt>update-menus</tt>
command without
For example, use the following code in your maintainer script:
if [ -x /usr/bin/update-menus ] ; then update-menus ; fi
-Tag: maintainer-script-does-not-check-for-existence-of-wm-menu-config
-Severity: important
-Certainty: possible
-Info: The maintainer script calls the <tt>wm-menu-config</tt> command without
- checking for existence first. (The <tt>menu</tt> package which provides
- the command is not marked as "essential" package.)
- .
- For example, use the following code in your maintainer script:
- if [ -x /usr/sbin/wm-menu ]; then /usr/sbin/wm-menu-config; fi
-
Tag: maintainer-script-does-not-check-for-existence-of-installdocs
Severity: important
Certainty: possible
@@ -45,13 +35,6 @@ Info: The maintainer script calls the <tt>install-docs</tt>
command without
/usr/sbin/install-docs -i /usr/share/doc-base/<your-package>
fi
-Tag: maintainer-script-calls-deprecated-wm-menu-config
-Severity: normal
-Certainty: possible
-Info: The use of the wm-menu-config script is deprecated because its design
- had some serious flaws.
-Ref: menu 5
-
Tag: preinst-calls-updatemenus
Severity: important
Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 23b7be6..3e8f104 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ lintian (2.5.5) UNRELEASED; urgency=low
- preinst-uses-dpkg-maintscript-helper-without-predepends
- shlib-in-multi-arch-foreign-package
+ Removed:
+ - maintainer-script-calls-deprecated-wm-menu-config
+ - maintainer-script-does-not-check-for-existence-of-wm-menu-config
- uploader-address-missing
* checks/*:
@@ -64,6 +66,11 @@ lintian (2.5.5) UNRELEASED; urgency=low
+ [NT] Allow fonts in packages starting with "fonts-". This
completes the fix for #646838. Thanks to أحمد المحمودي
for the follow up report. (Closes: #651045)
+ * checks/menus{,.desc}:
+ + [NT] Remove obsolete checks for wm-menu/wm-menu-config use in
+ maintainer scripts. The executables are not shipped in menu
+ in Squeeze nor sid. Furthermore the tags are not emitted in
+ any package (according to lintian.d.o).
* checks/group-check{,.desc}:
+ [NT] Check for file conflicts in binaries built from the same
source package. (Closes: #293838)
diff --git a/t/COVERAGE b/t/COVERAGE
index 0479a0b..c2690f9 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
-Last generated 2011-12-21
-Coverage: 784/954 (82.18%), w. legacy tests: 892/954 (93.50%)
+Last generated 2012-01-22
+Coverage: 789/957 (82.45%), w. legacy tests: 895/957 (93.52%)
The following tags are not tested by the test suite:
@@ -168,8 +168,6 @@ menus doc-base-file-uses-obsolete-national-encoding
menus doc-base-index-references-multiple-files
menus doc-base-invalid-document-field
menus doc-base-unknown-section
-menus maintainer-script-calls-deprecated-wm-menu-config
-menus maintainer-script-does-not-check-for-existence-of-wm-menu-config
menus menu-file-in-usr-lib
menus menu-method-should-include-menu-h
menus postinst-does-not-call-updatemenus
@@ -304,8 +302,6 @@ maintainer-scripts
debconf-config-not-executable
init.d-script-not-included-in-package
init.d-script-not-marked-as-conffile
- maintainer-script-calls-deprecated-wm-menu-config
- maintainer-script-does-not-check-for-existence-of-wm-menu-config
maintainer-script-ignores-errors
maintainer-script-removes-device-files
no-debconf-templates
diff --git a/t/tests/menus-script-check-ok/debian/debian/postinst
b/t/tests/menus-script-check-ok/debian/debian/postinst
index 8617b68..9907569 100644
--- a/t/tests/menus-script-check-ok/debian/debian/postinst
+++ b/t/tests/menus-script-check-ok/debian/debian/postinst
@@ -8,9 +8,6 @@ set -e
if [ -x /usr/bin/update-menus ] ; then
update-menus
fi
-if command -v wm-menu-config >/dev/null 2>&1 ; then
- wm-menu-config
-fi
if type install-docs >/dev/null 2>&1 ; then
install-docs -i /usr/share/doc-base/test-doc
fi
diff --git a/t/tests/menus-script-check-ok/desc
b/t/tests/menus-script-check-ok/desc
index 23254aa..adc5a2e 100644
--- a/t/tests/menus-script-check-ok/desc
+++ b/t/tests/menus-script-check-ok/desc
@@ -8,4 +8,3 @@ Test-For:
Test-Against:
maintainer-script-does-not-check-for-existence-of-installdocs
maintainer-script-does-not-check-for-existence-of-updatemenus
- maintainer-script-does-not-check-for-existence-of-wm-menu-config
diff --git a/t/tests/menus-script-check-ok/tags
b/t/tests/menus-script-check-ok/tags
index ed87bfb..b1ed61d 100644
--- a/t/tests/menus-script-check-ok/tags
+++ b/t/tests/menus-script-check-ok/tags
@@ -1,5 +1,4 @@
-W: menus-script-check-ok: maintainer-script-calls-deprecated-wm-menu-config
postinst:12
-W: menus-script-check-ok: possible-bashism-in-maintainer-script postinst:14
'if type '
+W: menus-script-check-ok: possible-bashism-in-maintainer-script postinst:11
'if type '
W: menus-script-check-ok: possible-bashism-in-maintainer-script postrm:3 'if
type '
W: menus-script-check-ok: postinst-has-useless-call-to-install-docs
W: menus-script-check-ok: prerm-has-useless-call-to-install-docs
diff --git a/testset/maintainer-scripts/debian/postinst
b/testset/maintainer-scripts/debian/postinst
index c4a5c4b..b81725b 100644
--- a/testset/maintainer-scripts/debian/postinst
+++ b/testset/maintainer-scripts/debian/postinst
@@ -30,8 +30,6 @@ install-info /usr/share/info/foo \
echo Please use update-rc.d or invoke-rc.d to set up blah blah.
-wm-menu-config
-
chown root.root /usr/share/doc/maintainer-scripts/changelog
chown root:root /usr/share/doc/maintainer-scripts/changelog
diff --git a/testset/tags.maintainer-scripts b/testset/tags.maintainer-scripts
index 5e3e9a0..cf49d75 100644
--- a/testset/tags.maintainer-scripts
+++ b/testset/tags.maintainer-scripts
@@ -6,15 +6,14 @@ E: maintainer-scripts: debconf-config-not-executable
E: maintainer-scripts: debian-changelog-file-contains-invalid-email-address
jeroen@mordor
E: maintainer-scripts: forbidden-config-interpreter #!/usr/bin/python
E: maintainer-scripts: init.d-script-not-included-in-package etc/init.d/foo
-E: maintainer-scripts: install-sgmlcatalog-deprecated postinst:100
+E: maintainer-scripts: install-sgmlcatalog-deprecated postinst:98
E: maintainer-scripts: install-sgmlcatalog-deprecated postrm:47
E: maintainer-scripts: maintainer-script-calls-init-script-directly prerm:55
-E: maintainer-scripts:
maintainer-script-does-not-check-for-existence-of-wm-menu-config postinst:33
-E: maintainer-scripts: maintainer-script-modifies-inetd-conf postinst:93
-E: maintainer-scripts: maintainer-script-modifies-inetd-conf postinst:94
-E: maintainer-scripts: maintainer-script-modifies-netbase-managed-file
postinst:85 /etc/services
-E: maintainer-scripts: maintainer-script-modifies-netbase-managed-file
postinst:86 /etc/protocols
-E: maintainer-scripts: maintainer-script-modifies-netbase-managed-file
postinst:87 /etc/rpc
+E: maintainer-scripts: maintainer-script-modifies-inetd-conf postinst:91
+E: maintainer-scripts: maintainer-script-modifies-inetd-conf postinst:92
+E: maintainer-scripts: maintainer-script-modifies-netbase-managed-file
postinst:83 /etc/services
+E: maintainer-scripts: maintainer-script-modifies-netbase-managed-file
postinst:84 /etc/protocols
+E: maintainer-scripts: maintainer-script-modifies-netbase-managed-file
postinst:85 /etc/rpc
E: maintainer-scripts: maintainer-script-removes-device-files postrm:40
E: maintainer-scripts: maintainer-script-removes-device-files postrm:41
E: maintainer-scripts: maintainer-script-uses-dpkg-status-directly postinst
@@ -54,17 +53,16 @@ W: maintainer-scripts: ancient-dpkg-epoch-check preinst:8
W: maintainer-scripts: ancient-dpkg-long-filenames-check preinst:9
W: maintainer-scripts: ancient-dpkg-multi-conrep-check preinst:10
W: maintainer-scripts: ancient-dpkg-predepends-check preinst:7
-W: maintainer-scripts: command-with-path-in-maintainer-script postinst:173
/usr/bin/baz
+W: maintainer-scripts: command-with-path-in-maintainer-script postinst:171
/usr/bin/baz
W: maintainer-scripts: command-with-path-in-maintainer-script preinst:12
/bin/egrep
W: maintainer-scripts: config-does-not-load-confmodule
-W: maintainer-scripts: deprecated-chown-usage postinst:167 'chown -R root.root'
-W: maintainer-scripts: deprecated-chown-usage postinst:35 'chown root.root'
-W: maintainer-scripts: gconftool-used-in-maintainer-script postinst:70
+W: maintainer-scripts: deprecated-chown-usage postinst:165 'chown -R root.root'
+W: maintainer-scripts: deprecated-chown-usage postinst:33 'chown root.root'
+W: maintainer-scripts: gconftool-used-in-maintainer-script postinst:68
W: maintainer-scripts: init.d-script-not-marked-as-conffile etc/init.d/foo
W: maintainer-scripts: install-info-used-in-maintainer-script postinst:28
-W: maintainer-scripts: maintainer-script-calls-deprecated-wm-menu-config
postinst:33
W: maintainer-scripts: maintainer-script-empty config
-W: maintainer-scripts: maintainer-script-hides-init-failure postinst:57
+W: maintainer-scripts: maintainer-script-hides-init-failure postinst:55
W: maintainer-scripts: maintainer-script-ignores-errors postrm
W: maintainer-scripts: maintainer-script-ignores-errors preinst
W: maintainer-scripts: maintainer-script-needs-depends-on-gconf2 postinst
@@ -72,19 +70,19 @@ W: maintainer-scripts:
maintainer-script-needs-depends-on-ucf postinst
W: maintainer-scripts: maintainer-script-needs-depends-on-xml-core postinst
W: maintainer-scripts: missing-debconf-dependency
W: maintainer-scripts: no-debconf-templates
-W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:110
'${H[@]}'
-W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:145
'echo -e'
-W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:146
'${!foo}'
-W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:148
'select foo'
-W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:151 '
exec -l'
-W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:152 '
exec -c'
-W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:153 '
exec -a'
-W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:155 'let
'
-W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:156
'test -a'
-W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:157
'$RANDOM'
+W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:108
'${H[@]}'
+W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:143
'echo -e'
+W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:144
'${!foo}'
+W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:146
'select foo'
+W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:149 '
exec -l'
+W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:150 '
exec -c'
+W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:151 '
exec -a'
+W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:153 'let
'
+W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:154
'test -a'
+W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:155
'$RANDOM'
W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:16 '.
/usr/share/lintian/shell foo'
W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:17 '.
"$(dirname $0)/shell"'
-W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:177
'$RANDOM'
+W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:175
'$RANDOM'
W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:20 'read'
W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:22
'H[0]='
W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:23
'${H[0]}'
@@ -161,11 +159,11 @@ W: maintainer-scripts:
possible-bashism-in-maintainer-script prerm:90 ' echo -n
W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:95
'ech.os() {'
W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:97 '>&bar'
W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:98 '>& bar'
-W: maintainer-scripts:
possibly-insecure-handling-of-tmp-files-in-maintainer-script postinst:52
+W: maintainer-scripts:
possibly-insecure-handling-of-tmp-files-in-maintainer-script postinst:50
W: maintainer-scripts:
possibly-insecure-handling-of-tmp-files-in-maintainer-script postrm:40
W: maintainer-scripts: postinst-does-not-load-confmodule
W: maintainer-scripts: postinst-should-not-set-usr-doc-link
W: maintainer-scripts: postrm-does-not-purge-debconf
W: maintainer-scripts: postrm-has-useless-call-to-ldconfig
-W: maintainer-scripts: start-stop-daemon-in-maintainer-script postinst:161
+W: maintainer-scripts: start-stop-daemon-in-maintainer-script postinst:159
W: maintainer-scripts: update-alternatives-remove-called-in-postrm
--
Debian package checker
--
To UNSUBSCRIBE, email to debian-lint-maint-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rox1l-0003cm...@vasks.debian.org
