From: Gerfried Fuchs <rhonda@debian.org>
Date: Tue, 28 Jun 2011 05:58:21 +0000 (+0200)
Subject: Merge branch 'master' into debian-master
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=d69d096d829d1b838cef806eb5280143ad737953;hp=-c;p=deb%2Fpackages.git

Merge branch 'master' into debian-master
---

d69d096d829d1b838cef806eb5280143ad737953
diff --combined lib/Parse/DebianChangelog/ChangesFilters.pm
index 4dfab20,6e5da9c..835ee06
--- a/lib/Parse/DebianChangelog/ChangesFilters.pm
+++ b/lib/Parse/DebianChangelog/ChangesFilters.pm
@@@ -90,7 -90,7 +90,7 @@@ sub email_to_ddpo 
  }
  
  sub bugs_to_bts {
-     (my $text = $_[0]) =~ s|Closes:\s*(?:Bug)?\#\d+(?:\s*,\s*(?:Bug)?\#\d+)*
+     (my $text = $_[0]) =~ s|closes:\s*(?:bug)?\#?\s?\d+(?:\s*,\s*(?:bug)?\#?\s?\d+)*
  	|my $tmp = $&; { no warnings;
  			 $tmp =~ s@(Bug)?\#(\d+)@<a class="buglink" href="http://bugs.debian.org/$2">$1\#$2</a>@ig; }
      "$tmp"
@@@ -102,7 -102,7 +102,7 @@@ sub cve_to_mitre 
      my ($text, $cgi) = @_;
  
      $text =~ s!\b(?:CVE|CAN)-\d{4}-\d{4}\b
 -        !$cgi->a({ -href=>"http://cve.mitre.org/cgi-bin/cvename.cgi?name=$&" }, $&)
 +        !$cgi->a({ -href=>"http://security-tracker.debian.org/tracker/$&" }, $&)
  	!xego;
      return $text;
  }