lintian: r966 - in trunk: checks debian testset testset/binary/debian testset/maintainer-scripts/debian
Author: rra
Date: 2007-10-15 04:44:24 +0200 (Mon, 15 Oct 2007)
New Revision: 966
Modified:
trunk/checks/menu-format
trunk/checks/scripts
trunk/checks/scripts.desc
trunk/debian/changelog
trunk/testset/binary/debian/hello.desktop
trunk/testset/maintainer-scripts/debian/postinst
trunk/testset/maintainer-scripts/debian/postrm
trunk/testset/tags.maintainer-scripts
Log:
+ [RA] Ignore categories beginning with "X-", reserved for category
extensions. Thanks, Josselin Mouette. (Closes: #443827)
* checks/scripts{.desc,}:
+ [RA] Allow install-sgmlcatalog --remove in postinst as well as
prerm and suggest removing it entirely in the long description.
Modified: trunk/checks/menu-format
===================================================================
--- trunk/checks/menu-format 2007-10-15 02:26:33 UTC (rev 965)
+++ trunk/checks/menu-format 2007-10-15 02:44:24 UTC (rev 966)
@@ -782,6 +782,7 @@
my @cats = split (';', $vals{'Categories'});
my $saw_main;
for my $cat (@cats) {
+ next if $cat =~ /^X-/;
if ($reserved_categories{$cat}) {
tag "desktop-entry-uses-reserved-category", "$cat $file"
unless $vals{'OnlyShowIn'};
Modified: trunk/checks/scripts
===================================================================
--- trunk/checks/scripts 2007-10-15 02:26:33 UTC (rev 965)
+++ trunk/checks/scripts 2007-10-15 02:44:24 UTC (rev 966)
@@ -656,7 +656,7 @@
if (m,\bgconftool(-2)?(\s|\Z),) {
tag "gconftool-used-in-maintainer-script", "$file:$.";
}
- if (m,\binstall-sgmlcatalog\b, && !(m,--remove, && $file eq 'prerm')) {
+ if (m,\binstall-sgmlcatalog\b, && !(m,--remove, && ($file eq 'prerm' || $file eq 'postinst'))) {
tag "install-sgmlcatalog-deprecated", "$file:$.";
}
if (m,/var/lib/dpkg/status\b, && $pkg ne 'base-files' && $pkg ne 'dpkg') {
Modified: trunk/checks/scripts.desc
===================================================================
--- trunk/checks/scripts.desc 2007-10-15 02:26:33 UTC (rev 965)
+++ trunk/checks/scripts.desc 2007-10-15 02:44:24 UTC (rev 966)
@@ -408,6 +408,8 @@
Tag: install-sgmlcatalog-deprecated
Type: error
Info: The maintainer script apparently runs install-sgmlcatalog with flags
- other than <tt>--quiet</tt> and <tt>--remove</tt>. install-sgmlcatalog
- is deprecated and should only be used in prerm to remove the entries from
- earlier packages.
+ other than <tt>--quiet</tt> and <tt>--remove</tt> or in a maintainer
+ script other than postinst or prerm. install-sgmlcatalog is deprecated
+ and should only be used in postinst or prerm to remove the entries from
+ earlier packages. Given how long ago this transition was, consider
+ removing it entirely.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-10-15 02:26:33 UTC (rev 965)
+++ trunk/debian/changelog 2007-10-15 02:44:24 UTC (rev 966)
@@ -45,19 +45,23 @@
+ [RA] Reserved categories are okay in .desktop files if OnlyShowIn is
present, and generally deserve their own separate tag regardless.
Thanks, Michael Biebl. (Closes: #442709)
+ + [RA] Ignore categories beginning with "X-", reserved for category
+ extensions. Thanks, Josselin Mouette. (Closes: #443827)
* checks/nmu.desc:
+ [RA] Remove obsolete note about binary NMUs. Patch from Thijs
Kinkhorst. (Closes: #437925)
- * checks/scripts:
+ * checks/scripts{.desc,}:
+ [RA] We now have a csh package. Allow it as an alternative for csh
script dependencies. Thanks, Bernd Zeimetz. (Closes: #440825)
+ + [RA] Allow install-sgmlcatalog --remove in postinst as well as
+ prerm and suggest removing it entirely in the long description.
* checks/version-substvars.desc:
+ [RA] Properly escape < and >.
* collection/changelog-file{.desc,}:
+ [RA] Collect NEWS.Debian as well as changelog.
- -- Russ Allbery <rra@debian.org> Sun, 14 Oct 2007 19:24:56 -0700
+ -- Russ Allbery <rra@debian.org> Sun, 14 Oct 2007 19:41:13 -0700
lintian (1.23.34) unstable; urgency=low
Modified: trunk/testset/binary/debian/hello.desktop
===================================================================
--- trunk/testset/binary/debian/hello.desktop 2007-10-15 02:26:33 UTC (rev 965)
+++ trunk/testset/binary/debian/hello.desktop 2007-10-15 02:44:24 UTC (rev 966)
@@ -9,6 +9,6 @@
Icon=hello
Terminal=true
Type=Application
-Categories=GNOME;GTK;System;Applet;Settings;
+Categories=GNOME;GTK;System;Applet;X-Foo;Settings;
Encoding=UTF-8
OnlyShowIn=GNOME;
Modified: trunk/testset/maintainer-scripts/debian/postinst
===================================================================
--- trunk/testset/maintainer-scripts/debian/postinst 2007-10-15 02:26:33 UTC (rev 965)
+++ trunk/testset/maintainer-scripts/debian/postinst 2007-10-15 02:44:24 UTC (rev 966)
@@ -94,6 +94,6 @@
# But this is fine.
cp /etc/inetd.conf /srv/chroot/etc/inetd.conf
-# Deprecated and not allowed.
+# Deprecated and not allowed except the second one.
install-sgmlcatalog --install package
install-sgmlcatalog --remove package
Modified: trunk/testset/maintainer-scripts/debian/postrm
===================================================================
--- trunk/testset/maintainer-scripts/debian/postrm 2007-10-15 02:26:33 UTC (rev 965)
+++ trunk/testset/maintainer-scripts/debian/postrm 2007-10-15 02:44:24 UTC (rev 966)
@@ -41,3 +41,6 @@
# But this is okay.
rm /tmp/foo > /dev/null
+
+# Not allowed here even with remove.
+install-sgmlcatalog --remove package
Modified: trunk/testset/tags.maintainer-scripts
===================================================================
--- trunk/testset/tags.maintainer-scripts 2007-10-15 02:26:33 UTC (rev 965)
+++ trunk/testset/tags.maintainer-scripts 2007-10-15 02:44:24 UTC (rev 966)
@@ -6,7 +6,7 @@
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:98
-E: maintainer-scripts: install-sgmlcatalog-deprecated postinst:99
+E: maintainer-scripts: install-sgmlcatalog-deprecated postrm:46
E: maintainer-scripts: interpreter-without-predep control/config #!/usr/bin/python
E: maintainer-scripts: maintainer-script-calls-init-script-directly prerm:54
E: maintainer-scripts: maintainer-script-does-not-check-for-existence-of-wm-menu-config postinst:31
Reply to: