X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=templates%2Fhtml%2Fhomepage.tmpl;h=17ae8728616c52a6b37963f6a89fd1e7ae6a305b;hb=2b5f96ff935a1ee866f76d6d35f48e9f2393a622;hp=61543f40d0082104b921d6a1eb0f2ae539a2acfc;hpb=736a2217aaba77abed998a28be454c36816731dc;p=deb%2Fpackages.git

diff --git a/templates/html/homepage.tmpl b/templates/html/homepage.tmpl
index 61543f4..17ae872 100644
--- a/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@ -7,19 +7,18 @@
 [%-
     all_suites = [ 'dapper', 'dapper-updates', 'dapper-backports',
 		   'hardy', 'hardy-updates', 'hardy-backports',
-		   'intrepid', 'intrepid-updates', 'intrepid-backports',
 		   'jaunty', 'jaunty-updates', 'jaunty-backports',
 		   'karmic', 'karmic-updates', 'karmic-backports',
 		   'lucid', 'lucid-updates', 'lucid-backports',
-		   'maverick' ]
+		   'maverick', 'maverick-updates', 'maverick-backports',
+		   'natty' ]
     version_numbers = { dapper => '6.06LTS',
 			hardy  => '8.04LTS',
-			intrepid => '8.10',
-			jaunty => '9.04',
 			karmic => '9.10',
-			lucid => '10.04LTS',
+			lucid  => '10.04LTS',
+			maverick => '10.10',
 		      }
-    current_release = 'lucid'
+    current_release = 'maverick'
     all_sections = [ 'main', 'multiverse', 'restricted', 'universe' ]
     all_architectures = [ 'i386', 'amd64', 'powerpc' ]
 -%]
@@ -48,6 +47,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') %]">
@@ -77,6 +77,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>
@@ -90,6 +91,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>
@@ -123,13 +125,16 @@ Distribution:
 [% END %]
   <option value="any" selected="selected">[% g('any') %]</option>
 </select>
+</p>
 </form>
 
 <hr>
 <h2>News</h2>
 <dl>
+<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.</dd>
+<dd>Reflect lucid release, add maverick, remove intrepid.</dd>
 <dt>2009-10-30</dt>
 <dd>Reflect karmic release, add lucid.</dd>
 <dt>2009-04-24</dt>
@@ -147,7 +152,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
@@ -327,7 +332,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
@@ -341,4 +346,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 - 2010' %]