Merge commit 'local/master' into ubuntu-master

Conflicts:
	lib/Deb/Versions.pm

diff --git a/lib/Deb/Versions.pm b/lib/Deb/Versions.pm
index 141c3cd095ccb58f45b7f2fe0f7d7782f6485672..ba9df21b193eeb2b7cb983e235828209db9bb026 100644 (file)
--- a/lib/Deb/Versions.pm
+++ b/lib/Deb/Versions.pm
@@ -155,7 +155,7 @@ sub _lcmp {
 our @SUITES_SORT = qw( 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 hardy intrepid );
+                      warty hoary breezy dapper edgy feisty gutsy hardy intrepid jaunty);
 our @ARCHIVE_SORT = qw( non-US security updates volatile backports );
 our @PRIORITY_SORT = qw( required important standard optional extra );
 my $i = 1000;
@@ -176,11 +176,11 @@ sub suites_cmp {
        $cmp_b = $suites_sort{$1} - $archive_sort{$2}
        if $s_b =~ m;^(.+?)[/-](.*)$;o;
     }
-    return ($cmp_a <=> $cmp_b);
+    return ($cmp_b <=> $cmp_a);
 }
 
 sub suites_sort {
-    return sort { suites_cmp( $b, $a ) } @_;
+    return sort { suites_cmp( $a, $b ) } @_;
 }
 
 sub priority_cmp {

diff --git a/lib/Packages/I18N/Languages.pm b/lib/Packages/I18N/Languages.pm
index 317f9c3f19f12d60389fd2989c776fdc9b60c5aa..1ab8f489f6ff3704c788296c84de8fa215144bcb 100644 (file)
--- a/lib/Packages/I18N/Languages.pm
+++ b/lib/Packages/I18N/Languages.pm
@@ -10,42 +10,6 @@ use Exporter;
 our @ISA = qw( Exporter );
 our @EXPORT = qw( langcmp get_transliteration get_selfname );
 
-# language directory name => ISO 639 two-letter code for the language name
-my %langs = (
-            english    => "en",
-            arabic     => "ar",
-            armenian   => "hy",
-            bulgarian  => "bg",
-            catalan    => "ca",
-            chinese    => "zh",
-            croatian   => "hr",
-            czech      => "cs",
-            danish     => "da",
-            dutch      => "nl",
-            german     => "de",
-            greek      => "el",
-            esperanto  => "eo",
-            spanish    => "es",
-            finnish    => "fi",
-            french     => "fr",
-            hungarian  => "hu",
-            indonesian => "id",
-            italian    => "it",
-            japanese   => "ja",
-            korean     => "ko",
-            lithuanian => "lt",
-            norwegian  => "no",
-            persian    => "fa",
-            polish     => "pl",
-            portuguese => "pt",
-            romanian   => "ro",
-            russian    => "ru",
-            swedish    => "sv",
-            slovene    => "sl",
-            slovak     => "sk",
-            turkish    => "tr",
-            );
-
 # language directory name => native name of the language
 # non-ASCII letters must be escaped (using entities)!
 my %selflang = (

diff --git a/static/index.tmpl b/static/index.tmpl
index 0b718e42039548147a38956048b9223dd21c989b..60bb1fec1405d570f834c9f70b3b3459a94d6957 100644 (file)
--- a/static/index.tmpl
+++ b/static/index.tmpl
@@ -92,7 +92,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">
 
@@ -112,7 +112,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">
@@ -339,4 +339,4 @@ i386 and powerpc debs due to space constraints)</dd>
 
 [% PROCESS 'html/foot.tmpl'
        langs.size = 0
-       copyright.years = '1997 - 2007' %]
+       copyright.years = '1997 - 2008' %]