Merge commit 'origin/master' into archive-master

diff --git a/lib/Deb/Versions.pm b/lib/Deb/Versions.pm
index 606f75301335ec332d77943dd2a963d67114ddd8..eb83819b7e4794ab4efa0c40357dbbb304b9a9f9 100644 (file)
--- a/lib/Deb/Versions.pm
+++ b/lib/Deb/Versions.pm
@@ -156,7 +156,7 @@ our @SUITES_SORT = qw( bo hamm slink potato woody
                       oldstable sarge stable stable-proposed-updates
                       etch etch-m68k testing testing-proposed-updates lenny
                       sid unstable experimental
-                      warty hoary breezy breezy dapper edgy feisty gutsy );
+                      warty hoary breezy dapper edgy feisty gutsy intrepid jaunty);
 our @ARCHIVE_SORT = qw( non-US security updates volatile backports );
 our @PRIORITY_SORT = qw( required important standard optional extra );
 my $i = 1000;

diff --git a/static/index.tmpl b/static/index.tmpl
index 9766ffdba8dbb2c24dc2786eb191d346e3d36f2b..69a5a539b0e2e77193b66a9a279a044666432510 100644 (file)
--- a/static/index.tmpl
+++ b/static/index.tmpl
@@ -85,7 +85,7 @@ Section:
 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.
-<BR>
+<br>
 <form method="GET" action="/search">
 <input type="hidden" name="searchon" value="contents">
 
@@ -105,7 +105,7 @@ Display:
 <br>
 <input type="radio" name="mode" value="filename" id="filename">
   <label for="filename">packages that contain files whose names contain the keyword</label>
-
+<br>
 <label for="distro">Distribution:</label>
 
 <select name="suite" id="distro">
@@ -124,4 +124,4 @@ Display:
 
 [% PROCESS 'html/foot.tmpl'
        langs.size = 0
-       copyright.years = '1997 - 2007' %]
+       copyright.years = '1997 - 2008' %]