- Fix package link code and link both packages (closes: #419553)

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 4987816f8732101885b915cf9f6d303a12ffed42..b001d91a303521539caee82d69fa78987f0905db 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -431,7 +431,7 @@ sub handle_record{
                      {(defined $2?$1.bug_links($2):'').$3.
                            join(' ',map {bug_links($_)} (split /\,?\s+/, $4))}eo;
          # Add links to reassigned packages
-         $output =~ s{(Bug reassigned from package \`)([^\']+)(' to \`)([^\']+)(')}
+         $output =~ s{(Bug reassigned from package \`)([^']+)((?:'|\&\#39;) to \`)([^']+)((?:'|\&\#39;))}
          {$1.q(<a href=").pkg_url(pkg=>$2).qq(">$2</a>).$3.q(<a href=").pkg_url(pkg=>$4).qq(">$4</a>).$5}eo;
          if (defined $time) {
               $output .= ' ('.strftime('%a, %d %b %Y %T GMT',gmtime($time)).') ';

diff --git a/debian/changelog b/debian/changelog
index 4f0e3b5a29a3af5aa2ce2a73b79a907484f5929c..87bb5b8cdbe0cbad00c342cb00613adfbb3aec5e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -169,6 +169,7 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Add quotes around retitle'd titles (closes: #419202)
     - Make file locking portable (closes: #293277)
     - Allow the package pages to be optional (closes: #234362)
+    - Fix package link code and link both packages (closes: #419553)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100