From aa511b16180f384ce387125161e8a402bb90a6a2 Mon Sep 17 00:00:00 2001
From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Mon, 20 Dec 2010 01:45:22 +0100
Subject: [PATCH] [ARCHIVE] Finalize etch support

Do not yet know what I will do about etch-m68k
---
 config.sh.sed.in                     |  2 +-
 cron.d/100syncarchive                |  2 +-
 lib/Packages/Dispatcher.pm           | 13 ++++++++-----
 lib/Packages/DoSearchContents.pm     |  2 +-
 templates/config/archive_layout.tmpl |  7 -------
 templates/html/homepage.tmpl         |  2 +-
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 64de2db..b9de56a 100644
--- 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 5231508..c57a4ed 100755
--- 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 6da9b12..a76c6e1 100755
--- 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 3464394..2316706 100644
--- 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 c563e6e..100f0fc 100644
--- 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 e1d102f..b022b88 100644
--- 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' ]
-- 
2.39.2