Merge branch 'master' into debian-master

diff --combined config.sh.sed.in
index fe395be9cd5adeb2d8957915669f6538db62965e,d3dde1fc13613f073652e5c4894bc6d3ca2af36b..8bd89ba81fd4133f66d6496e25b35081283df34a
--- 1/config.sh.sed.in
--- 2/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
@@@ -27,7 -27,7 +27,7 @@@
  ftpsite=http://ftp.de.debian.org/debian
  security_ftpsite=http://security.debian.org/debian-security
  volatile_ftpsite=http://volatile.debian.org/debian-volatile
- backports_ftpsite=http://backports.org/debian
+ backports_ftpsite=http://backports.debian.org/debian-backports
  debports_ftpsite=http://ftp.debian-ports.org/debian
  ddtp_ftpsite=
  
@@@ -45,15 -45,17 +45,15 @@@ 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="lenny lenny-volatile lenny-backports squeeze sid experimental"
 -suites="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile lenny-backports squeeze squeeze-backports sid experimental"
++suites="lenny lenny-volatile lenny-backports squeeze squeeze-backports sid experimental"
  priorities="required important standard optional extra"
  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_lenny="alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc"
  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}"
  
  # Miscellaneous
  #

diff --combined static/packages-site.css
index 7254f37b79afbea83299a157d02d176de0e185fe,dc09e55c72fe48cfa924dc0f36653470cdac14da..dcd43c5095bd4d547d72fd608163097518f7125c
--- 1/static/packages-site.css
--- 2/static/packages-site.css
+++ b/static/packages-site.css
@@@ -1,17 -1,4 +1,17 @@@
  .sarge-volatile, .sarge-backports, .etch-m68k, .etch-backports,
- .lenny-volatile, .lenny-backports {
+ .lenny-volatile, .lenny-backports .squeeze-backports {
        font-size: smaller;
  }
 +
 +table#sponsorslist {
 +      text-align: center;
 +      border: 1px solid black;
 +      padding: 1em;
 +      border-collapse: collapse;
 +      empty-cells: show;
 +}
 +
 +#sponsorslist th, #sponsorslist td {
 +      border: 1px solid black;
 +      padding: .5em;
 +}

diff --combined templates/html/homepage.tmpl
index 2c91e2ad5ce84664d8e5ab58c6ebb118447c5880,5b1b2939d8818e0f092835c323d529688be4e88b..3499aeeeecdfe720cb19ec40311321039d94e19d
--- 1/templates/html/homepage.tmpl
--- 2/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@@ -4,7 -4,8 +4,8 @@@
        keywords = g('Packages')
  -%]
  [%-
-     all_suites = [ 'lenny', 'lenny-volatile', 'lenny-backports', 'squeeze', 'sid' ]
+     all_suites = [ 'etch', 'etch-m68k', 'etch-volatile', 'etch-backports',
+                  'lenny', 'lenny-volatile', 'lenny-backports', 'squeeze', 'squeeze-backports', 'sid' ]
      version_numbers = { sarge => '3.1',
                        etch  => '4.0',
                        lenny => '5.0' }
@@@ -116,4 -117,4 +117,4 @@@ Distribution
  </select>
  </form>
  
 -[% PROCESS 'html/foot.tmpl' page_name=packages_homepage copyright.years = '1997 - 2009' %]
 +[% PROCESS 'html/foot.tmpl' page_name=packages_homepage copyright.years = '1997 - 2010' %]