From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Fri, 6 Jun 2008 23:50:56 +0000 (+0200)
Subject: Merge branch 'master' into debian-master
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=b689b79b3a6d8cf48f1207286efeeb28b168cd01;p=deb%2Fpackages.git

Merge branch 'master' into debian-master

Conflicts:

	conf/apache.conf.sed.in
---

b689b79b3a6d8cf48f1207286efeeb28b168cd01
diff --cc conf/apache.conf.sed.in
index 953e507,2067d86..7327825
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -113,13 -111,17 +113,17 @@@
     RewriteRule ^/[^/]+\.css - [L]
     RewriteRule ^/[^/]+\.js - [L]
     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:([^/]+)$ /source/$1 [R,L,NE]
-    RewriteRule ^/file:(.+)$ http://%SITE%/search?searchon=contents&keywords=$1 [R,L,NE]
+    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]
+    RewriteCond %{REQUEST_URI} !^/search$ [OR]
+    RewriteCond %{QUERY_STRING} ^$
+    RewriteRule ^/([^/]+)$		http://%SITE%/search?keywords=$1 [R,L,NE]
  
     RewriteCond %{QUERY_STRING} =""
     RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]