[SCM] Debian package checker branch, master, updated. 2.3.0-2-g790a13f

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

The following commit has been merged in the master branch:
commit 790a13f8427525bbf795e8a5a45dfd2ae40d2366
Author: Russ Allbery <rra@debian.org>
Date:   Sat Dec 26 23:06:45 2009 -0800

    Fix the area reporting logic in the HTML reports
    
    * reporting/templates/maintainer.tmpl:
      + [RA] Fix the logic to optionally display the archive area of
        additional package entries under the same source package.

diff --git a/debian/changelog b/debian/changelog
index b7b809d..34332f8 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lintian (2.3.1) UNRELEASED; urgency=low
+
+  * reporting/templates/maintainer.tmpl:
+    + [RA] Fix the logic to optionally display the archive area of
+      additional package entries under the same source package.
+
+ -- Russ Allbery <rra@debian.org>  Sat, 26 Dec 2009 23:05:35 -0800
+
 lintian (2.3.0) unstable; urgency=low
 
   The "welcome Raphael Geissert!" release.
diff --git a/reporting/templates/maintainer.tmpl b/reporting/templates/maintainer.tmpl
index a5fd112..0cf8e79 100644
--- a/reporting/templates/maintainer.tmpl
+++ b/reporting/templates/maintainer.tmpl
@@ -72,6 +72,7 @@
             my $first = 1;
             my $binary = '';
             my $tag = '';
+            my $firstarea = '';
             for my $info (@$tags) {
                 if ($errors) {
                     next unless $info->{code} eq 'E' or $info->{code} eq 'W';
@@ -80,7 +81,8 @@
                 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}";
+                my $area = ($info->{area} eq 'main') ? '' : "; $info->{area}";
+                $firstarea = $info->{area} unless $firstarea;
                 if ($first) {
                     $OUT .= qq(  <div class="source-header">\n);
                     $OUT .= qq(   <h2 id="$source">);
@@ -95,9 +97,9 @@
                     $OUT .= qq(  <ul class="report">\n) unless $is_binary;
                 }
 
-                my $bin_version = "";
+                my $bin_version = '';
                 unless ($info->{version} eq $version
-                        and $info->{area} eq $data->{area}) {
+                        and $info->{area} eq $firstarea) {
                     $bin_version = " ($info->{version}; $info->{area})";
                 }
 

-- 
Debian package checker