From e09c125b0fa1af8e831c05dccc1ecce435fc36c7 Mon Sep 17 00:00:00 2001
From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Tue, 28 Oct 2008 18:42:23 +0100
Subject: [PATCH] Remove sarge

Moved to archive.d.o
---
 config.sh.sed.in                | 5 ++---
 cron.d/100syncarchive           | 2 +-
 cron.d/100syncarchive_backports | 2 +-
 cron.d/100syncarchive_volatile  | 2 +-
 lib/Packages/Dispatcher.pm      | 3 +--
 lib/Packages/Search.pm          | 2 --
 static/index.tmpl               | 3 +--
 7 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 7bdb5e6..7ff5b68 100644
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -45,14 +45,13 @@ 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 debports backports volatile"
 sections="main contrib non-free"
 parts="$sections"
-suites="sarge sarge-volatile sarge-backports etch etch-m68k etch-volatile etch-backports lenny sid experimental"
+suites="etch etch-m68k etch-volatile etch-backports lenny sid experimental"
 priorities="required important standard optional extra"
 dists="$suites"
 architectures="alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc"
-arch_sarge="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
 arch_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
 arch_lenny="${arch_etch} armel"
-arch_sid="${arch_sarge} armel hurd-i386 kfreebsd-i386 kfreebsd-amd64"
+arch_sid="${arch_lenny} hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k"
 arch_experimental="${arch_sid}"
 arch_lenny_proposed_updates="${arch_lenny}"
 arch_etch_proposed_updates="${arch_etch}"
diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index cb6f18c..35b9361 100755
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -87,7 +87,7 @@ fi
 
 # security archive
 #
-for dist in sarge etch lenny
+for dist in etch lenny
 do
     echo "retrieve Release(.gpg) $dist"
     test -d security/${dist} || mkdir -p security/${dist}
diff --git a/cron.d/100syncarchive_backports b/cron.d/100syncarchive_backports
index 84820cb..e560d85 100755
--- a/cron.d/100syncarchive_backports
+++ b/cron.d/100syncarchive_backports
@@ -7,7 +7,7 @@ cd ${archivedir}
 
 # backports archive
 #
-for dist in sarge etch
+for dist in etch
 do
   echo "retrieve Release(.gpg) $dist-backports"
   test -d backports/${dist}-backports || mkdir -p backports/${dist}-backports
diff --git a/cron.d/100syncarchive_volatile b/cron.d/100syncarchive_volatile
index 567ebfb..593cd2f 100755
--- a/cron.d/100syncarchive_volatile
+++ b/cron.d/100syncarchive_volatile
@@ -7,7 +7,7 @@ cd ${archivedir}
 
 # volatile archive
 #
-for dist in sarge etch
+for dist in etch
 do
   echo "retrieve Release(.gpg) $dist-volatile"
   test -d volatile/${dist}-volatile || mkdir -p volatile/${dist}-volatile
diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index d8b750c..e2771b9 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -64,11 +64,10 @@ sub do_dispatch {
     delete $ENV{'LC_ALL'};
     delete $ENV{'LC_MESSAGES'};
 
-    my %SUITES_ALIAS = ( oldstable => 'sarge',
+    my %SUITES_ALIAS = ( #oldstable => 'sarge',
 			 stable => 'etch',
 			 testing => 'lenny',
 			 unstable => 'sid',
-			 '3.1' => 'sarge',
 			 '4.0' => 'etch' );
 
     # Read in all the variables set by the form
diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index c33f142..12e00c3 100644
--- a/lib/Packages/Search.pm
+++ b/lib/Packages/Search.pm
@@ -103,8 +103,6 @@ sub read_entry {
 
 #FIXME: make configurable
 my %fallback_suites = (
-		       'sarge-backports' => 'sarge',
-		       'sarge-volatile' => 'sarge',
 		       'etch-backports' => 'etch',
 		       'etch-volatile' => 'etch',
 		       experimental => 'sid' );
diff --git a/static/index.tmpl b/static/index.tmpl
index 4d2b38a..df48df3 100644
--- a/static/index.tmpl
+++ b/static/index.tmpl
@@ -4,8 +4,7 @@
 	keywords = "$organisation, Packages"
 -%]
 [%-
-    all_suites = [ 'sarge', 'sarge-volatile', 'sarge-backports',
-    	       	   'etch', 'etch-m68k', 'etch-volatile', 'etch-backports',
+    all_suites = [ 'etch', 'etch-m68k', 'etch-volatile', 'etch-backports',
 		   'lenny', 'sid' ]
     version_numbers = { sarge => '3.1',
 			etch   => '4.0' }
-- 
2.39.2