Merge branch 'master' of ssh://source/srv/source.djpig.de/git/packages into ubuntu...

diff --combined conf/apache.conf.sed.in
index d3b511ab04dc37c870d7b1fc6868ca271c0923af,2b6913b8aa267e5a61dc1f8456637b6bb47acddb..6384605b1666e4f3102a20c4ee5aa4b28f3bdb14
--- 1/conf/apache.conf.sed.in
--- 2/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -77,26 -77,26 +77,26 @@@
  </Directory>
  
  <VirtualHost *>
 -   ServerAdmin webmaster@debian.org
 +   ServerAdmin frank@lichtenheld.de
     DocumentRoot %TOPDIR%/www/
     ServerName %SITE%
     ErrorLog /var/log/apache2/%SITE%-error.log
     CustomLog /var/log/apache2/%SITE%-access.log combined
  
 -   Alias /cgi-bin/ %TOPDIR%/cgi-bin/
 +   ScriptAlias /cgi-bin/ %TOPDIR%/cgi-bin/
    
 -   PerlModule ModPerl::Registry
 -   PerlTaintCheck On
 -   PerlRequire %TOPDIR%/bin/mod_perl-startup
 +#   PerlModule ModPerl::Registry
 +#   PerlTaintCheck On
 +#   PerlRequire %TOPDIR%/bin/mod_perl-startup
     <Location /cgi-bin/>
 -      SetHandler perl-script
 +#      SetHandler perl-script
        # mod-perl etch
 -      #PerlInitHandler Apache2::Reload
 +#      PerlInitHandler Apache2::Reload
        # mod-perl sarge
 -      PerlInitHandler Apache::Reload
 -      PerlHandler ModPerl::Registry
 +      #PerlInitHandler Apache::Reload
 +#      PerlHandler ModPerl::Registry
        Options +ExecCGI
 -      PerlSendHeader On
 +#      PerlSendHeader On
        allow from all
     </Location>
  
@@@ -106,6 -106,8 +106,8 @@@
     RewriteLog /var/log/apache2/rewrite.log
     RewriteLogLevel 0
  
+    RewriteMap changelog-url txt:%TOPDIR%/files/changelogs-map
+ 
     RewriteRule ^/cgi-bin/search_packages.pl(.*)$ /search$1
     RewriteRule ^/cgi-bin/search_contents.pl(.*)$ /search$1
     RewriteRule ^/unstable/newpkg_([a-z]+)\.[a-z]+\.rdf /unstable/$1/newpkg?format=rss [R=permanent,L]
@@@ -116,13 -118,13 +118,14 @@@
     RewriteRule ^/changelogs/ - [L]
     RewriteRule ^/Pics/ - [L]
     RewriteRule ^/about/ - [L]
 +   RewriteRule ^/ubuntu/ - [L]
     RewriteRule ^/[^/]+\.css - [L]
     RewriteRule ^/[^/]+\.js - [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 ^/(.+)$ /cgi-bin/dispatcher.pl/$1 [L,PT]