- Fix casing of versions (closes: #441022)

  - Output last-modified in bugreport.cgi (closes: #459709)
  - Fix various html syntax errors in pkgreport.cgi (closes: #462322)

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index b86a6883f72d9e8c7500e038ab18b1725fbb047a..7489f985674053461d5804a11d39dd913f7b4931 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -586,7 +586,15 @@ else {
 $log = join("\n",@log);
 
 
-print "Content-Type: text/html; charset=utf-8\n\n";
+print "Content-Type: text/html; charset=utf-8\n";
+
+my @stat = stat $buglog;
+if (@stat) {
+     my $mtime = strftime '%a, %d %b %Y %T GMT', gmtime($stat[9]);
+     print "Last-Modified: $mtime\n";
+}
+
+print "\n";
 
 my $title = html_escape($status{subject});
 

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index c07bf78a1b8eb7256544de604345d75ea668e2b7..1af5b038f30621d0245c394a30b502efa2490b94 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -571,7 +571,6 @@ print <<EOF;
 
 <tr><td>&nbsp;</td></tr>
 
-</td></tr>
 <tr><td>Merged bugs should be</td><td>
 <select name=repeatmerged>
 <option value=yes$sel_rmy>displayed separately</option>
@@ -825,7 +824,7 @@ sub pkg_htmlizebugs {
     if ($ordering eq "raw") {
         $result .= "<UL class=\"bugs\">\n" . join("", map( { $_->[ 2 ] } @status ) ) . "</UL>\n";
     } else {
-        $header .= "<ul>\n<div class=\"msgreceived\">\n";
+        $header .= "<div class=\"msgreceived\">\n<ul>\n";
        my @keys_in_order = ("");
        for my $o (@order) {
            push @keys_in_order, "X";
@@ -866,7 +865,7 @@ sub pkg_htmlizebugs {
         } 
         $header .= "</ul></div>\n";
 
-        $footer .= "<ul>\n<div class=\"msgreceived\">";
+        $footer .= "<div class=\"msgreceived\">\n<ul>\n";
         for my $i (0..$#prior) {
             my $local_result = '';
             foreach my $key ( @{$order[$i]} ) {
@@ -878,7 +877,7 @@ sub pkg_htmlizebugs {
                 $footer .= "<li>$names[$i]<ul>\n$local_result</ul></li>\n";
             }
         }
-        $footer .= "</div></ul>\n";
+        $footer .= "</ul>\n</div>\n";
     }
 
     $result = $header . $result if ( $common{show_list_header} );

diff --git a/debian/changelog b/debian/changelog
index 4788af377588535614b6b2c9a0ed9a255ceb54ec..97f5489a97b04bbe7a8eadde1ddeda496287ea9c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -206,6 +206,9 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Verify submitter is a valid email according to RFC822
       (closes: #182419)
     - Indicate what message number a message is (closes: #462653)
+    - Fix casing of versions (closes: #441022)
+    - Output last-modified in bugreport.cgi (closes: #459709)
+    - Fix various html syntax errors in pkgreport.cgi (closes: #462322)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100