The following commit has been merged in the sourcedeps branch:
commit f67a0fd88c61fcfe5df0c488ca521a553a3e8a03
Merge: 802b16c4f29a094319627cfa7489e86f80f2ae17
13bd5c195c09556542474ba98768934a937daace
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Wed Oct 29 12:35:39 2008 +0100
Merge commit 'origin/master' into sourcedeps
Conflicts:
conf/apache.conf.sed.in
diff --combined config.sh.sed.in
index d4614b4,6637fb2..808b898
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -16,8 -16,6 +16,8 @@@ configdir=${topdir}/con
templatedir=${topdir}/templates
cachedir=${topdir}/cache
+sourcedeps_key=ED505694
+
# unset this if %SITE% moves somewhere where the packages files
# cannot be obtained locally
#
@@@ -30,9 -28,8 +30,8 @@@ ftpsite=http://ftp.de.debian.org/debia
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
debports_ftpsite=http://ftp.debian-ports.org/debian
- ddtp_ftpsite=http://ddtp.debian.net/debian
+ ddtp_ftpsite=
wget_cmd="wget --no-verbose --tries=2 --timeout=60"
check_release_cmd="perl -I${libdir} ${bindir}/check-release --verbose
--ignoremissing --keyring ${configdir}/trusted.gpg"
@@@ -44,18 -41,17 +43,17 @@@ 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"
- archives="us security amd64 debports backports volatile"
+ 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"
parts="$sections"
- suites="sarge sarge-volatile sarge-backports etch etch-m68k etch-volatile
etch-backports lenny sid experimental"
+ suites="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile sid
experimental"
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_sarge="alpha amd64 arm hppa i386 ia64 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_sid="${arch_sarge} armel hurd-i386 kfreebsd-i386 kfreebsd-amd64"
+ arch_sid="${arch_lenny} hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k"
arch_experimental="${arch_sid}"
arch_lenny_proposed_updates="${arch_lenny}"
arch_etch_proposed_updates="${arch_etch}"
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
