Merge branch 'archive-master' of git+ssh://git.debian.org/git/webwml/packages into...

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 64de2db1bccac3f2c34d56177ef3e34afb700411..b9de56ad9482ae87993202ad9a483b2bcaecebc4 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -45,7 +45,7 @@ ddtplangs="ca cs da de eo es eu fi fr hu it ja km ko nl pl pt pt-br ru sk sv uk
 archives="us security backports volatile"
 sections="main contrib non-free"
 parts="$sections"
-suites="bo hamm slink potato woody sarge sarge-volatile sarge-backports etch etch-volatile etch-backports etch-m68k"
+suites="bo hamm slink potato woody sarge sarge-volatile sarge-backports etch etch-volatile etch-backports"
 priorities="required important standard optional extra"
 dists="$suites"
 architectures="alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"

diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index 52315086caf915ea62a04bb1b84c2e0a10f1d863..c57a4ed156bf20656221411bd7149996967b7b64 100755 (executable)
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -81,7 +81,7 @@ fi
 
 # security archive
 #
-for dist in slink potato woody sarge
+for dist in slink potato woody sarge etch
 do
     echo "retrieve Release(.gpg) $dist"
     test -d security/${dist} || mkdir -p security/${dist}

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 6da9b12d8a24ab0b28f9824e591e65ef5fc4e05f..a76c6e11201e76f5d33e258b4e8a910d87bca273 100755 (executable)
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -64,12 +64,15 @@ sub do_dispatch {
     delete $ENV{'LC_ALL'};
     delete $ENV{'LC_MESSAGES'};
 
-    my %SUITES_ALIAS = ( oldstable => 'etch',
-                        stable => 'lenny',
-                        testing => 'squeeze',
-                        unstable => 'sid',
+    my %SUITES_ALIAS = (
                         '4.0' => 'etch',
-                        '5.0' => 'lenny' );
+                        '3.1' => 'sarge',
+                        '3.0' => 'woody',
+                        '2.2' => 'potato',
+                        '2.1' => 'slink',
+                        '2.0' => 'hamm',
+                       '1.3.1' => 'bo', 
+                );
 
     # Read in all the variables set by the form
     my $input;

diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm
index 34643949f69a66bfd221d2138effc07510a6476c..2316706f6bbf2c5b29738f43e755518cc9e4ffb6 100644 (file)
--- a/lib/Packages/DoSearchContents.pm
+++ b/lib/Packages/DoSearchContents.pm
@@ -33,7 +33,7 @@ sub do_search_contents {
     #FIXME: that's extremely hacky atm
     if ($params->{values}{suite}{no_replace}[0] eq 'default') {
        $params->{values}{suite}{no_replace} =
-           $params->{values}{suite}{final} = $opts->{suite} = [ 'sarge' ];
+           $params->{values}{suite}{final} = $opts->{suite} = [ 'etch' ];
     }
 
     if (@{$opts->{suite}} > 1) {

diff --git a/templates/config/archive_layout.tmpl b/templates/config/archive_layout.tmpl
index c563e6e3386ee8971711ce1d5eb98727c7c46327..100f0fcf75f88ca74c8f18d4f8936ef0aeab1e26 100644 (file)
--- a/templates/config/archive_layout.tmpl
+++ b/templates/config/archive_layout.tmpl
@@ -3,13 +3,6 @@
    main_archive = 'us'
    standard_priority = 'optional'
 
-   suite_aliases = {
-               etch => 'oldstable', 
-               lenny => 'stable',
-               squeeze => 'testing',
-               sid => 'unstable',
-                  }
-
    section_titles = {
                 main => g('packages that meet the Debian Free Software Guidelines'),
                 contrib => g('packages that meet the Debian Free Software Guidelines but need software not in Debian main'),

diff --git a/templates/html/homepage.tmpl b/templates/html/homepage.tmpl
index 4befa4fc9a36ede73961c45342e30838b7df3a21..0ea68ca008172ccf6208a25230ebf115e1cc8e6e 100644 (file)
--- a/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@ -12,7 +12,7 @@
                        slink  => '2.1',
                        hamm   => '2.0',
                        bo     => '1.3.1'}
-    current_release = 'sarge'
+    current_release = 'etch'
     all_sections = [ 'main', 'contrib', 'non-free' ]
     all_architectures = [ 'alpha', 'amd64', 'arm', 'hppa', 'i386', 'ia64',
                          'mips', 'mipsel', 'powerpc', 's390', 'sparc' ]