X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=templates%2Fhtml%2Fhomepage.tmpl;h=291fc957adb087f3c68954765866e5c751682b77;hb=56ba156255307e6b0f02833198994a144a25c1ee;hp=62b4716a63f716d72ae204dfe028cdb2913da526;hpb=de1cc91a20058c703659f82b5eb0105ed2e3e34c;p=deb%2Fpackages.git

diff --git a/templates/html/homepage.tmpl b/templates/html/homepage.tmpl
index 62b4716..291fc95 100644
--- a/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@ -7,17 +7,17 @@
 [%-
     all_suites = [ 'dapper', 'dapper-updates', 'dapper-backports',
 		   'hardy', 'hardy-updates', 'hardy-backports',
-		   'jaunty', 'jaunty-updates', 'jaunty-backports',
-		   'karmic', 'karmic-updates', 'karmic-backports',
 		   'lucid', 'lucid-updates', 'lucid-backports',
-		   'maverick' ]
+		   'maverick', 'maverick-updates', 'maverick-backports',
+		   'natty', 'natty-updates', 'natty-backports',
+		   'oneiric' ]
     version_numbers = { dapper => '6.06LTS',
 			hardy  => '8.04LTS',
-			jaunty => '9.04',
-			karmic => '9.10',
-			lucid => '10.04LTS',
+			lucid  => '10.04LTS',
+			maverick => '10.10',
+			natty => '11.04',
 		      }
-    current_release = 'lucid'
+    current_release = 'natty'
     all_sections = [ 'main', 'multiverse', 'restricted', 'universe' ]
     all_architectures = [ 'i386', 'amd64', 'powerpc' ]
 -%]
@@ -46,6 +46,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') %]">
@@ -75,6 +76,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>
@@ -88,6 +90,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>
@@ -121,11 +124,16 @@ Distribution:
 [% END %]
   <option value="any" selected="selected">[% g('any') %]</option>
 </select>
+</p>
 </form>
 
 <hr>
 <h2>News</h2>
 <dl>
+<dt>2011-04-28</dt>
+<dd>Reflect natty release, add natty, remove karmic.</dd>
+<dt>2010-10-10</dt>
+<dd>Reflect maverick release, add maverick, remove jaunty.</dd>
 <dt>2010-05-05</dt>
 <dd>Reflect lucid release, add maverick, remove intrepid.</dd>
 <dt>2009-10-30</dt>
@@ -145,7 +153,7 @@ Distribution:
 <dt>2008-04-28</dt>
 <dd>
 <p>Added intrepid</p>
-</dt>
+</dd>
 <dt>2008-04-26</dt>
 <dd>
 <p>Adapted for hardy release. Removed the obsolete powerpc data for hardy. I'm currently evaluation if and how I should
@@ -325,7 +333,7 @@ these pages.</li>
 </dd>
 <dt>2005-03-02</dt>
 <dd>I talked briefly with Daniel Silverstone of Canonical at
-<a href="http:://www.fosdem.org">FOSDEM</a>. He said that Ubuntu
+<a href="http://www.fosdem.org/">FOSDEM</a>. He said that Ubuntu
 will get his own Packages page, but <q>It will be a while</q>.</dd>
 <dt>2005-01-24</dt>
 <dd>In the last two days there were several reboots of the server
@@ -339,4 +347,4 @@ may be missing for some packages since I can only mirror the
 i386 and powerpc debs due to space constraints)</dd>
 </dl>
 
-[% PROCESS 'html/foot.tmpl' page_name=packages_homepage copyright.years = '1997 - 2009' %]
+[% PROCESS 'html/foot.tmpl' page_name=packages_homepage copyright.years = '1997 - 2011' %]