The following commit has been merged in the debian-master branch:
commit 9a482e584a6b5337a90385ad1d54ae3190330dce
Merge: dbd8e7af8c0979c550562a609bd2f7e98c449902
d2c37ad5a233f2026d3309905f6715ec672be45b
Author: Frank Lichtenheld <[email protected]>
Date: Sun Jun 7 21:54:31 2009 +0200
Merge branch 'master' into debian-master
diff --combined config.sh.sed.in
index b85a83b,6cdfa0c..860f7e1
--- 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
@@@ -48,11 -48,11 +48,11 @@@ parts="$sections
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"
+ architectures="alpha amd64 arm armel avr32 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_squeeze="alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc"
- arch_sid="${arch_squeeze} hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k"
+ arch_sid="${arch_squeeze} avr32 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]