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 c9091d2657dd5d47bacf389813dc01dcbd1f6734..2f12546ccca4466ca340dcecfb73b289be3da675 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -24,12 +24,9 @@ cachedir=${topdir}/cache
 # path to private ftp directory
 #ftproot=/org/ftp.root
 
-ftpsite=http://ftp.de.debian.org/debian
-security_ftpsite=http://security.debian.org/debian-security
-volatile_ftpsite=http://volatile.debian.org/debian-volatile
-backports_ftpsite=http://backports.org/debian
-debports_ftpsite=http://ftp.debian-ports.org/debian
-ddtp_ftpsite=
+ftpsite=http://archive.ubuntu.com/ubuntu
+security_ftpsite=http://archive.ubuntu.com/ubuntu
+#ddtp_ftpsite=http://archive.ubuntu.com/ubuntu
 
 wget_cmd="wget --no-verbose --tries=2 --timeout=60"
 check_release_cmd="perl -I${libdir} ${bindir}/check-release --verbose --ignoremissing --keyring ${configdir}/trusted.gpg"
@@ -40,23 +37,34 @@ search_url="/search"
 
 # Architectures
 #
-polangs="de fi fr hu ja nl ru sv uk zh-cn"
+polangs="bg de fi fr hu ja nl ru sk sv uk zh-cn zh-tw"
 ddtplangs="ca cs da de eo es eu fi fr hu it ja km ko nl pl pt pt-br ru sk sv uk zh zh-cn zh-tw"
-archives="us security debports backports volatile"
-sections="main contrib non-free"
+archives="us security"
+sections="main multiverse restricted universe"
 parts="$sections"
-suites="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile lenny-backports squeeze sid experimental"
+suites="hardy hardy-updates hardy-backports lucid lucid-updates lucid-backports maverick maverick-updates maverick-backports natty natty-updates natty-backports oneiric oneiric-updates oneiric-backports precise"
 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_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
-arch_lenny="${arch_etch} armel"
-arch_squeeze="${arch_lenny}"
-arch_sid="${arch_squeeze} hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k"
-arch_experimental="${arch_sid}"
-arch_lenny_proposed_updates="${arch_lenny}"
-arch_etch_proposed_updates="${arch_etch}"
+architectures="i386 amd64 powerpc armel"
+arch_hardy="i386 amd64"
+arch_hardy_updates="${arch_hardy}"
+arch_hardy_backports="${arch_hardy}"
+arch_lucid="${arch_hardy}"
+arch_lucid_updates="${arch_lucid}"
+arch_lucid_backports="${arch_lucid}"
+arch_maverick="${arch_lucid}"
+arch_maverick_updates="${arch_maverick}"
+arch_maverick_backports="${arch_maverick}"
+arch_natty="${arch_maverick}"
+arch_natty_updates="${arch_natty}"
+arch_natty_backports="${arch_natty}"
+arch_oneiric="${arch_maverick}"
+arch_oneiric_updates="${arch_oneiric}"
+arch_oneiric_backports="${arch_oneiric}"
+arch_precise="${arch_oneiric}"
+arch_precise_updates="${arch_precise}"
+arch_precise_backports="${arch_precise}"
 
 # Miscellaneous
 #
-admin_email="djpig@debian.org"
+admin_email="rhonda@debian.org"