lintian: r166 - in trunk: collection debian doc
Author: djpig
Date: 2004-04-16 01:14:27 +0200 (Fri, 16 Apr 2004)
New Revision: 166
Modified:
trunk/collection/override-file
trunk/collection/override-file.desc
trunk/debian/changelog
trunk/doc/lintian.sgml
Log:
add support for source overrides (Closes: #129510)
Also rewort overrides section of User Manual
Modified: trunk/collection/override-file
===================================================================
--- trunk/collection/override-file 2004-04-15 21:59:19 UTC (rev 165)
+++ trunk/collection/override-file 2004-04-15 23:14:27 UTC (rev 166)
@@ -26,12 +26,18 @@
my $pkg = shift;
my $type = shift;
--f "fields/package" or fail("override-file invoked in wrong directory");
+-d "unpacked" or fail("override-file invoked in wrong directory");
unlink("override");
# Pick the first of these files that exists.
-my $file = "unpacked/usr/share/lintian/overrides/$pkg";
+my $file;
+if ($type eq 'source') {
+ $file = "unpacked/debian/source.lintian-overrides";
+} else {
+ $file = "unpacked/usr/share/lintian/overrides/$pkg";
+}
+
if ( ! -f $file )
{ if ( -f $file . ".gz" ) { $file = $file . ".gz"; }
else { $file = ''; }
Modified: trunk/collection/override-file.desc
===================================================================
--- trunk/collection/override-file.desc 2004-04-15 21:59:19 UTC (rev 165)
+++ trunk/collection/override-file.desc 2004-04-15 23:14:27 UTC (rev 166)
@@ -1,7 +1,7 @@
Collector-Script: override-file
Author: Darren Benham <gecko@debian.org>
Info: This script copies the `override' file of a package into the lintian directory.
-Type: binary, udeb
+Type: binary, udeb, source
Unpack-Level: 2
Output: override
Order: 1
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-04-15 21:59:19 UTC (rev 165)
+++ trunk/debian/changelog 2004-04-15 23:14:27 UTC (rev 166)
@@ -5,6 +5,10 @@
* [FL] add udeb support (Closes: #216117)
Thanks to Joey Hess for his input. Many changes, mostly to
frontend/lintian, checks/debconf and checks/files
+
+ * collection/override-file:
+ + [FL] add support for source overrides (Closes: #129510)
+ See the User Manual for more information.
* lib/Dep.pm:
+ [FL] Fixed some semantic errors (since noone ever observed the
@@ -22,6 +26,8 @@
* doc/lintian.sgml:
+ [FL] Some updates, some more verbatim explantions
+ + [FL] Reworked the override section to handle udeb and
+ source packages, too
* doc/README:
+ [FL] Update options
Modified: trunk/doc/lintian.sgml
===================================================================
--- trunk/doc/lintian.sgml 2004-04-15 21:59:19 UTC (rev 165)
+++ trunk/doc/lintian.sgml 2004-04-15 23:14:27 UTC (rev 166)
@@ -426,38 +426,57 @@
Lintian error message and a short note, stating why you think this is an
exception. This way, the Lintian maintainers can be sure the problem is not
actually a bug in Lintian or an error in the author's reading of policy.
+
Once it has been decided that an override is needed, you can easily add one by
-supply a <file>/usr/share/lintian/overrides/package</file> file.
-With that, Lintian will know about this exception and not report the problem again when checking your package. (Actually, Lintian will report the problem
-again, but with type <em>overridden</em>, see above.)
+supply a overrides file. If the override is for a binary or udeb
+package, you have to place it at
+<file>/usr/share/lintian/overrides/<package></file> inside the
+package. If the override is for a source package, you have to place
+it at <file>debian/source.lintian-overrides</file>. With that, Lintian
+will know about this exception and not report the problem again when
+checking your package. (Actually, Lintian will report the problem
+again, but with type <em>overridden</em>, see above.) Note that
+support for source overrides was added in Lintian version 1.23.0.
<p>
-Note that Lintian extracts the override file from the deb and stores
+Note that Lintian extracts the override file from the (u)deb and stores
it in the laboratory. The files currently installed on the system are
not used in current Lintian versions.
<p>
-The format of the overrides file is simple: <tt>package:
-lintian-tag lintian-info</tt> (lintian-info is optional).
-An example file would look like:
+The format of the overrides file is simple: <tt><package> <type>:
+<lintian-tag> <lintian-info></tt>, where
+<tt><package></tt> is the package name; <tt><type></tt>
+is one of <tt>binary</tt>, <tt>udeb</tt> and <tt>source</tt>, and
+<tt><lintian-info></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>).
+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: non-standard-dir-perm
</example>
<p>
-Many tags can occour more than once (e.g. if the same error is found
-in more than one file. You can override a tag either completly by
-specifying its name (second line in the example) or only one
-occourence of it by specifying the additional info, too (first line
-in the example).
+An example file for a source package would look like:
+<example>
+debian/source.lintian-overrides in your base source directory
+foo source: debian-files-list-in-source
+foo source: configure-generated-file-in-source config.cache
+</example>
<p>
+Many tags can occour more than once (e.g. if the same error is found
+in more than one file). You can override a tag either completly by
+specifying its name (first line in the examples) or only one
+occourence of it by specifying the additional info, too (second line
+in the examples).
+
<chapt>Advanced usage
<p>
Reply to: