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

Conflicts:

	config.sh.sed.in
	templates/html/head.tmpl

diff --cc config.sh.sed.in
Simple merge

diff --cc lib/Packages/Search.pm
Simple merge

diff --cc templates/config.tmpl
index 268ec274775ddf2e974d3ebd292bc09928743c49,6fb12e0c8e214cb5f4cd88e8d969e806de646451..90c2b4702736bfda199c90b9109c19ecfbc3ddf0
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -13,13 -12,13 +13,13 @@@
     pts_url = 'http://packages.qa.debian.org/'
     ddpo_url = 'http://qa.debian.org/developer.php?login='
     src_bugs_url = bugs_url _ 'src:'
 -   mirror_url = 'http://ftp.debian.org/'
 -   changelogs_url = 'http://packages.debian.org/changelogs/'
 +   mirror_url = 'http://archive.ubuntu.com/'
 +   changelogs_url = 'http://changelogs.ubuntu.com/changelogs'
     policy_url = 'http://www.debian.org/doc/debian-policy/'
 -   cn_help_url = homepage _ 'intro/cn'
 +#   cn_help_url = homepage _ 'intro/cn'
     logo = {
        url => homepage,
-         src => '/Pics/openlogo-nd-50.png',
+         src => '/Pics/openlogo-nd-25.png',
          alt => organisation,
     }
     copyright = {

diff --cc templates/html/head.tmpl
index 6cb91da891dc08b8f47aac4c68d50f4ec04fa8a3,308d3965f9256e5a53721e5a355ee64afbe92f35..00894ce9e95110e197376119cff4edb55c5ef452
--- 1/templates/html/head.tmpl
--- 2/templates/html/head.tmpl
+++ b/templates/html/head.tmpl
@@@ -11,8 -11,7 +11,9 @@@
  
  <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 %]
@@@ -25,19 -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"' %]
+ [% checked = 'checked="checked"'
+    selected = 'selected="selected"' %]
 +<div id="search">
  <form method="GET" action="/search">
  <div id="hpacketsearch">
  [% IF search_field_values.mode %]<input type="hidden" name="mode" value="[% search_field_values.mode %]">[% END %]
@@@ -45,43 -43,21 +47,37 @@@
  [% 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 %]
- <input type="text" size="30" name="keywords" value="[% search_field_values.keywords | html %]" id="kw">
  <input type="submit" value="Search">
+ <select size="1" name="searchon">
+ <option value="names" [% selected IF search_field_values.searchon == 'names' || search_field_values.searchon == 'default' %]>
+ package names</option>
+ <option value="all" [% selected IF search_field_values.searchon == 'all' %]>descriptions</option>
+ <option value="sourcenames" [% selected IF search_field_values.searchon == 'sourcenames' %]>source package names</option>
+ <option value="contents" [% selected IF search_field_values.searchon == 'contents' %]>package contents</option
+ </select>
+ <input type="text" size="30" name="keywords" value="[% search_field_values.keywords | html %]" id="kw">
  <span style="font-size: 60%"><a href="[% searchformurl %]">all options</a></span>
- <br>
- <div style="font-size: 80%">search in:
- <input type="radio" name="searchon" value="names" id="onlynames" [% checked IF search_field_values.searchon == 'names' || search_field_values.searchon == 'default' %]>
- <label for="onlynames">package names</label>&nbsp;&nbsp;
- 
- <input type="radio" name="searchon" value="all" id="descs" [% checked IF search_field_values.searchon == 'all' %]>
- <label for="descs">descriptions</label>
- <br>
- <input type="radio" name="searchon" value="sourcenames" id="src" [% checked IF search_field_values.searchon == 'sourcenames' %]>
- <label for="src">source package names</label>
- <input type="radio" name="searchon" value="contents" id="conts" [% checked IF search_field_values.searchon == 'contents' %]>
- <label for="conts">package contents</label>
- </div>
  </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 -->
 +
 +<div class="visualClear"></div>
 +<div id="contentColumn">
 +<div class="inside">
 +<div id="content" class="">
 +<div class="documentContent" id="region-content">
 +
  
  <p class="hidecss"><a href="#inner">skip the navigation</a></p>
  <div id="pnavbar">