[SCM] Debian package checker branch, master, updated. 2.5.6-13-gbcb26a0
The following commit has been merged in the master branch:
commit f73f215e3e28dbb3a4e3b72b7a870667155b201a
Author: Niels Thykier <niels@thykier.net>
Date: Thu Mar 15 09:22:18 2012 +0100
menus: Remove old tags
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/menus b/checks/menus
index 5cd51f4..6f2611e 100644
--- a/checks/menus
+++ b/checks/menus
@@ -170,11 +170,6 @@ if ($preinst{'calls-installdocs'}) {
tag 'preinst-calls-installdocs';
}
-# don't set the /usr/doc link, the FHS transition is over (2002-10-08)
-if (defined $postinst{'sets-link'} && $postinst{'sets-link'} == 1) {
- tag 'postinst-should-not-set-usr-doc-link';
-}
-
$anymenu_file = $menu_file || $menumethod_file;
# No one needs to call install-docs any more; triggers now handles that.
@@ -347,9 +342,6 @@ sub check_doc_base_field {
}
for my $file (@files) {
next if $file eq '';
- if ($file =~ m%^/usr/doc%) {
- tag 'doc-base-file-references-usr-doc', "$dbfile:$line";
- }
my $realfile = delink ($file, $all_links);
# openoffice.org-dev-doc has thousands of files listed so try to
# use the hash if possible.
@@ -632,22 +624,6 @@ sub check_script {
}
}
- # does the script set a link in /usr/doc?
- # does the script remove a link in /usr/doc?
- if ($interp eq 'sh') {
- if (m,ln\s+(?:-\w+)?\s+\"?\.\./share/doc/\S+, ) {
- $pres->{'sets-link'} = 1;
- }
- } elsif ($interp eq 'perl') {
- if (m|symlink\s*\(?\s*[\"\']\.\./share/doc/\.+?[\"\']\s*,|) {
- $pres->{'sets-link'} = 1;
- } elsif (m,ln\s+(?:-\w+)?\s+\"?\.\./share/doc/\S+, ) {
- $pres->{'sets-link'} = 1;
- }
- } else {
- # just fall through for now
- }
-
# does the script check whether install-docs exists?
if (s/-x\s+\S*install-docs//o or /(?:which|type)\s+install-docs/o
or s/command\s+.*?install-docs//o) {
diff --git a/checks/menus.desc b/checks/menus.desc
index c8e2c45..5997754 100644
--- a/checks/menus.desc
+++ b/checks/menus.desc
@@ -6,13 +6,6 @@ Info: Check if a binary package conforms to policy with respect to
<b>menu</b> and <b>doc-base</b> files.
Needs-Info: doc-base-files, menu-files, bin-pkg-control, index
-Tag: postinst-should-not-set-usr-doc-link
-Severity: normal
-Certainty: certain
-Info: The technical committee chose the symlink transition method to move
- from FSSTND to FHS. That transition has been completed with woody and thus
- this link is no longer required.
-
Tag: maintainer-script-does-not-check-for-existence-of-updatemenus
Severity: important
Certainty: possible
@@ -140,12 +133,6 @@ Info: The package installs a file <tt>/usr/lib/menu/menu</tt>, which is
already in use by the <tt>menu</tt> package itself. The menu file should
be named after the package that installs it.
-Tag: doc-base-file-references-usr-doc
-Severity: normal
-Certainty: certain
-Info: Files in <tt>/usr/share/doc-base</tt> should only contain links to
- files in the <tt>/usr/share/doc</tt> directory.
-
Tag: doc-base-index-references-multiple-files
Severity: important
Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 940a537..297637b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ lintian (2.5.7) UNRELEASED; urgency=low
+ Removed:
- ancient-dpkg-long-filenames-check
- ancient-dpkg-predepends-check
+ - doc-base-file-references-usr-doc
- manpage-for-non-x11-binary-in-wrong-directory
- manpage-for-x11-binary-in-wrong-directory
- obsolete-field
@@ -12,6 +13,7 @@ lintian (2.5.7) UNRELEASED; urgency=low
- package-installs-file-to-usr-x11r6-bin
- package-installs-font-to-usr-x11r6
- package-uses-obsolete-file
+ - postinst-should-not-set-usr-doc-link
- x11-games-should-be-in-usr-games
* checks/fields{,.desc}:
@@ -21,8 +23,9 @@ lintian (2.5.7) UNRELEASED; urgency=low
+ [NT] Remove "manual" lazy loads of data files.
* checks/manpages{,.desc}:
+ [NT] Remove old tags.
- * checks/menus:
+ * checks/menus{,.desc}:
+ [NT] Remove "manual" lazy load of data file.
+ + [NT] Remove old tags.
* checks/scripts{,.desc}:
+ [NT] Remove old tags.
diff --git a/t/COVERAGE b/t/COVERAGE
index ab8e4ce..c4db68f 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
Last generated 2012-03-15
-Coverage: 786/950 (82.74%), w. legacy tests: 891/950 (93.79%)
+Coverage: 785/948 (82.81%), w. legacy tests: 890/948 (93.88%)
The following tags are not tested by the test suite:
@@ -55,7 +55,6 @@ menus doc-base-abstract-field-is-template
menus doc-base-abstract-might-contain-extra-leading-whitespaces
menus doc-base-document-field-not-in-first-line
menus doc-base-file-duplicated-field
-menus doc-base-file-references-usr-doc
menus doc-base-file-separator-extra-whitespaces
menus doc-base-file-syntax-error
menus executable-in-usr-share-docbase
diff --git a/t/tests/menus-usr-doc-link/debian/debian/postinst b/t/tests/menus-usr-doc-link/debian/debian/postinst
deleted file mode 100644
index 621f250..0000000
--- a/t/tests/menus-usr-doc-link/debian/debian/postinst
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PKG=menus-usr-doc-link
-
-if [ "$1" = "configure" ] ; then
- if [ -d /usr/doc -a ! -e /usr/doc/$PKG -a -d /usr/share/doc/$PKG ] ; then
- ln -sf ../share/doc/$PKG /usr/doc/$PKG
- fi
-fi
-
-#DEBHELPER#
-
diff --git a/t/tests/menus-usr-doc-link/desc b/t/tests/menus-usr-doc-link/desc
deleted file mode 100644
index 7553364..0000000
--- a/t/tests/menus-usr-doc-link/desc
+++ /dev/null
@@ -1,5 +0,0 @@
-Testname: menus-usr-doc-link
-Sequence: 6000
-Version: 1.0
-Description: Test for setting the usr-doc link in postinst
-Test-For: postinst-should-not-set-usr-doc-link
diff --git a/t/tests/menus-usr-doc-link/tags b/t/tests/menus-usr-doc-link/tags
deleted file mode 100644
index 3c6d2ee..0000000
--- a/t/tests/menus-usr-doc-link/tags
+++ /dev/null
@@ -1 +0,0 @@
-W: menus-usr-doc-link: postinst-should-not-set-usr-doc-link
diff --git a/testset/tags.libbaz b/testset/tags.libbaz
index 08bdfe3..992f8eb 100644
--- a/testset/tags.libbaz
+++ b/testset/tags.libbaz
@@ -52,7 +52,6 @@ W: libbaz1-dev: wrong-section-according-to-package-name libbaz1-dev => libdevel
W: libbaz1: missing-depends-line
W: libbaz1: new-package-should-close-itp-bug
W: libbaz1: package-name-doesnt-match-sonames libbaz libbaz2-1.0 libbaz3-1
-W: libbaz1: postinst-should-not-set-usr-doc-link
W: libbaz1: shlib-missing-in-symbols-control-file libbaz.so for usr/lib/libbaz.so
W: libbaz1: shlib-missing-in-symbols-control-file libbaz2 1.0 for usr/lib/libfoo2.so.1.0.3b
W: libbaz1: shlib-missing-in-symbols-control-file libbaz3 1 for usr/lib/libbaz3.so.1.0.3b
diff --git a/testset/tags.maintainer-scripts b/testset/tags.maintainer-scripts
index 74bbf4c..f17efe1 100644
--- a/testset/tags.maintainer-scripts
+++ b/testset/tags.maintainer-scripts
@@ -161,7 +161,6 @@ W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:98 '>& bar'
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:159
--
Debian package checker
Reply to: