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

diff --git a/lib/Parse/DebianChangelog/ChangesFilters.pm b/lib/Parse/DebianChangelog/ChangesFilters.pm
index 8434770c704a213cd9139c16f1bbbf6eec5428bb..4dfab20593870fdb01b1cae9c24b6a697e2ce169 100644 (file)
--- a/lib/Parse/DebianChangelog/ChangesFilters.pm
+++ b/lib/Parse/DebianChangelog/ChangesFilters.pm
@@ -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;
 }

diff --git a/static/favicon.ico b/static/favicon.ico
new file mode 100644 (file)
index 0000000..8f4e75c
Binary files /dev/null and b/static/favicon.ico differ

diff --git a/templates/html/homepage.tmpl b/templates/html/homepage.tmpl
index 6daeaf8e7531eb266162263d4ef417a798d94023..c40310d5f6d1f1bade4c8fb804e5fd4d792002a9 100644 (file)
--- a/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@ -40,6 +40,7 @@
 <h3>[% g('Search package directories') %]</h3>
 
 <form method="GET" action="/search">
+<p>
 <label for="kw">[% g('Keyword:') %]</label>
 <input type="text" size="30" name="keywords" id="kw">
 <input type="submit" value="[% g('Search') %]"> <input type="reset" value="[% g('Reset') %]">
@@ -69,6 +70,7 @@ Distribution:
 [% END %]
   <option value="all" selected="selected">[% g('any') %]</option>
 </select>
+</p>
 </form>
 <p>[% g('There are shortcuts for some searches available:') %]</p>
 <ul>
@@ -82,6 +84,7 @@ Distribution:
 
 <p>[% g('This search engine allows you to search the contents of %s distributions for any files (or just parts of file names) that are part of packages. You can also get a full list of files in a given package.', organisation) %]<br>
 <form method="GET" action="/search">
+<p>
 <input type="hidden" name="searchon" value="contents">
 
 <label for="keyword">[% g('Keyword:') %]</label>
@@ -115,6 +118,7 @@ Distribution:
 [% END %]
   <option value="any" selected="selected">[% g('any') %]</option>
 </select>
+</p>
 </form>
 
 [% PROCESS 'html/foot.tmpl' page_name=packages_homepage copyright.years = '1997 - 2010' %]