lintian: r913 - in trunk: checks debian testset testset/filenames/debian testset/maintainer-scripts/debian
Author: rra
Date: 2007-06-18 19:45:07 +0200 (Mon, 18 Jun 2007)
New Revision: 913
Modified:
trunk/checks/files
trunk/checks/files.desc
trunk/checks/scripts
trunk/checks/scripts.desc
trunk/debian/changelog
trunk/testset/filenames/debian/rules
trunk/testset/maintainer-scripts/debian/postinst
trunk/testset/maintainer-scripts/debian/prerm
trunk/testset/tags.filenames
trunk/testset/tags.maintainer-scripts
Log:
* checks/files{.desc,}:
+ [RA] Check for files installed in /usr/lib/sgml. This transition
was probably completed long ago, but checking for regression can't
hurt. (Closes: #90019)
* checks/scripts{.desc,}:
+ [RA] Check for deprecated install-sgmlcatalog usage.
Modified: trunk/checks/files
===================================================================
--- trunk/checks/files 2007-06-18 13:01:17 UTC (rev 912)
+++ trunk/checks/files 2007-06-18 17:45:07 UTC (rev 913)
@@ -277,9 +277,7 @@
# ---------------- /usr/lib/sgml
elsif ($file =~ m,^usr/lib/sgml/\S,) {
- if ($perm =~ m/^-.*[xs]/) {
- tag "executable-in-usr-lib-sgml", $file, sprintf("%04o",$operm);
- }
+ tag "file-in-usr-lib-sgml", $file;
}
# ---------------- perllocal.pod
elsif ($file =~ m,^usr/lib/perl.*/perllocal.pod$,) {
Modified: trunk/checks/files.desc
===================================================================
--- trunk/checks/files.desc 2007-06-18 13:01:17 UTC (rev 912)
+++ trunk/checks/files.desc 2007-06-18 17:45:07 UTC (rev 913)
@@ -344,10 +344,6 @@
According to the Filesystem Hierarchy Standard, architecture-independent
files need to be placed within <tt>/usr/share</tt> instead.
-Tag: executable-in-usr-lib-sgml
-Type: error
-Info: Files in <tt>/usr/lib/sgml</tt> should not be marked executable.
-
Tag: file-directly-in-usr-share-doc
Type: error
Info: Documentation files have to be installed in <tt>/usr/share/doc/<i>pkg</i>
@@ -649,3 +645,10 @@
leaving the name the same would be confusing and changing it would be
disruptive.
Ref: policy 10.4
+
+Tag: file-in-usr-lib-sgml
+Type: warning
+Ref: fhs 4
+Info: This package installs a file in <tt>/usr/lib/sgml</tt>. This was
+ the old location for SGML catalogs and similar flies. All those files
+ should now go into <tt>/usr/share/sgml</tt>.
Modified: trunk/checks/scripts
===================================================================
--- trunk/checks/scripts 2007-06-18 13:01:17 UTC (rev 912)
+++ trunk/checks/scripts 2007-06-18 17:45:07 UTC (rev 913)
@@ -656,6 +656,9 @@
if (m,\bgconftool(-2)?(\s|\Z),) {
tag "gconftool-used-in-maintainer-script", "$file:$.";
}
+ if (m,\binstall-sgmlcatalog\b, && !(m,--remove, && $file eq 'prerm')) {
+ tag "install-sgmlcatalog-deprecated", "$file:$.";
+ }
if (m,/var/lib/dpkg/status\b, && $pkg ne 'base-files' && $pkg ne 'dpkg') {
tag "maintainer-script-uses-dpkg-status-directly", "$file";
}
Modified: trunk/checks/scripts.desc
===================================================================
--- trunk/checks/scripts.desc 2007-06-18 13:01:17 UTC (rev 912)
+++ trunk/checks/scripts.desc 2007-06-18 17:45:07 UTC (rev 913)
@@ -404,3 +404,10 @@
This file must not be modified directly; instead, use the
<tt>update-inetd</tt> script or the <tt>DebianNet.pm</tt> Perl module.
Ref: policy 10.7.4
+
+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.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-06-18 13:01:17 UTC (rev 912)
+++ trunk/debian/changelog 2007-06-18 17:45:07 UTC (rev 913)
@@ -3,7 +3,7 @@
* checks/binaries:
+ [RA] Sort the package SONAMEs to provide more stable lintian tags.
Patch from Cyril Brulebois. (Closes: #428681)
- * checks/files:
+ * checks/files{.desc,}:
+ [RA] Limit the Zope license exception to only .dtml, .pt, and .cpt
files. Thanks, Bernd Zeimetz.
+ [RA] Sort the files listed in package-contains-hardlink so that the
@@ -11,6 +11,9 @@
directory when the tar file was built.
+ [RA] Don't incorrectly skip all other file location checks for hard
links.
+ + [RA] Check for files installed in /usr/lib/sgml. This transition
+ was probably completed long ago, but checking for regression can't
+ hurt. (Closes: #90019)
* checks/manpages{.desc,}:
+ [RA] Check for dh_make man page templates (by looking for the
template whatis entry). Thanks, Bill Allombert. (Closes: #173583)
@@ -25,9 +28,10 @@
+ [RA] Check for ignoring all errors from make clean or make distclean
and recommend skipping the call if there's no Makefile instead.
Thanks, Branden Robinson. (Closes: #325372)
- * checks/scripts:
+ * checks/scripts{.desc,}:
+ [RA] Add Octave as an interpreter, and allow both versioned and
unversioned forms. Thanks, Sebastian Harl. (Closes: #428403)
+ + [RA] Check for deprecated install-sgmlcatalog usage.
* checks/shared_libs:
+ [RA] Report the correct file for shlib-with-nonpic-code.
@@ -36,7 +40,7 @@
output will be stable regardless of the hash order of the directory
when the tar file was built.
- -- Russ Allbery <rra@debian.org> Mon, 18 Jun 2007 06:00:48 -0700
+ -- Russ Allbery <rra@debian.org> Mon, 18 Jun 2007 10:44:45 -0700
lintian (1.23.31) unstable; urgency=low
Modified: trunk/testset/filenames/debian/rules
===================================================================
--- trunk/testset/filenames/debian/rules 2007-06-18 13:01:17 UTC (rev 912)
+++ trunk/testset/filenames/debian/rules 2007-06-18 17:45:07 UTC (rev 913)
@@ -115,6 +115,9 @@
install -d debian/tmp/etc/gconf/schemas
touch debian/tmp/etc/gconf/schemas/test.schema
+ install -d debian/tmp/usr/lib/sgml
+ touch debian/tmp/usr/lib/sgml/package
+
ln -s '../filenames/doc/version6.txt.gz' debian/tmp/usr/share/doc/filenames/version.txt.gz
ln -s ../../share/symlink debian/tmp/usr/lib/filenames/symlink1ok
ln -s ../../../etc/symlink debian/tmp/usr/lib/filenames/symlink1wrong
Modified: trunk/testset/maintainer-scripts/debian/postinst
===================================================================
--- trunk/testset/maintainer-scripts/debian/postinst 2007-06-18 13:01:17 UTC (rev 912)
+++ trunk/testset/maintainer-scripts/debian/postinst 2007-06-18 17:45:07 UTC (rev 913)
@@ -93,3 +93,7 @@
# But this is fine.
cp /etc/inetd.conf /srv/chroot/etc/inetd.conf
+
+# Deprecated and not allowed.
+install-sgmlcatalog --install package
+install-sgmlcatalog --remove package
Modified: trunk/testset/maintainer-scripts/debian/prerm
===================================================================
--- trunk/testset/maintainer-scripts/debian/prerm 2007-06-18 13:01:17 UTC (rev 912)
+++ trunk/testset/maintainer-scripts/debian/prerm 2007-06-18 17:45:07 UTC (rev 913)
@@ -52,3 +52,6 @@
# The wrong way to run an init script (no invoke-rc.d).
/etc/init.d/package stop
+
+# This is the only install-sgmlcatalog call that's allowed.
+install-sgmlcatalog --quiet --remove package
Modified: trunk/testset/tags.filenames
===================================================================
--- trunk/testset/tags.filenames 2007-06-18 13:01:17 UTC (rev 912)
+++ trunk/testset/tags.filenames 2007-06-18 17:45:07 UTC (rev 913)
@@ -63,6 +63,7 @@
W: filenames: file-in-unusual-dir files/svk-commitsEr9P.tmp
W: filenames: file-in-unusual-dir files/svn-commit.tmp
W: filenames: file-in-unusual-dir srv/foo/bar
+W: filenames: file-in-usr-lib-sgml usr/lib/sgml/package
W: filenames: menu-file-in-usr-lib usr/lib/menu/menu
W: filenames: no-priority-field
W: filenames: no-section-field
Modified: trunk/testset/tags.maintainer-scripts
===================================================================
--- trunk/testset/tags.maintainer-scripts 2007-06-18 13:01:17 UTC (rev 912)
+++ trunk/testset/tags.maintainer-scripts 2007-06-18 17:45:07 UTC (rev 913)
@@ -5,6 +5,8 @@
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:98
+E: maintainer-scripts: install-sgmlcatalog-deprecated postinst:99
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: