[SCM] Debian package checker branch, master, updated. 2.2.12-44-ga2a402c

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

The following commit has been merged in the master branch:
commit 46aade7ecf8a7680bd8910b95f7f7548241eaadf
Author: Russ Allbery <rra@debian.org>
Date:   Sun Jul 5 02:05:23 2009 -0700

    Include archive area in the HTML reports
    
    * reporting/html_reports:
      + [RA] Add the archive area to the tag information.
    * reporting/templates/maintainer.tmpl:
      + [RA] Include the archive area in the source package heading if it's
        not main.  Include the archive area in the binary package heading if
        it's different than the source package archive area.

diff --git a/debian/changelog b/debian/changelog
index 19a2edb..8d0bf92 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -106,6 +106,11 @@ lintian (2.2.13) UNRELEASED; urgency=low
     + [RA] Change area back to section in the loop for generating the
       package index pages to be consistent with the page template.
     + [RA] Allow for multiple archive areas in the front page summary.
+    + [RA] Add the archive area to the tag information.
+  * reporting/templates/maintainer.tmpl:
+    + [RA] Include the archive area in the source package heading if it's
+      not main.  Include the archive area in the binary package heading if
+      it's different than the source package archive area.
 
   * unpack/list-{bin,src,udeb}pkg:
     + [RA] Collect information from multiple archive areas and include the
diff --git a/reporting/html_reports b/reporting/html_reports
index 1993fa4..beef445 100755
--- a/reporting/html_reports
+++ b/reporting/html_reports
@@ -221,14 +221,16 @@ while (<>) {
     }
 
     # Determine the source package for this package and warn if there appears
-    # to be no source package in the archive.  Determine the maintainer and
-    # version.  Work around a missing source package by pulling information
-    # from a binary package or udeb of the same name if there is any.
-    my ($source, $version, $source_version, $maintainer, $uploaders);
+    # to be no source package in the archive.  Determine the maintainer,
+    # version, and archive area.  Work around a missing source package by
+    # pulling information from a binary package or udeb of the same name if
+    # there is any.
+    my ($source, $version, $area, $source_version, $maintainer, $uploaders);
     if ($type eq 'source') {
         $source = $package;
         if (exists $source_info{$source}) {
             $version = $source_info{$source}->{version};
+            $area = $source_info{$source}->{area};
             $maintainer = $source_info{$source}->{maintainer};
             $uploaders = $source_info{$source}->{uploaders};
         } else {
@@ -250,9 +252,11 @@ while (<>) {
         }
         if ($type eq 'binary') {
             $version = $binary_info{$package}->{version};
+            $area = $binary_info{$source}->{area};
             $source_version = $binary_info{$package}->{'source-version'};
         } elsif ($type eq 'udeb') {
             $version = $udeb_info{$package}->{version};
+            $area = $udeb_info{$source}->{area};
             $source_version = $udeb_info{$package}->{'source-version'};
         }
     }
@@ -279,6 +283,7 @@ while (<>) {
         code      => html_quote ($code),
         package   => html_quote ($package),
         version   => html_quote ($version),
+        area      => html_quote ($area),
         type      => html_quote ($type),
         tag       => html_quote ($tag),
         severity  => html_quote ($tag_extra{$tag}{severity}),
diff --git a/reporting/templates/maintainer.tmpl b/reporting/templates/maintainer.tmpl
index c0c218f..a5fd112 100644
--- a/reporting/templates/maintainer.tmpl
+++ b/reporting/templates/maintainer.tmpl
@@ -80,10 +80,11 @@
                 my $is_binary = ($info->{type} eq "binary" or $info->{type} eq "udeb");
                 my $new_binary = $info->{package} ne $binary if $is_binary;
 
+                my $area = ($data->{area} eq 'main') ? '' : "; $info->{area}";
                 if ($first) {
                     $OUT .= qq(  <div class="source-header">\n);
                     $OUT .= qq(   <h2 id="$source">);
-                    $OUT .= "$source ($version)";
+                    $OUT .= "$source ($version$area)";
                     $OUT .= " [Uploader]" if $upload;
                     $OUT .= "</h2>\n";
                     $OUT .= qq(   <p class="info-links">\n);
@@ -95,7 +96,10 @@
                 }
 
                 my $bin_version = "";
-                $bin_version = " ($info->{version})" if $info->{version} ne $version;
+                unless ($info->{version} eq $version
+                        and $info->{area} eq $data->{area}) {
+                    $bin_version = " ($info->{version}; $info->{area})";
+                }
 
                 if ($new_binary) {
                     $OUT .= "</ul>\n    </li>\n  </ul>\n" unless $first;

-- 
Debian package checker