From: Gerfried Fuchs <rhonda@debian.at>
Date: Mon, 13 Sep 2010 07:19:14 +0000 (+0200)
Subject: Merge branch 'master' into ubuntu-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=5db229e24c1403bdb4f49ba1f7d463c8e4a274af;p=deb%2Fpackages.git

Merge branch 'master' into ubuntu-master

Conflicts:
	config.sh.sed.in
	cron.d/100syncarchive_backports
	cron.d/100syncarchive_debports
	lib/Packages/Search.pm
	templates/config/mirrors.tmpl
	templates/html/homepage.tmpl
---

5db229e24c1403bdb4f49ba1f7d463c8e4a274af
diff --cc config.sh.sed.in
index 4e5d16c,09d080c..ac8e03e
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -37,33 -40,22 +37,33 @@@ search_url="/search
  
  # Architectures
  #
- polangs="bg de fi fr hu ja nl ru sk sv uk zh-cn"
- ddtplangs="be ca cs da de en-gb eo es et eu fi fr gl hu id it ja ka km ko lt ml nl oc pl pt pt-br ro ru sk sl sv tr uk vi zh-cn zh-hk zh-tw"
+ polangs="bg de fi fr hu ja nl ru sk sv uk zh-cn zh-tw"
+ ddtplangs="ca cs da de eo es eu fi fr hu it ja km ko nl pl pt pt-br ru sk sv uk zh zh-cn zh-tw"
 -archives="us security debports backports volatile"
 -sections="main contrib non-free"
 +archives="us security"
 +sections="main multiverse restricted universe"
  parts="$sections"
 -suites="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile lenny-backports squeeze squeeze-backports sid experimental"
 +suites="dapper dapper-updates dapper-backports hardy hardy-updates hardy-backports jaunty jaunty-updates jaunty-backports karmic karmic-updates karmic-backports lucid lucid-updates lucid-backports maverick"
- dists="$suites"
  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 powerpcspe s390 sh4 sparc sparc64"
 -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 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc"
 -arch_sid="${arch_squeeze} avr32 hurd-i386 m68k powerpcspe sh4 sparc64"
 -arch_experimental="${arch_sid}"
 -arch_lenny_proposed_updates="${arch_lenny}"
 -arch_etch_proposed_updates="${arch_etch}"
 +architectures="i386 amd64 powerpc"
 +arch_dapper="i386 amd64 powerpc"
 +arch_dapper_updates="${arch_dapper}"
 +arch_dapper_backports="${arch_dapper}"
 +arch_hardy="i386 amd64"
 +arch_hardy_updates="${arch_hardy}"
 +arch_hardy_backports="${arch_hardy}"
 +arch_jaunty="${arch_hardy}"
 +arch_jaunty_updates="${arch_jaunty}"
 +arch_jaunty_backports="${arch_jaunty}"
 +arch_karmic="${arch_jaunty}"
 +arch_karmic_updates="${arch_karmic}"
 +arch_karmic_backports="${arch_karmic}"
 +arch_lucid="${arch_karmic}"
 +arch_lucid_updates="${arch_lucid}"
 +arch_lucid_backports="${arch_lucid}"
 +arch_maverick="${arch_lucid}"
 +arch_maverick_updates="${arch_maverick}"
 +arch_maverick_backports="${arch_maverick}"
  
  # Miscellaneous
  #