[SCM] Debian package checker branch, master, updated. 2.5.4-81-g7ba8e34

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit 5fbc6b247378d4750ab15d93b53340b56e0ecf26
Author: Niels Thykier <niels@thykier.net>
Date:   Fri Dec 23 21:46:27 2011 +0100

    Documented architecture specific overrides
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 97569a8..bbb3174 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -108,6 +108,8 @@ lintian (2.5.5) UNRELEASED; urgency=low
     + [NT] Corrected the runtime estimate for an archive-wide run.
       With 35 000+ packages, it can no longer be done in "a few
       hours".
+    + [NT] Documented architecture specific overrides.
+      (Closes: #651816)
 
   * frontend/lintian:
     + [NT] Allow -U to be given more than once.
diff --git a/doc/lintian.xml b/doc/lintian.xml
index 5afb9b3..efae7bf 100644
--- a/doc/lintian.xml
+++ b/doc/lintian.xml
@@ -562,8 +562,9 @@ $
           line (and may contain empty lines and comments, starting with a <literal>#</literal>, on others):
           <literal>[[<replaceable>&lt;package&gt;</replaceable>][ <replaceable>&lt;archlist&gt;</replaceable>][ <replaceable>&lt;type&gt;</replaceable>]: ]<replaceable>&lt;lintian-tag&gt;</replaceable>[
             [*]<replaceable>&lt;lintian-info&gt;</replaceable>[*]]</literal>.  <replaceable>&lt;package&gt;</replaceable> is the package name;
-          <replaceable>&lt;archlist&gt;</replaceable> is an architecture list
-          in the same format as for the Build-Depends field (except architecture wildcards are not supported);
+          <replaceable>&lt;archlist&gt;</replaceable> is an
+          architecture list (see Architecture specific overrides for
+          more info);
           <replaceable>&lt;type&gt;</replaceable> is one of <literal>binary</literal>, <literal>udeb</literal> and
           <literal>source</literal>,
           and <replaceable>&lt;lintian-info&gt;</replaceable> is all
@@ -641,6 +642,47 @@ foo source: some-tag override without a comment
 foo source: another-tag without any comments
 </screen>
       </sect2>
+      <sect2 label="2.4.3" id="section-2.4.3">
+        <title>Architecture specific overrides</title>
+        <para>
+          In rare cases, Lintian tags may be architecture specific.
+          It is possible to mark overrides architecture specific by
+          using the optional architecture list.
+        </para>
+        <para>
+          The architecture list has the same syntax as the
+          architecture list in the "Build-Depends" field of a source
+          package. This is described in detail in the <ulink url="http://www.debian.org/doc/debian-policy/ch-relationships.html#s-depsyntax";>
+          Debian Policy Manual §7.1</ulink>.  Examples:
+        </para>
+        <screen>
+# This is an example override that only applies to the i386
+# architecture.
+foo [i386] binary: some-tag optional-extra
+
+# An architecture wildcard would look like:
+foo [any-i386] binary: another-tag optional-extra
+
+# Negation also works
+foo [!amd64 !i386] binary: some-random-tag optional-extra
+
+# Negation even works for wildcards
+foo [!any-i386] binary: some-tag-not-for-i386 optional-extra
+
+# The package name and the package type is optional, so this
+# also works
+[linux-any]: tag-only-for-linux optional-extra.
+</screen>
+        <para>
+          Support for architecture specific overrides was added in
+          Lintian 2.5.0.  Wildcard support was added in 2.5.5.  Basic
+          sanity checking was also added in 2.5.5, where unknown
+          architectures trigger
+          a <literal>malformed-override</literal> tag.  As does an
+          architecture specific override for architecture independent
+          packages.
+        </para>
+      </sect2>
     </sect1>
     <sect1 label="2.5" id="section-2.5">
       <title>Vendor Profiles</title>

-- 
Debian package checker