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 7db02b6e658b291038389eb1d35a813b86fc9f52..f554b1650f6d1c68aaaf36e6922f4df938df43da 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -11,7 +11,6 @@ filesdir=${topdir}/files
 htmldir=${topdir}/www
 archivedir=${topdir}/archive
 podir=${topdir}/po
-localedir=%TOPDIR%/locale
 staticdir=${topdir}/static
 configdir=${topdir}/conf
 templatedir=${topdir}/templates
@@ -26,20 +25,22 @@ localdir=/org/ftp.root/debian
 #ftproot=/org/ftp.root
 
 ftpsite=http://ftp.de.debian.org/debian
-nonus_ftpsite=http://ftp.uk.debian.org/debian-non-US
 security_ftpsite=http://security.debian.org/debian-security
 volatile_ftpsite=http://volatile.debian.org/debian-volatile
 backports_ftpsite=http://backports.org/debian
 amd64_ftpsite=http://amd64.debian.net/debian
-gnuab_ftpsite=http://kfreebsd-gnu.debian.net/debian
+debports_ftpsite=http://ftp.debian-ports.org/debian
+ddtp_ftpsite=http://ddtp.debian.net/debian
+
+wget_cmd="wget --no-verbose --tries=2 --timeout=60" 
 
 root=""
 
 # Architectures
 #
-polangs="de fi nl fr uk"
-ddtplangs="de cs da eo es fi fr hu it ja nl pl pt_BR pt_PT ru sk sv_SE uk"
-archives="us security amd64 gnuab backports volatile"
+polangs="de fi fr hu ja nl ru sv uk zh-cn"
+ddtplangs="ca cs da de eo es fi fr hu it ja km-kh ko nl pl pt pt-br ru sk sv uk zh-cn zh-tw"
+archives="us security amd64 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"