Merge branch 'master' into archive-master

Conflicts:
	conf/apache.conf.sed.in
	config.sh.sed.in
	cron.d/100syncarchive_debports
	templates/config/mirrors.tmpl

diff --cc conf/apache.conf.sed.in
index aa68eaa7593c12f6f6504ef710c405560b9a030c,8594aecc7c41d1429c629055fada41c060631b89..a3eca9bc10a744d6a4fbba575ee5afdda5b0f960
--- 1/conf/apache.conf.sed.in
--- 2/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -73,17 -76,14 +73,14 @@@
    
     PerlModule ModPerl::Registry
     PerlTaintCheck On
 -   PerlRequire %TOPDIR%/bin/mod_perl-startup
 +#   PerlRequire %TOPDIR%/bin/mod_perl-startup
     PerlSwitches -T
     <Location /cgi-bin/>
 -      SetHandler perl-script
 -      PerlInitHandler Apache2::Reload
 -      PerlHandler ModPerl::Registry
 +#      SetHandler perl-script
-       # mod-perl etch
 +#      PerlInitHandler Apache2::Reload
-       # mod-perl sarge
-       #PerlInitHandler Apache::Reload
 +#      PerlHandler ModPerl::Registry
        Options +ExecCGI
 -      PerlSendHeader On
 +#      PerlSendHeader On
        allow from all
     </Location>
  

diff --cc config.sh.sed.in
index 645853f5a11c43671beb77af9a7ff7e8b802eb64,7bdb5e6f6c3579dbb7a7c5fc502ac978e4e63359..051f1ae69c1de139d60be430f6b7bcad17861612
--- 1/config.sh.sed.in
--- 2/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -37,19 -41,21 +37,19 @@@ search_url="/search
  # Architectures
  #
  polangs="de fi fr hu ja nl ru sv uk zh-cn"
- ddtplangs="ca cs da de eo es fi fr hu it ja km-kh ko nl pl pt pt-br 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"
 +archives="us"
  sections="main contrib non-free"
  parts="$sections"
 -suites="sarge sarge-volatile sarge-backports etch etch-m68k etch-volatile etch-backports lenny sid experimental"
 +suites="bo hamm slink potato woody"
  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_experimental="${arch_sid}"
 -arch_lenny_proposed_updates="${arch_lenny}"
 -arch_etch_proposed_updates="${arch_etch}"
 +architectures="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
 +arch_bo="i386"
 +arch_hamm="i386 m68k"
 +arch_slink="alpha i386 m68k sparc"
 +arch_potato="alpha arm i386 ia64 m68k powerpc sparc"
 +arch_woody="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
  
  # Miscellaneous
  #

diff --cc cron.d/120synctrans
Simple merge

diff --cc lib/Packages/DoShow.pm
Simple merge

diff --cc templates/config.tmpl
index 719dcf98405b29b504a1576e15a2a75809e3db6c,5ce7cc736eddbc6501d8432c58ccf1b19f09d081..421579aca7394d65e00afc8dac81b6f33e7ef70e
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -17,9 -17,10 +17,10 @@@
     security_mirror = 'security.debian.org'
     security_mirror_url = security_mirror _ '/debian-security'
     security_suite_suffix = '/updates'
 -   changelogs_url = 'http://packages.debian.org/changelogs/'
 +   changelogs_url = 'http://archive.debian.net/changelogs/'
     policy_url = 'http://www.debian.org/doc/debian-policy/'
     cn_help_url = project_homepage _ 'intro/cn'
+    patch_tracking_url = 'http://patch-tracking.debian.net/package'
     logo = {
        url => project_homepage,
          src => '/Pics/openlogo-nd-25.png',

diff --cc templates/config/mirrors.tmpl
Simple merge