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 3c43a3f46ed7b0646a8757cd2c1aa9109e7b2567..48dd533d1a08b05844e9ef96a4ab167e763c9c75 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -25,39 +25,42 @@ cachedir=${topdir}/cache
 #ftproot=/org/ftp.root
 
 ftpsite=http://archive.ubuntu.com/ubuntu
-security_ftpsite=$ftpsite
-ddtp_ftpsite=http://ddtp.debian.net/debian
+security_ftpsite=http://archive.ubuntu.com/ubuntu
+#ddtp_ftpsite=http://archive.ubuntu.com/ubuntu
 
-wget_cmd="wget --no-verbose --tries=2 --timeout=60" 
+wget_cmd="wget --no-verbose --tries=2 --timeout=60"
+check_release_cmd="perl -I${libdir} ${bindir}/check-release --verbose --ignoremissing --keyring ${configdir}/trusted.gpg"
 
+# URLs that need to be known in the code (as opposed to the templates)
 root=""
+search_url="/search"
 
 # Architectures
 #
 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"
+ddtplangs="ca cs da de eo es fi fr hu it ja ko nl pl pt pt-br ru sk sv uk zh-cn zh-tw"
 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"
+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}"
 arch_gutsy_updates="${arch_gutsy}"
 arch_gutsy_backports="${arch_gutsy}"
-arch_hardy="${arch_gutsy}"
+arch_hardy="i386 amd64"
 arch_hardy_updates="${arch_hardy}"
 arch_hardy_backports="${arch_hardy}"
+arch_intrepid="${arch_hardy}"
+arch_intrepid_updates="${arch_intrepid}"
+arch_intrepid_backports="${arch_intrepid}"
 
 # Miscellaneous
 #