From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Fri, 24 Oct 2008 16:41:38 +0000 (+0200)
Subject: Merge branch 'master' into debian-master
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=c47edfa85b5312d5467a4b8c3132a518e6af7ae5;p=deb%2Fpackages.git

Merge branch 'master' into debian-master

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

c47edfa85b5312d5467a4b8c3132a518e6af7ae5
diff --cc conf/apache.conf.sed.in
index 7327825,8594aec..00b38ad
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -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]