From a8215a3ee26f8ecc1c7e20cc3a8395354f6843d1 Mon Sep 17 00:00:00 2001
From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Tue, 10 Jun 2008 22:19:55 +0100
Subject: [PATCH] [UBUNTU] Remove edgy

---
 config.sh.sed.in  | 7 ++-----
 static/index.tmpl | 6 ++++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 2eb47b7..48dd533 100644
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -42,17 +42,14 @@ ddtplangs="ca cs da de eo es fi fr hu it ja ko nl pl pt pt-br ru sk sv uk zh-cn
 archives="us security"
 sections="main multiverse restricted universe"
 parts="$sections"
-suites="dapper dapper-updates dapper-backports edgy edgy-updates edgy-backports feisty feisty-updates feisty-backports gutsy gutsy-updates gutsy-backports hardy hardy-updates hardy-backports intrepid"
+suites="dapper dapper-updates dapper-backports feisty feisty-updates feisty-backports gutsy gutsy-updates gutsy-backports hardy hardy-updates hardy-backports intrepid"
 dists="$suites"
 priorities="required important standard optional extra"
 architectures="i386 amd64 powerpc"
 arch_dapper="i386 amd64 powerpc"
 arch_dapper_updates="${arch_dapper}"
 arch_dapper_backports="${arch_dapper}"
-arch_edgy="${arch_dapper}"
-arch_edgy_updates="${arch_edgy}"
-arch_edgy_backports="${arch_edgy}"
-arch_feisty="${arch_edgy}"
+arch_feisty="${arch_dapper}"
 arch_feisty_updates="${arch_feisty}"
 arch_feisty_backports="${arch_feisty}"
 arch_gutsy="${arch_feisty}"
diff --git a/static/index.tmpl b/static/index.tmpl
index 2c074c8..da74ff6 100644
--- a/static/index.tmpl
+++ b/static/index.tmpl
@@ -6,13 +6,11 @@
 -%]
 [%-
     all_suites = [ 'dapper', 'dapper-updates', 'dapper-backports',
-		   'edgy', 'edgy-updates', 'edgy-backports',
 		   'feisty', 'feisty-updates', 'feisty-backports',
 		   'gutsy', 'gutsy-updates', 'gutsy-backports',
 		   'hardy', 'hardy-updates', 'hardy-backports',
 		   'intrepid' ]
     version_numbers = { dapper => '6.06LTS',
-    			edgy   => '6.10',
 			feisty => '7.04',
 			gutsy  => '7.10',
 			hardy  => '8.04LTS'}
@@ -132,6 +130,10 @@ Display:
 <hr>
 <h2>News</h2>
 <dl>
+<dt>2008-06-10</dt>
+<dd>
+<p>Removed edgy</p>
+</dd>
 <dt>2008-04-28</dt>
 <dd>
 <p>Added intrepid</p>
-- 
2.39.2