Merge branch 'master' into debian-master

Conflicts:

	templates/config.tmpl

diff --combined conf/apache.conf.sed.in
index fff631f5e4da0452f20913ae6ff37cd41fcdcad8,eba66647e2b9b35d243e56f9445e64df864bc0d4..953e507dc1cbc374866ed5ad37ddb9664e4e183b
--- 1/conf/apache.conf.sed.in
--- 2/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -9,8 -9,9 +9,9 @@@
    # Nice caching..
    ExpiresActive On
    ExpiresDefault "access plus 1 day"
-   ExpiresByType image/gif "access plus 1 week"
-   ExpiresByType image/jpeg "access plus 1 week"
+   ExpiresByType image/gif  "modification plus 1 year"
+   ExpiresByType image/jpeg "modification plus 1 year"
+   ExpiresByType image/png  "modification plus 1 year"
  
    # language stuff
    # you need to keep this in sync with lib/Packages/I18N/Locale.pm
@@@ -71,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
@@@ -111,9 -110,10 +112,10 @@@
     RewriteRule ^/about/ - [L]
     RewriteRule ^/[^/]+\.css - [L]
     RewriteRule ^/[^/]+\.js - [L]
+    RewriteRule ^/favicon.ico$ - [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:([^/]+)$ /source/$1 [R,L,NE]

diff --combined templates/config.tmpl
index dc836b92084d501c9bab20c7324d18e452f32506,e4ccf7210df2a181afd7048e4d45b635413d746e..addbd8df4403a499319425a72a8c6bcf8142b2f0
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -4,8 -4,8 +4,8 @@@
     ddtp_lang = 'en'
  
     organisation = 'Debian'
-    homepage = 'http://www.debian.org/'
+    project_homepage = 'http://www.debian.org/'
 -   packages_homepage = 'http://packages.debian.net/'
 +   packages_homepage = 'http://packages.debian.org/'
     searchformurl = packages_homepage
     search_url = '/'
     tags_url = 'http://debtags.alioth.debian.org/'
@@@ -19,9 -19,9 +19,9 @@@
     security_suite_suffix = '/updates'
     changelogs_url = 'http://packages.debian.org/changelogs/'
     policy_url = 'http://www.debian.org/doc/debian-policy/'
-    cn_help_url = homepage _ 'intro/cn'
+    cn_help_url = project_homepage _ 'intro/cn'
     logo = {
-       url => homepage,
+       url => project_homepage,
          src => '/Pics/openlogo-nd-25.png',
          alt => organisation,
     }
@@@ -31,16 -31,16 +31,16 @@@
          years => '1997 - ' _ timestamp.year,
     }
     license = {
-       url => homepage _ 'license'
+       url => project_homepage _ 'license'
     }
     trademark = {
        name => copyright.name,
-       url => homepage _ 'trademark'
+       url => project_homepage _ 'trademark'
     }
     contact = {
        name => g('Debian Web Mailinglist'),
        mail => 'debian-www@lists.debian.org',
-         url => homepage _ 'contact',
+         url => project_homepage _ 'contact',
     }
     admin = {
        name => g('%s Webmaster', organisation),
@@@ -50,9 -50,8 +50,9 @@@
  -%]
  [%-
     # 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('.'),