Merge branch 'master' into ubuntu-master

diff --combined conf/apache.conf.sed.in
index 10e2521e23acfc8bea994f52afc45126e3baaa69,2067d8608d57c4c2e4024c9be1b2b78e8a0ea585..dfbefed44657fbca13783be2a0a191ad8c3d9d6b
--- 1/conf/apache.conf.sed.in
--- 2/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -66,13 -66,13 +66,13 @@@
  </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
@@@ -108,17 -108,20 +108,21 @@@
     RewriteRule ^/changelogs/ - [L]
     RewriteRule ^/Pics/ - [L]
     RewriteRule ^/about/ - [L]
 +   RewriteRule ^/ubuntu/ - [L]
     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 ^/([^/+]*)([+])([^/]*)$ "/$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 ^/$                    /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]
+    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]
@@@ -137,17 -140,3 +141,17 @@@
  #   RewriteRule . /index.html
  
  </VirtualHost>
 +
 +<VirtualHost *>
 +   ServerAdmin frank@lichtenheld.de
 +   DocumentRoot %TOPDIR%/www/
 +   ServerName packages.ubuntu.net
 +   ServerAlias packages.ubuntulinux.org
 +   ErrorLog /var/log/apache2/%SITE%-error.log
 +   CustomLog /var/log/apache2/%SITE%-access.log combined
 +
 +   ScriptAlias /cgi-bin %TOPDIR%/cgi-bin/
 +
 +   RedirectMatch permanent (.*) http://%SITE%$1
 +</VirtualHost>
 +

diff --combined templates/html/head.tmpl
index 3d48771edb36ac3561b7a050fba2aec0b34bd100,f8d520bedd8bf74f95ff953283b9c30cb8f0d276..1a4b8d907242692c2a32833667b4b2ea460f56a6
--- 1/templates/html/head.tmpl
--- 2/templates/html/head.tmpl
+++ b/templates/html/head.tmpl
@@@ -12,8 -12,6 +12,8 @@@
  <link href="/debian.css" rel="stylesheet" type="text/css" media="all">
  <link href="/packages.css" rel="stylesheet" type="text/css" media="all">
  <link href="/packages-site.css" rel="stylesheet" type="text/css" media="all">
 +<link href="/ubuntu/ubuntu.css" rel="stylesheet" type="text/css" media="all">
 +<link href="/ubuntu/masthead.css" rel="stylesheet" type="text/css" media="all">
  [% IF rss_alternate %]
  <link rel="alternate" type="application/rss+xml" title="RSS" href="[% rss_alternate %]">
  [% END %]
@@@ -26,20 -24,18 +26,20 @@@
  [% sitewidemsg.txt %]
  </div>
  [%- END -%]
 -<div id="header">
 -   <div id="upperheader">
 +    <div id="pageWrapper">
 +      <div id="mastWrapper">
 +        <div id="masthead">
 +          <a class="imageLink"
 +             href="[% homepage %]">&nbsp;</a>
  
 -   <div id="logo">
 -  <!-- very Debian specific use of the logo stuff -->
 -  <a href="[% logo.url %]"><img src="[% logo.src %]" alt=""></a>
 -  <a href="[% logo.url %]"><img src="/Pics/debian-small.png" alt="[% logo.alt %]" width="90" height="31"></a>
 -</div> <!-- end logo -->
 +          <a class="hiddenStructure"
 +             href="[% homepage %]/#documentContent">Skip
 +             to content</a>
  
  [%- IF print_search_field %]
  [% checked = 'checked="checked"'
     selected = 'selected="selected"' %]
 +<div id="search">
  <form method="GET" action="[% search_url %]">
  <div id="hpacketsearch">
  [% IF search_field_values.mode %]<input type="hidden" name="mode" value="[% search_field_values.mode %]">[% END %]
@@@ -47,6 -43,7 +47,7 @@@
  [% IF search_field_values.suite %]<input type="hidden" name="suite" value="[% search_field_values.suite %]">[% END %]
  [% IF search_field_values.sections %]<input type="hidden" name="section" value="[% search_field_values.sections %]">[% END %]
  [% IF search_field_values.architectures %]<input type="hidden" name="arch" value="[% search_field_values.architectures %]">[% END %]
+ [% IF opts.lang %]<input type="hidden" name="lang" value="[% opts.lang %]">[% END %]
  <input type="submit" value="[% g('Search') %]">
  <select size="1" name="searchon">
  <option value="names" [% selected IF search_field_values.searchon == 'names' || search_field_values.searchon == 'default' %]>
@@@ -59,20 -56,11 +60,20 @@@
  <span style="font-size: 60%"><a href="[% searchformurl %]">[% g('all options') %]</a></span>
  </div> <!-- end hpacketsearch -->
  </form>
 +</div>
  [% END %]
  
 -</div> <!-- end upperheader -->
 +     <!-- masthead content begin -->
 +    <h5 class="hiddenStructure">Sections</h5>    
 +    <div id="nav">
 +      <ul>        
 +      </ul>
 +    </div> <!-- nav -->
 +    <!-- masthead content end -->
 +    </div> <!-- masthead -->
 +   </div>  <!-- mastWrapper -->
  
 -<p class="hidecss"><a href="#inner">[% g('skip the navigation') %]</a></p>
 +<div class="visualClear"></div>
  <div id="pnavbar">
   &gt;&gt; <a href="[% project_homepage %]" title="[% g('%s Homepage', organisation) %]">[% organisation %]</a>
   &gt;&gt; <a href="[% packages_homepage %]" title="[% g('%s Packages Homepage', organisation) %]">[% g('Packages') %]</a>
@@@ -81,11 -69,11 +82,11 @@@
  [% END %]
  </div> <!-- end navbar -->
  
 -</div> <!-- end header -->
 -<div id="outer">
 -<div id="inner">
 +<div class="inside">
 +<div id="content" class="">
 +<div class="documentContent" id="region-content">
  
  [%- IF page_title %]
 -  <h1>[% page_title %]</h1>
 +  <h1 class="documentFirstHeading">[% page_title %]</h1>
    [%- PROCESS 'html/messages.tmpl' -%]
  [% END -%]