Merge branch 'master' into debian-master

Leave out 50961b4eb963cdd14a4362fa8bab7335d5f504ca
(Remove all code related to the mail forwarding from the master branch)

diff --combined conf/apache.conf.sed.in
index 7327825ce8558c05fc2df7aacc078a7a0e64a9ee,8594aecc7c41d1429c629055fada41c060631b89..00b38ad6b4b6772a09357b8198771ab45a07cc1e
--- 1/conf/apache.conf.sed.in
--- 2/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -72,8 -72,6 +72,8 @@@
     ErrorLog /var/log/apache2/%SITE%-error.log
     CustomLog /var/log/apache2/%SITE%-access.log combined
  
 +   CBandUser pdo
 +
     Alias /cgi-bin/ %TOPDIR%/cgi-bin/
    
     PerlModule ModPerl::Registry
@@@ -82,10 -80,7 +82,7 @@@
     PerlSwitches -T
     <Location /cgi-bin/>
        SetHandler perl-script
-       # mod-perl etch
        PerlInitHandler Apache2::Reload
-       # mod-perl sarge
-       #PerlInitHandler Apache::Reload
        PerlHandler ModPerl::Registry
        Options +ExecCGI
        PerlSendHeader On
@@@ -115,15 -110,15 +112,15 @@@
     RewriteRule ^/favicon.ico$ - [L]
     RewriteRule ^/robots.txt$ - [L]
  
 -#   RewriteRule ^/$ http://www.debian.org/distrib/packages
 -   RewriteRule ^/$                    /index.html [L]
 +   RewriteRule ^/$ http://www.debian.org/distrib/packages
 +#   RewriteRule ^/$ /index.html [L]
     RewriteRule ^/([^/+]*)([+])([^/]*)$        "/$1%%{%}2B$3" [N]
-    RewriteRule ^/changelog:(.+)$      http://%SITE%/changelogs/${changelog-url:$1} [R,L,NE]
-    RewriteRule ^/src:([^/]+)$         http://%SITE%/search?searchon=sourcenames&keywords=$1 [R,L,NE]
-    RewriteRule ^/file:(.+)$           http://%SITE%/search?searchon=contents&keywords=$1 [R,L,NE]
+    RewriteRule ^/changelog:(.+)$      /changelogs/${changelog-url:$1} [R,L,NE]
+    RewriteRule ^/src:([^/]+)$         /search?searchon=sourcenames&keywords=$1 [R,L,NE]
+    RewriteRule ^/file:(.+)$           /search?searchon=contents&keywords=$1 [R,L,NE]
     RewriteCond %{REQUEST_URI} !^/search$ [OR]
     RewriteCond %{QUERY_STRING} ^$
-    RewriteRule ^/([^/]+)$             http://%SITE%/search?keywords=$1 [R,L,NE]
+    RewriteRule ^/([^/]+)$             /search?keywords=$1 [R,L,NE]
  
     RewriteCond %{QUERY_STRING} =""
     RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]

diff --combined config.sh.sed.in
index 9d02310d409a48bd9ca5f54d01430f3dbb537438,7bdb5e6f6c3579dbb7a7c5fc502ac978e4e63359..198effd159b33e404824bcffe0a1b79a76a502d4
--- 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=/org/ftp.root/debian
  
  # path to private ftp directory
  #ftproot=/org/ftp.root
@@@ -28,7 -28,6 +28,6 @@@ ftpsite=http://ftp.de.debian.org/debia
  security_ftpsite=http://security.debian.org/debian-security
  volatile_ftpsite=http://volatile.debian.org/debian-volatile
  backports_ftpsite=http://backports.org/debian
- amd64_ftpsite=http://amd64.debian.net/debian
  debports_ftpsite=http://ftp.debian-ports.org/debian
  ddtp_ftpsite=
  
@@@ -42,15 -41,15 +41,15 @@@ 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"
- archives="us security amd64 debports backports volatile"
+ 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"
  parts="$sections"
  suites="sarge sarge-volatile sarge-backports etch etch-m68k etch-volatile etch-backports lenny 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 amd64 arm hppa i386 ia64 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"

diff --combined templates/config.tmpl
index e79d091bc96ff88112c72eef9a974eea07f032ad,5ce7cc736eddbc6501d8432c58ccf1b19f09d081..22f00a083435ec6e985a2f4e0d1374ef314064b6
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -5,7 -5,7 +5,7 @@@
  
     organisation = 'Debian'
     project_homepage = 'http://www.debian.org/'
 -   packages_homepage = 'http://packages.debian.net/'
 +   packages_homepage = 'http://packages.debian.org/'
     searchformurl = packages_homepage
     search_url = '/search'
     tags_url = 'http://debtags.alioth.debian.org/'
@@@ -20,6 -20,7 +20,7 @@@
     changelogs_url = 'http://packages.debian.org/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',
@@@ -47,16 -48,15 +48,16 @@@
        mail => 'webmaster@debian.org',
     }
     trademarknotes = g('%s is a <a href="%s">trademark</a> of %s', organisation, trademark.url, trademark.name)
 -#   sponsor = {
 -#     url => 'http://example.invalid/',
 -#     name => 'Example Sponsor, Inc.',
 -#   }
 +   sponsor = {
 +      url => 'http://1und1.de/',
 +      name => '1&1 Internet AG',
 +   }
  -%]
  [%-
     # possible values for importance: high, normal, low
 -   sitewidemsg = { importance => "high",
 -                 txt => g('Please note that this is an experimental version of <a href="http://%s/">%s</a>. Errors and obsolete information should be expected', 'packages.debian.org', 'packages.debian.org') }
 +#   sitewidemsg = { importance => "high",
 +#                txt => g('Please note that this is an experimental version of <a href="http://%s/">%s</a>. Errors and obsolete information should be expected', 'packages.debian.org', 'packages.debian.org') }
 +#                txt => "Site maintainance in progress, some temporary problems might occour." }
  -%]
  [%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
  [%- USE num = Number.Format( decimal_point => g('.'),