[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

lintian: r703 - in trunk: checks debian testset testset/binary/debian



Author: rra
Date: 2006-07-25 18:49:40 +0200 (Tue, 25 Jul 2006)
New Revision: 703

Modified:
   trunk/checks/menus
   trunk/debian/changelog
   trunk/testset/binary/debian/doc-base
   trunk/testset/tags.binary
Log:
* checks/menu:
  + [RA] Ignore trailing whitespace in doc-base files.  Patch from Bas
    Zoetekouw.  (Closes: #379749)

Modified: trunk/checks/menus
===================================================================
--- trunk/checks/menus	2006-07-25 02:37:06 UTC (rev 702)
+++ trunk/checks/menus	2006-07-25 16:49:40 UTC (rev 703)
@@ -209,10 +209,10 @@
 	    if (/^\s/ && $field) {
 		push (@files, split ' ');
 	    }
-	    if (/^(Index|Files)\s*:\s*(.*)\s*$/i) {
+	    if (/^(Index|Files)\s*:\s*(.*?)\s*$/i) {
 		$field = lc $1;
 		@files = split (' ', $2);
-	    } elsif (/^Format\s*:\s*(.*)\s*$/i) {
+	    } elsif (/^Format\s*:\s*(.*?)\s*$/i) {
 		my $format = lc $1;
 		tag "doc-base-file-unknown-format", "$dbfile:$.", $format
 		    unless $known_doc_base_formats{$format};

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-07-25 02:37:06 UTC (rev 702)
+++ trunk/debian/changelog	2006-07-25 16:49:40 UTC (rev 703)
@@ -14,6 +14,9 @@
   * checks/manpages{.desc,}:
     + [RA] Warn about manpage short descriptions of the form "manual page
       for program" (usually generated by help2man).
+  * checks/menu:
+    + [RA] Ignore trailing whitespace in doc-base files.  Patch from Bas
+      Zoetekouw.  (Closes: #379749)
   * checks/nmu{.desc,}:
     + [RA] When checking for an NMU changelog entry, require "NMU" be
       surrounded by word boundaries.
@@ -32,7 +35,7 @@
       therefore cause lintian to exit with non-zero status.  Thanks,
       Andree Leidenfrost and Martin F. Krafft.  (Closes: #377182, #374314)
 
- -- Russ Allbery <rra@debian.org>  Mon, 24 Jul 2006 17:47:50 -0700
+ -- Russ Allbery <rra@debian.org>  Tue, 25 Jul 2006 09:49:28 -0700
 
 lintian (1.23.22) unstable; urgency=low
 

Modified: trunk/testset/binary/debian/doc-base
===================================================================
--- trunk/testset/binary/debian/doc-base	2006-07-25 02:37:06 UTC (rev 702)
+++ trunk/testset/binary/debian/doc-base	2006-07-25 16:49:40 UTC (rev 703)
@@ -2,7 +2,8 @@
 Title: Broken binary doc-base control file
 Author: Russ Allbery
 Abstract: This control file exercises various tests of doc-base control
- files, including several things that aren't tested yet.
+ files, including several things that aren't tested yet.  The third and
+ fourth one has trailing whitespace.
 Section: Non/Existant
 Unknown: Some field
 
@@ -13,11 +14,11 @@
 Format: ESP
 Index: /usr/share/doc/binary/binary.txt
 
-Index: /usr/share/doc/binary/html/index.html
- /usr/share/doc/binary/html/ch1.html
+Index: /usr/share/doc/binary/html/index.html  
+ /usr/share/doc/binary/html/ch1.html  
  /usr/share/doc/binary/html/ch4.html
 
-Format: HTML
+Format: HTML  
 Index: /usr/share/doc/binary/html/index.html
 Files: /usr/share/doc/binary/html/ch?.h*l
 	/usr/share/doc/binary/hml/*.html

Modified: trunk/testset/tags.binary
===================================================================
--- trunk/testset/tags.binary	2006-07-25 02:37:06 UTC (rev 702)
+++ trunk/testset/tags.binary	2006-07-25 16:49:40 UTC (rev 703)
@@ -2,11 +2,11 @@
 E: binary: changelog-file-not-compressed changelog
 E: binary: debian-changelog-file-missing-or-wrong-name
 E: binary: depends-on-x-metapackage depends: xorg
-E: binary: doc-base-file-references-missing-file binary:10 /usr/share/doc/binary/binary.sgml.gz
-E: binary: doc-base-file-references-missing-file binary:14 /usr/share/doc/binary/binary.txt
-E: binary: doc-base-file-references-missing-file binary:18 /usr/share/doc/binary/html/ch4.html
-E: binary: doc-base-file-references-missing-file binary:23 /usr/share/doc/binary/hml/*.html
-E: binary: doc-base-index-references-multiple-files binary:18
+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-index-references-multiple-files binary:19
 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 section /usr/lib/menu/binary:1
@@ -38,7 +38,7 @@
 W: binary: binary-without-manpage hello.static
 W: binary: binary-without-manpage iminusrbin
 W: binary: binary-without-manpage static-hello
-W: binary: doc-base-file-unknown-format binary:13 esp
+W: binary: doc-base-file-unknown-format binary:14 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:6 /imnothere



Reply to: