From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Thu, 21 Feb 2008 13:31:09 +0000 (+0100)
Subject: Merge branch 'master' into debian-master
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=a82de3447c938f89e6808a3d0eca3326dd0dc389;p=deb%2Fpackages.git

Merge branch 'master' into debian-master

Conflicts:

	templates/config.tmpl
---

a82de3447c938f89e6808a3d0eca3326dd0dc389
diff --cc conf/apache.conf.sed.in
index fff631f,eba6664..953e507
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -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 --cc templates/config.tmpl
index dc836b9,e4ccf72..addbd8d
--- a/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/'