merge back in source merges to fix the broken repository

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 4dbd04dc667383605d7088d9f8a82a9264acd5c8..569bd5c7e4f55a2d38eedb2197cb501ae7df8b60 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -1015,9 +1015,9 @@ sub buglinklist {
 # sets: my @names; my @prior; my @title; my @order;
 
 sub determine_ordering {
-    $cats{"status"}->{"ord"} = [ reverse @{$cats{"status"}->{"ord"}} ]
+    $cats{status}[0]{ord} = [ reverse @{$cats{status}[0]{ord}} ]
         if ($pend_rev);
-    $cats{"severity"}->{"ord"} = [ reverse @{$cats{"severity"}->{"ord"}} ]
+    $cats{severity}[0]{ord} = [ reverse @{$cats{severity}[0]{ord}} ]
         if ($sev_rev);
 
     if (defined $param{"pri0"}) {
@@ -1083,7 +1083,9 @@ sub determine_ordering {
             push @order, [ 0..$#{$prior[-1]} ];
         }
         my @t = @{ $c->{"ttl"} } if defined $c->{ttl};
-        push @t, map { toenglish($prior[-1]->[$_]) } ($#t+1)..($#{$prior[-1]});
+       if (($#t+1) < $#{$prior[-1]}) {
+            push @t, map { toenglish($prior[-1]->[$_]) } ($#t+1)..($#{$prior[-1]});
+       }
        push @t, $c->{"def"} || "";
         push @title, [@t];
     }

diff --git a/debian/changelog b/debian/changelog
index 91b999214c0ba89cb7b71b96d76a7de455ec0f53..7929ba2e6ba1c9a137a492c5cfe9f5da8b37b975 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -113,11 +113,13 @@ debbugs (2.4.2) UNRELEASED; urgency=low
       UTF8 material. (closes: #364026)
     - Add links to Closes: text for closed bugs. (closes: #320986)
     - Add X-$gProject-PR-Source: line (closes: #219230)
+    - Use the %cats data structure properly in pkgreport.cgi
+      (closes: #367514)  
     - Document nnn.*@foobar addresses (closes: #188670)
     - Support cloned bugs in control blocking (closes: #337329)
     - Indicate which bugs are blocked after blocking (closes: #367496)
     - Obey package for usertags (closes: #376528)
-  
+
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100