Merge branch 'master' into ubuntu-master

[deb/packages.git] / config.sh.sed.in

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 2eb47b7472c30281858e9b8afd37160e1d17f3c6..48dd533d1a08b05844e9ef96a4ab167e763c9c75 100644 (file)
--- 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}"