[SCM] Debian package checker branch, master, updated. 2.5.0-55-gcf2066b

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

The following commit has been merged in the master branch:
commit cf2066b89daeb72676f63a1ef6a6fe601c1ea70f
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Jun 4 15:17:54 2011 +0200

    Clarify that pkg type is not emitted for binary packages
    
    Also emit check name and type with lintian -i or lintian-info to
    help people see, where the override belongs.

diff --git a/debian/changelog b/debian/changelog
index b3e4c87..040d18e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -102,6 +102,10 @@ lintian (2.5.1) UNRELEASED; urgency=low
       - Explicitly depends on bzip2 to always support bz2 source packages.
       - Added xz-utils as suggests - needed for .xz source packages.
 
+  * doc/lintian.xml:
+    + [NT] Clarify that the package type is not listed in the output for
+      binary packages.  (Closes: #629193)
+
   * frontend/lintian:
     + [NT] Allow some options to be put into the lintianrc file.
       (Closes: #460350)
@@ -115,6 +119,9 @@ lintian (2.5.1) UNRELEASED; urgency=low
       available.  Thanks to Toby Corkindale for the report.
       (Closes: #630560, LP: #797553)
 
+  * lib/Lintian/Tag/Info.pm:
+    + [NT] Output the name of the check and the type of the check
+      along with the description of the tag.
   * lib/Lintian/Tags.pm:
     + [NT] Fixed a flaw in logic that gave incorrect results for
       architecture dependent overrides.  Thanks to Andreas Beckmann for
diff --git a/doc/lintian.xml b/doc/lintian.xml
index 5bbc311..7d479d5 100644
--- a/doc/lintian.xml
+++ b/doc/lintian.xml
@@ -401,13 +401,11 @@ $
         </varlistentry>
       </variablelist>
       <para>
-        The following parameters after the type indicator tell you about the
-        <emphasis>package</emphasis> that has been processed (this can
-        either be a binary or a source package) and about
-        the <emphasis>problem</emphasis> that has been discovered. The
-        problem is identified by a so-called <emphasis>tag</emphasis>
-        (for
-        example, <literal>old-fsf-address-in-copyright-file</literal>).
+        The type indicator is followed by the name of the package and
+        for non-binary packages the type of the package.  Then comes
+        the <emphasis>problem</emphasis> that was discovered, also
+        known as a <emphasis>tag</emphasis> (for example,
+        <literal>old-fsf-address-in-copyright-file</literal>).
       </para>
       <para>
         Depending on which tag has been reported, the line may contain
diff --git a/lib/Lintian/Tag/Info.pm b/lib/Lintian/Tag/Info.pm
index 95bc360..405e75c 100644
--- a/lib/Lintian/Tag/Info.pm
+++ b/lib/Lintian/Tag/Info.pm
@@ -105,6 +105,7 @@ sub _load_tag_data {
             }
             $tag->{info} = '' unless exists($tag->{info});
             $tag->{script} = $header->{'check-script'};
+            $tag->{'script-type'} = $header->{'type'};
             $INFO{$tag->{tag}} = $tag;
         }
     }
@@ -281,6 +282,11 @@ sub description {
         my $certainty = $self->{certainty};
         push(@text, '', "Severity: $severity, Certainty: $certainty");
     }
+    if ($self->{script} and $self->{'script-type'}){
+        my $script = $self->{script};
+        my $stype = $self->{'script-type'};
+        push(@text, '', "Check: $script, Type: $stype");
+    }
     if ($self->{experimental}) {
         push(@text, '',
              'This tag is marked experimental, which means that the code that'

-- 
Debian package checker