[SCM] Debian package checker branch, master, updated. 2.1.6-39-g33c0632

["Russ Allbery" <rra@debian.org>]

The following commit has been merged in the master branch:
commit 33c06329595dd414cff930688592dc186c699016
Author: Russ Allbery <rra@debian.org>
Date:   Sat Jan 24 16:21:54 2009 -0800

    Add support for a tag index sorted by severity and certainty
    
    * reporting/html_reports:
      + [RA] Add support for a new tag index sorted by severity and
        certainty.  (Closes: #511496)
    * reporting/templates/index.tmpl:
      + [RA] Link to the new tag index.
    * reporting/templates/tags-severity.tmpl:
      + [RA] Template for a tag index sorted by severity and certainty.

diff --git a/debian/changelog b/debian/changelog
index 82c9a4e..7895bb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -85,6 +85,14 @@ lintian (2.2.0) UNRELEASED; urgency=low
   * man/lintian.1:
     + [RA] Document the new --pedantic option.
 
+  * reporting/html_reports:
+    + [RA] Add support for a new tag index sorted by severity and
+      certainty.  (Closes: #511496)
+  * reporting/templates/index.tmpl:
+    + [RA] Link to the new tag index.
+  * reporting/templates/tags-severity.tmpl:
+    + [RA] Template for a tag index sorted by severity and certainty.
+
   * t/runtests:
     + [RA] Add support for specifying the Lintian options to use when
       checking a test package.  Patch from Raphael Geissert.
diff --git a/reporting/html_reports b/reporting/html_reports
index 400247c..818bfc6 100755
--- a/reporting/html_reports
+++ b/reporting/html_reports
@@ -101,7 +101,8 @@ our $TEMPLATES = "$LINTIAN_ROOT/reporting/templates";
 # This only has to be done once, so do it at the start and then reuse the same
 # templates throughout.
 our %templates;
-for my $template (qw/head foot clean index maintainer maintainers packages tag tags/) {
+for my $template (qw/head foot clean index maintainer maintainers packages tag
+                     tags tags-severity/) {
     my %options = (TYPE => 'FILE', SOURCE => "$TEMPLATES/$template.tmpl");
     $templates{$template} = Text::Template->new (%options)
         or die "cannot load template $template: $Text::Template::ERROR\n";
@@ -449,11 +450,12 @@ for my $tag (sort keys %by_tag) {
     output_template ("tags/$tag.html", $templates{tag}, \%data);
 }
 
-# Create the general tag index.
+# Create the general tag indices.
 %data = (
     tags      => \%by_tag,
 );
 output_template ('tags.html', $templates{tags}, \%data);
+output_template ('tags-severity.html', $templates{'tags-severity'}, \%data);
 
 # Generate the package lists.  These are huge, so we break them into four
 # separate pages.
diff --git a/reporting/templates/index.tmpl b/reporting/templates/index.tmpl
index f65e52b..b3ed01a 100644
--- a/reporting/templates/index.tmpl
+++ b/reporting/templates/index.tmpl
@@ -27,7 +27,8 @@
 
     <ul>
       <li><a href="maintainers.html">Maintainers</a></li>
-      <li><a href="tags.html">Tag types</a></li>
+      <li><a href="tags.html">Tags sorted alphabetically</a></li>
+      <li><a href="tags-severity.html">Tags by severity and certainty</a></li>
       <li>Packages that have names starting with:
         <ul>
           <li><a href="packages_1.html">0-9, A-F</a></li>
diff --git a/reporting/templates/tags-severity.tmpl b/reporting/templates/tags-severity.tmpl
new file mode 100644
index 0000000..d19415a
--- /dev/null
+++ b/reporting/templates/tags-severity.tmpl
@@ -0,0 +1,46 @@
+{ head("Lintian Tags") }
+  <h1>Tags</h1>
+
+  <p>
+    This is a list of all tags that occur at least once in the archive
+    sorted by severity and then by certainty.  This includes all tags,
+    even experimental and info tags.
+  </p>
+
+{
+    my @tags = sort keys %tags;
+    for my $severity (qw/serious important normal minor wishlist/) {
+        for my $certainty (qw/certain possible wild-guess/) {
+            my $heading = 0;
+            for my $tag (@tags) {
+                my ($first) = @{ $tags{$tag} };
+                next unless $first->{severity} eq $severity;
+                next unless $first->{certainty} eq $certainty;
+                my ($count, $overrides) = (0, 0);
+                my %seen;
+                for my $info (@{ $tags{$tag} }) {
+                    if ($info->{code} eq 'O') {
+                        $overrides++;
+                    } else {
+                        $count++;
+                        $seen{$info->{xref}}++;
+                    }
+                }
+                my $packages = scalar keys %seen;
+                unless ($heading) {
+                    $OUT .= "  <h2>Severity: $severity,";
+                    $OUT .= " Certainty: $certainty</h2>\n\n";
+                    $OUT .= "  <ul>\n";
+                    $heading = 1;
+                }
+                $OUT .= qq(    <li><a href="tags/$tag.html">$tag</a>)
+                    . " ($packages packages, $count tags, plus $overrides"
+                    . " overrides)</li>\n";
+            }
+            if ($heading) {
+                $OUT .= "  </ul>\n\n";
+            }
+        }
+    }
+}
+{ foot() }

-- 
Debian package checker