The following commit has been merged in the debian-master branch:
commit 1ac63b1ac6c696a8dd9f66af1dd91219e153fe3f
Merge: f199862788c8ad81dd559771b539930fdda871a9
d335139f37934f9128a39ffd0933a163fb71cce7
Author: Frank Lichtenheld <[email protected]>
Date: Sun Feb 15 06:21:43 2009 +0000
Merge commit 'alioth/master' into debian-master
diff --combined config.sh.sed.in
index 2dd3417,c9091d2..b6709c1
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -19,7 -19,7 +19,7 @@@ cachedir=${topdir}/cach
# unset this if %SITE% moves somewhere where the packages files
# cannot be obtained locally
#
-#localdir=/org/ftp.debian.org/debian
+localdir=/srv/mirrors/ftp.debian.org
# path to private ftp directory
#ftproot=/org/ftp.root
@@@ -45,13 -45,14 +45,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="${arch_lenny}"
+ 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]