lintian: r353 - in trunk: debian doc frontend testset/libbaz/debian

[jeroen@wolffelaar.nl]

Author: jeroen
Date: 2004-10-13 02:26:11 +0200 (Wed, 13 Oct 2004)
New Revision: 353

Modified:
   trunk/debian/changelog
   trunk/doc/lintian.sgml
   trunk/frontend/lintian
   trunk/testset/libbaz/debian/source.lintian-overrides
Log:
frontend/lintian:
+ [JvW] Fix overrides so that they allow all of (1) <package> <type>:, (2)
  <package>:, and (3) <nothing> as prefix to tags you want to override,
  and modify documentation accordingly. This used to be buggy
  (Closes: #261435)


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-10-12 23:57:52 UTC (rev 352)
+++ trunk/debian/changelog	2004-10-13 00:26:11 UTC (rev 353)
@@ -43,6 +43,12 @@
   * checks/shared-libraries:
     + [JvW] Ignore comments in shlibs files (Closes: #275124)
 
+  * frontend/lintian:
+    + [JvW] Fix overrides so that they allow all of (1) <package> <type>:, (2)
+      <package>:, and (3) <nothing> as prefix to tags you want to override,
+      and modify documentation accordingly. This used to be buggy
+      (Closes: #261435)
+
  -- Jeroen van Wolffelaar <jeroen@wolffelaar.nl>  Wed, 13 Oct 2004 01:14:41 +0200
 
 lintian (1.23.2) unstable; urgency=low

Modified: trunk/doc/lintian.sgml
===================================================================
--- trunk/doc/lintian.sgml	2004-10-12 23:57:52 UTC (rev 352)
+++ trunk/doc/lintian.sgml	2004-10-13 00:26:11 UTC (rev 353)
@@ -446,18 +446,18 @@
 
 <p>
 
-The format of the overrides file is simple: <tt>&lt;package&gt; &lt;type&gt;:
-&lt;lintian-tag&gt; &lt;lintian-info&gt;</tt>, where
+The format of the overrides file is simple: <tt>[&lt;package&gt;[
+&lt;type&gt;]: ]&lt;lintian-tag&gt;[ &lt;lintian-info&gt;]</tt>. 
 <tt>&lt;package&gt;</tt> is the package name; <tt>&lt;type&gt;</tt>
 is one of <tt>binary</tt>, <tt>udeb</tt> and <tt>source</tt>, and
 <tt>&lt;lintian-info&gt;</tt> is all additional information provided
-by Lintian except for the tag. (lintian-info is optional, type can
-be omitted if it is <tt>binary</tt>).
+by Lintian except for the tag. What's inside brackets is optional and may be
+omitted if you want to match it all.
 An example file for a binary package would look like:
 <example>
 /usr/share/lintian/overrides/foo, where foo is the name of your package
-foo: non-standard-dir-perm
-foo: FSSTND-dir-in-usr /usr/man/man1/foo.1.gz
+foo binary: non-standard-dir-perm
+foo binary: FSSTND-dir-in-usr /usr/man/man1/foo.1.gz
 </example>
 
 <p>

Modified: trunk/frontend/lintian
===================================================================
--- trunk/frontend/lintian	2004-10-12 23:57:52 UTC (rev 352)
+++ trunk/frontend/lintian	2004-10-13 00:26:11 UTC (rev 353)
@@ -1230,7 +1230,7 @@
     }
 
     if ($action eq 'check') { 	# read override file
-	Tags::pkg_reset($type eq 'binary' ? $pkg : "$pkg $type");
+	Tags::pkg_reset($long_type eq 'binary' ? $pkg : "$pkg $long_type");
 
 
 	unless ($no_override) 
@@ -1242,6 +1242,7 @@
 
 			    # TODO: warn if no $pkg: thing is there...
 			    s/^\Q$pkg\E://;
+			    s/^\Q$pkg $long_type\E://;
 			    s/^\s+//o;
 			    s/\s+$//o;
 			    s/\s+/ /go;

Modified: trunk/testset/libbaz/debian/source.lintian-overrides
===================================================================
--- trunk/testset/libbaz/debian/source.lintian-overrides	2004-10-12 23:57:52 UTC (rev 352)
+++ trunk/testset/libbaz/debian/source.lintian-overrides	2004-10-13 00:26:11 UTC (rev 353)
@@ -1 +1 @@
-libbaz: maintainer-script-lacks-debhelper-token
+libbaz source: maintainer-script-lacks-debhelper-token