Fix some smaller issues reported by Thijs Kinkhorst

[deb/packages.git] / config.sh

diff --git a/config.sh b/config.sh
index 750326567d83e596b117c6c035c30e4df11e7df3..eab1b2b5504898946b697cf51d89107f6ae32b9c 100644 (file)
--- a/config.sh
+++ b/config.sh
@@ -11,9 +11,9 @@ filesdir=${topdir}/files
 htmldir=${topdir}/www
 archivedir=${topdir}/archive
 podir=${topdir}/po
-localedir=${topdir}/locale
+localedir=/org/packages.debian.org/locale
 staticdir=${topdir}/static
-configdir=${topdir}/etc
+configdir=${topdir}/conf
 
 # unset this if packages.debian.org moves somewhere where the packages files
 # cannot be obtained locally
@@ -32,9 +32,8 @@ amd64_ftpsite=http://amd64.debian.net/debian
 kfreebsd_ftpsite=http://kfreebsd-gnu.debian.net/debian
 
 root=""
+hostname="http://packages.debian.net"
 search_page="http://packages.debian.net/"
-# FIXME: remove dupe
-search_cgi="/search"
 search_url="/search"
 webmaster=webmaster@debian.org
 contact=debian-www@lists.debian.org
@@ -43,21 +42,22 @@ bug_url="http://bugs.debian.org/"
 src_bug_url="http://bugs.debian.org/src:"
 qa_url="http://packages.qa.debian.org/"
 ddpo_url="http://qa.debian.org/developer.php?email="
+cn_help_url="http://www.debian.org/intro/cn"
 
 # 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 non-US security volatile backports"
+archives="us non-US security amd64 kfreebsd backports volatile"
 sections="main contrib non-free"
 parts="$sections"
-suites="oldstable stable testing unstable experimental"
+suites="oldstable stable stable-volatile stable-backports testing unstable experimental"
 dists="$suites"
-architectures="alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips mipsel powerpc s390 sparc"
+architectures="alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc"
 arch_oldstable="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
 arch_stable="${arch_oldstable} amd64"
 arch_testing="${arch_stable}"
-arch_unstable="${arch_stable} hurd-i386 kfreebsd-i386"
+arch_unstable="${arch_stable} hurd-i386 kfreebsd-i386 kfreebsd-amd64"
 arch_experimental="${arch_unstable}"
 arch_testing_proposed_updates="${arch_testing}"
 arch_stable_proposed_updates="${arch_stable}"