From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sun, 15 Feb 2009 06:21:43 +0000 (+0000)
Subject: Merge commit 'alioth/master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;ds=sidebyside;h=1ac63b1ac6c696a8dd9f66af1dd91219e153fe3f;hp=-c;p=deb%2Fpackages.git

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

1ac63b1ac6c696a8dd9f66af1dd91219e153fe3f
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}"