From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Tue, 28 Oct 2008 18:19:16 +0000 (+0000)
Subject: Merge commit 'origin/master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=c5021513a3bf129c3179ee2edad4b3e18b6103a7;hp=-c;p=deb%2Fpackages.git

Merge commit 'origin/master' into debian-master
---

c5021513a3bf129c3179ee2edad4b3e18b6103a7
diff --combined config.sh.sed.in
index ffa4e10,6637fb2..2dd3417
--- 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,14 -45,13 +45,13 @@@ 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="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 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}"