lintian: r886 - in trunk: checks debian testset testset/binary/debian
Author: rra
Date: 2007-05-09 21:02:25 +0200 (Wed, 09 May 2007)
New Revision: 886
Modified:
trunk/checks/menus
trunk/debian/changelog
trunk/testset/binary/debian/doc-base
trunk/testset/tags.binary
Log:
* checks/menus:
+ [RA] Allow multiple blank lines between doc-base sections and
trailing blank lines in the file. fine with this. Reported by Luis
Rodrigo Gallardo Cruz. (Closes: #423096)
Modified: trunk/checks/menus
===================================================================
--- trunk/checks/menus 2007-05-09 18:48:14 UTC (rev 885)
+++ trunk/checks/menus 2007-05-09 19:02:25 UTC (rev 886)
@@ -177,7 +177,7 @@
# lines for the field. As a result, all tags will be reported on the
# last continuation line of the field, rather than possibly where the
# offending file name is.
- my (@files, $field, $sawindex, $sawdocument, $format);
+ my (@files, $field, $sawindex, $sawdocument, $format, $insection);
while (1) {
$_ = <IN>;
if ((!defined ($_) || /^\S/ || /^$/) && $field) {
@@ -221,9 +221,12 @@
} elsif (defined ($_) && /^\s/ && $field) {
push (@files, split ' ');
}
+ if (defined ($_) && /^\s*\S/) {
+ $insection = 1;
+ }
if (!defined ($_) || /^$/) {
tag "doc-base-file-no-format", "$dbfile:$."
- unless $format || $sawdocument;
+ if ($insection && !($format || $sawdocument));
if ($format && ($format eq 'html' || $format eq 'info')) {
tag "doc-base-file-no-index", "$dbfile:$."
unless $sawindex;
@@ -232,6 +235,7 @@
undef $format;
undef $sawdocument;
undef $sawindex;
+ undef $insection;
}
}
close IN;
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-05-09 18:48:14 UTC (rev 885)
+++ trunk/debian/changelog 2007-05-09 19:02:25 UTC (rev 886)
@@ -14,12 +14,16 @@
+ [RA] Require libmodule-build-perl in Build-Depends if the clean rule
runs perl Build. Hopefully this isn't too aggressive. Thanks, Ian
Beckwith. (Closes: #421549)
+ * checks/menus:
+ + [RA] Allow multiple blank lines between doc-base sections and
+ trailing blank lines in the file. fine with this. Reported by Luis
+ Rodrigo Gallardo Cruz. (Closes: #423096)
* checks/scripts:
+ [RA] Add pagsh, provided by openafs-client and heimdal-clients.
+ [RA] Diagnose removal of device files in maintainer scripts per
Policy 10.6. (Closes: #268688)
- -- Russ Allbery <rra@debian.org> Wed, 9 May 2007 11:44:52 -0700
+ -- Russ Allbery <rra@debian.org> Wed, 9 May 2007 12:01:09 -0700
lintian (1.23.30) unstable; urgency=low
Modified: trunk/testset/binary/debian/doc-base
===================================================================
--- trunk/testset/binary/debian/doc-base 2007-05-09 18:48:14 UTC (rev 885)
+++ trunk/testset/binary/debian/doc-base 2007-05-09 19:02:25 UTC (rev 886)
@@ -7,6 +7,8 @@
Section: Non/Existant
Unknown: Some field
+
+
Format: debiandoc-sgML
Files: /usr/share/doc/binary/binary.sgml.gz
Unknown: Some field
@@ -18,6 +20,7 @@
/usr/share/doc/binary/html/ch1.html
/usr/share/doc/binary/html/ch4.html
+
Format: HTML
Index: /usr/share/doc/binary/html/index.html
Files: /usr/share/doc/binary/html/ch?.h*l
@@ -25,3 +28,5 @@
Format: inFO
Files: /usr/share/info/binary.info.gz
+
+
Modified: trunk/testset/tags.binary
===================================================================
--- trunk/testset/tags.binary 2007-05-09 18:48:14 UTC (rev 885)
+++ trunk/testset/tags.binary 2007-05-09 19:02:25 UTC (rev 886)
@@ -2,14 +2,14 @@
E: binary-data: md5sums-control-file-is-empty
E: binary: debian-changelog-file-missing-or-wrong-name
E: binary: depends-on-x-metapackage depends: xorg
-E: binary: doc-base-file-no-format binary:20
-E: binary: doc-base-file-no-index binary:27
-E: binary: doc-base-file-references-missing-file binary:11 /usr/share/doc/binary/binary.sgml.gz
-E: binary: doc-base-file-references-missing-file binary:15 /usr/share/doc/binary/binary.txt
-E: binary: doc-base-file-references-missing-file binary:19 /usr/share/doc/binary/html/ch4.html
-E: binary: doc-base-file-references-missing-file binary:24 /usr/share/doc/binary/hml/*.html
-E: binary: doc-base-file-references-missing-file binary:27 /usr/share/info/binary.info.gz
-E: binary: doc-base-index-references-multiple-files binary:19
+E: binary: doc-base-file-no-format binary:22
+E: binary: doc-base-file-no-index binary:31
+E: binary: doc-base-file-references-missing-file binary:13 /usr/share/doc/binary/binary.sgml.gz
+E: binary: doc-base-file-references-missing-file binary:17 /usr/share/doc/binary/binary.txt
+E: binary: doc-base-file-references-missing-file binary:21 /usr/share/doc/binary/html/ch4.html
+E: binary: doc-base-file-references-missing-file binary:27 /usr/share/doc/binary/hml/*.html
+E: binary: doc-base-file-references-missing-file binary:30 /usr/share/info/binary.info.gz
+E: binary: doc-base-index-references-multiple-files binary:21
E: binary: file-directly-in-usr-share usr/share/baz
E: binary: lengthy-symlink usr/share/doc/binary/html/ch2.html ../html/./ch1.html
E: binary: menu-item-missing-required-tag needs /usr/lib/menu/binary:6
@@ -46,7 +46,7 @@
W: binary: binary-without-manpage usr/bin/iminusrbin
W: binary: binary-without-manpage usr/bin/static-hello
W: binary: changelog-file-not-compressed changelog
-W: binary: doc-base-file-unknown-format binary:14 esp
+W: binary: doc-base-file-unknown-format binary:16 esp
W: binary: executable-not-elf-or-script ./usr/bin/iminusrbin
W: binary: file-in-unusual-dir usr/bar
W: binary: menu-command-not-in-package /usr/lib/menu/binary:11 imnothere
Reply to: