Merge branch 'master' into debian-master

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

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 92679b8a6f3f35a4cce0b15c9df9f3feddfe9b1a..fe395be9cd5adeb2d8957915669f6538db62965e 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -19,7 +19,7 @@ cachedir=${topdir}/cache
 # unset this if %SITE% moves somewhere where the packages files
 # cannot be obtained locally
 #
-#localdir=/org/ftp.debian.org/debian
+localdir=/srv/mirrors/ftp.debian.org
 
 # path to private ftp directory
 #ftproot=/org/ftp.root
@@ -45,17 +45,15 @@ 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="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile lenny-backports squeeze sid experimental"
+suites="lenny lenny-volatile lenny-backports squeeze sid experimental"
 priorities="required important standard optional extra"
 dists="$suites"
 architectures="alpha amd64 arm armel avr32 hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 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_lenny="alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc"
 arch_squeeze="alpha amd64 armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc"
 arch_sid="${arch_squeeze} avr32 hurd-i386 m68k"
 arch_experimental="${arch_sid}"
 arch_lenny_proposed_updates="${arch_lenny}"
-arch_etch_proposed_updates="${arch_etch}"
 
 # Miscellaneous
 #