The following commit has been merged in the sourcedeps branch:
commit 509bb47c0c8b030e4bacaab4cde987c8663a7075
Merge: 09458cbe2d59080ada061120ed513fc716f6ca24
ebf38a5169f3013cf60f9d0bad612e24fe1908e6
Author: Frank Lichtenheld <[email protected]>
Date: Sun Feb 15 14:50:02 2009 +0100
Merge commit 'alioth/master' into sourcedeps
Conflicts:
conf/apache.conf.sed.in
diff --combined config.sh.sed.in
index 808b898,f9c1b07..da57bbd
--- 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
#
@@@ -47,13 -45,14 +47,14 @@@ ddtplangs="ca cs da de eo es eu fi fr h
archives="us security debports backports volatile"
sections="main contrib non-free"
parts="$sections"
- suites="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile sid
experimental"
+ suites="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile
lenny-backports squeeze 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_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
arch_lenny="${arch_etch} armel"
- arch_sid="${arch_lenny} hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k"
+ arch_squeeze="alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc"
+ 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}"
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
