The following commit has been merged in the debian-master branch:
commit 59da095beebcee4ec6d78531709d709db391017c
Merge: f13529a2f31d2dd523c2a5559f62c73129e3954d 
88495a473fb1aef31bfcf623d2f2f9cb722165ad
Author: Frank Lichtenheld <[email protected]>
Date:   Sat Jan 16 19:29:07 2010 +0000

    Merge commit 'alioth/master' into debian-master

diff --combined config.sh.sed.in
index 9cd7c0d,f5a511d..77ab212
--- 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
@@@ -51,8 -51,8 +51,8 @@@ dists="$suites
  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} avr32 hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k"
+ arch_squeeze="alpha amd64 armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 
mips mipsel powerpc s390 sparc"
+ arch_sid="${arch_squeeze} avr32 hurd-i386 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]

Reply via email to