lintian: r1212 - in trunk: checks debian testset testset/etcfiles/debian
Author: rra
Date: 2008-02-19 01:50:58 +0100 (Tue, 19 Feb 2008)
New Revision: 1212
Modified:
trunk/checks/debian-readme
trunk/checks/debian-readme.desc
trunk/debian/changelog
trunk/testset/etcfiles/debian/README.Debian
trunk/testset/etcfiles/debian/rules
trunk/testset/tags.etcfiles
Log:
* checks/debian-readme{.desc,}:
+ [RA] Warn of references to /usr/doc in README.Debian. Thanks,
Guillem Jover. (Closes: #465192)
Modified: trunk/checks/debian-readme
===================================================================
--- trunk/checks/debian-readme 2008-02-19 00:35:00 UTC (rev 1211)
+++ trunk/checks/debian-readme 2008-02-19 00:50:58 UTC (rev 1212)
@@ -30,11 +30,14 @@
my $readme = "";
my $template;
-# read the file in one go
-local $/ = undef;
-
if (open(IN, '<', "README.Debian")) {
- $readme = <IN>;
+ local $_;
+ while (<IN>) {
+ if (m,/usr/doc\b,) {
+ tag 'readme-debian-mentions-usr-doc', "line $.";
+ }
+ $readme .= $_;
+ }
close(IN);
}
Modified: trunk/checks/debian-readme.desc
===================================================================
--- trunk/checks/debian-readme.desc 2008-02-19 00:35:00 UTC (rev 1211)
+++ trunk/checks/debian-readme.desc 2008-02-19 00:50:58 UTC (rev 1212)
@@ -6,6 +6,13 @@
Needs-Info: debian-readme
Info: This script checks the README.Debian file for various problems.
+Tag: readme-debian-mentions-usr-doc
+Type: warning
+Info: The README.Debian file installed by this package apparently points
+ users at /usr/doc. /usr/doc has been retired and all documentation
+ migrated to /usr/share/doc. This reference should probably also be
+ updated.
+
Tag: readme-debian-contains-debmake-template
Type: warning
Info: The README.Debian file installed by this package contains one of the
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-02-19 00:35:00 UTC (rev 1211)
+++ trunk/debian/changelog 2008-02-19 00:50:58 UTC (rev 1212)
@@ -10,6 +10,9 @@
+ [FL] Add hg to the list of <vcs>-control-dir tags.
+ [RA] In the long description of outdated-autotools-helper-file,
point to autotool-dev's documentation. (Closes: #465132)
+ * checks/debian-readme{.desc,}:
+ + [RA] Warn of references to /usr/doc in README.Debian. Thanks,
+ Guillem Jover. (Closes: #465192)
* checks/files{.desc,}:
+ [FL,RA] Merge all the tags for vcs ignore files, inventory files,
and vcs control dirs. Since the explanations don't actually differ,
Modified: trunk/testset/etcfiles/debian/README.Debian
===================================================================
--- trunk/testset/etcfiles/debian/README.Debian 2008-02-19 00:35:00 UTC (rev 1211)
+++ trunk/testset/etcfiles/debian/README.Debian 2008-02-19 00:50:58 UTC (rev 1212)
@@ -1 +1,5 @@
this is a package to test lintian's handling of files in /etc.
+Also, there's a random mention of /usr/doc here to prompt a warning.
+But /usr/documentation doesn't.
+
+ -- Russ Allbery <rra@debian.org>, Mon, 18 Feb 2008 16:40:55 -0800
Modified: trunk/testset/etcfiles/debian/rules
===================================================================
--- trunk/testset/etcfiles/debian/rules 2008-02-19 00:35:00 UTC (rev 1211)
+++ trunk/testset/etcfiles/debian/rules 2008-02-19 00:50:58 UTC (rev 1212)
@@ -39,7 +39,7 @@
>> debian/tmp/DEBIAN/md5sums
echo 'this is a malformed line' \
>> debian/tmp/DEBIAN/md5sums
- echo '07408b7e90981ddc95fda4080c259436 usr/share/doc/etcfiles/README.Debian' \
+ echo '56fb27e455dd86d8801f1ecd3a4cee49 usr/share/doc/etcfiles/README.Debian' \
>> debian/tmp/DEBIAN/md5sums
dpkg-gencontrol -isp
Modified: trunk/testset/tags.etcfiles
===================================================================
--- trunk/testset/tags.etcfiles 2008-02-19 00:35:00 UTC (rev 1211)
+++ trunk/testset/tags.etcfiles 2008-02-19 00:50:58 UTC (rev 1212)
@@ -12,4 +12,5 @@
W: etcfiles: file-missing-in-md5sums usr/share/doc/etcfiles/changelog
W: etcfiles: non-etc-file-marked-as-conffile /var/lib/foo
W: etcfiles: package-contains-hardlink etc/improper -> etc/improper-link
+W: etcfiles: readme-debian-mentions-usr-doc line 2
W: etcfiles: run-parts-cron-filename-contains-full-stop etc/cron.daily/cronfile-contains.fullstop
Reply to: