Merge branch 'debian-refactor' into ubuntu-master

diff --combined templates/html/foot.tmpl
index c6b4dc6b893bd0288b4311e0a9a954dad77d2c08,f54d494fd188c6032d9da1b5464014662a7db833..493069863a1fafb13aad41ac1c3757ddbcece919
--- 1/templates/html/foot.tmpl
--- 2/templates/html/foot.tmpl
+++ b/templates/html/foot.tmpl
@@@ -1,9 -1,8 +1,9 @@@
  [%- IF benchmark && debug -%]
  Total page evaluation took [% benchmark %]<br>
  [%- END -%]
 -</div> <!-- end inner -->
 +</div></div></div></div>
  
 +<div class=\"clear mozclear\"></div><div id=\"prefooter\">
  <div id="footer">
  
  [% IF langs.size > 0 %]
@@@ -12,7 -11,7 +12,7 @@@
  <p>This page is also available in the following languages:</p>
  <p class="navpara">
  [% FOREACH langs %]
- <a href="[% "$name?lang=$lang" %]" title="[% tooltip %]" hreflang="[% lang %]" lang="[% lang %]" rel="alternate">[% selfname %]
+ <a href="[% "$page_name?lang=$lang" %]" title="[% tooltip %]" hreflang="[% lang %]" lang="[% lang %]" rel="alternate">[% selfname %]
  [%- IF transliteration %] ([% transliteration %])[% END %]</a>
  [% END %]
  </p>
@@@ -24,8 -23,6 +24,8 @@@
  <p [%- ' class="bordertop"' IF langs.size > 0 %]>Back to: <a href="[% homepage %]">[% organisation %] homepage</a> || <a href="[% searchformurl %]">Packages search page</a></p>
  
  <hr class="hidecss">
 +<div id="footWrapper">
 +<div id="footer" class="inside">
  <div id="fineprint" class="bordertop">
  <p>To report a problem with the web site, e-mail <a href="mailto:[% contact.mail %]">[% contact.mail %]</a>. For other contact information, see the [% organisation %] <a href="[% contact.url %]">contact page</a>.</p>
  <p>[% IF timestamp.string %]Generated: [% timestamp.string %]<br>[% END %]
@@@ -33,8 -30,8 +33,8 @@@
  Content Copyright &copy; [% copyright.years %] <a href="[% copyright.url %]">[% copyright.name %]</a>; See <a href="[% license.url %]">license terms</a>. [% IF trademarknotes -%][% trademarknotes %][%- END %]
  [% END %]
  <p><a href="/about/">Learn more about this site</a>.</p>
 -</div> <!-- end fineprint -->
  </div> <!-- end footer -->
 -</div> <!-- end outer -->
 +</div> <!-- end footWrapper -->
 +</div> <!-- end pageWrapper -->
  </body>
  </html>