Merge commit 'origin/master' into ubuntu-master

Conflicts:
	static/index.tmpl
	templates/config.tmpl
	templates/config/archive_layout.tmpl
	templates/config/mirrors.tmpl

diff --cc conf/apache.conf.sed.in
Simple merge

diff --cc templates/config.tmpl
index 0cc78480e3ed331059a4a1be78b3d25a36b2cc25,85c52f790939478b2a4304fe598865b407938114..a8a72b6c04849fc29637c0cc576764ab331f6fef
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -3,10 -3,11 +3,12 @@@
     po_lang = 'en'
     ddtp_lang = 'en'
  
 -   organisation = 'Debian'
 -   project_homepage = 'http://www.debian.org/'
 +   organisation = 'Ubuntu'
 +   project_homepage = 'http://www.ubuntu.com/'
     packages_homepage = '/'
 -   old_releases = 'http://archive.debian.net/'
 +   packages_homepage_abs = 'http://packages.ubuntu.com/'
+    packages_homepage_abs = 'http://packages.debian.net/'
++   old_releases = http://old-releases.ubuntu.com/
     searchformurl = packages_homepage
     search_url = '/search'
     tags_url = 'http://debtags.alioth.debian.org/'
@@@ -15,14 -15,14 +17,14 @@@
     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/'
 -   security_mirror = 'security.debian.org'
 -   security_mirror_url = security_mirror _ '/debian-security'
 -   security_suite_suffix = '/updates'
 -   changelogs_url = 'http://packages.debian.org/changelogs/'
 +   mirror_url = 'http://archive.ubuntu.com/'
 +   security_mirror = 'security.ubuntu.com'
 +   security_mirror_url = security_mirror _ '/ubuntu'
 +   security_suite_suffix = '-security'
 +   changelogs_url = 'http://changelogs.ubuntu.com/changelogs/'
     policy_url = 'http://www.debian.org/doc/debian-policy/'
 -   cn_help_url = project_homepage _ 'intro/cn'
 -   patch_tracking_url = 'http://patch-tracker.debian.org/package'
 +#   cn_help_url = project_homepage _ 'intro/cn'
- #   patch_tracking_url = 'http://patch-tracking.debian.net/package'
++#   patch_tracking_url = 'http://patch-tracker.debian.org/package'
     logo = {
        url => project_homepage,
          src => '/Pics/openlogo-nd-25.png',

diff --cc templates/config/archive_layout.tmpl
index fcf6e5b3e526e38e5b6b3fb5e8785421a61d6921,c563e6e3386ee8971711ce1d5eb98727c7c46327..d4290f2f100caa41ace4a06f336c3f1aa7335fe4
--- 1/templates/config/archive_layout.tmpl
--- 2/templates/config/archive_layout.tmpl
+++ b/templates/config/archive_layout.tmpl
@@@ -3,10 -3,23 +3,14 @@@
     main_archive = 'us'
     standard_priority = 'optional'
  
 -   suite_aliases = {
 -              etch => 'oldstable', 
 -              lenny => 'stable',
 -              squeeze => 'testing',
 -              sid => 'unstable',
 -                 }
 -
     section_titles = {
 -                main => g('packages that meet the Debian Free Software Guidelines'),
 -                contrib => g('packages that meet the Debian Free Software Guidelines but need software not in Debian main'),
 -                'non-free' => g('packages that do not meet the Debian Free Software Guidelines'),
 +              main => g('Canonical supported Open Source software'),
 +              universe => g('Community maintained open source software'),
 +              multiverse => g('Software restricted by copyright or legal issues'),
 +              restricted => g('Proprietary drivers for devices'),
          }
 -                main => 'http://www.debian.org/doc/debian-policy/ch-archive.html#s-main',
 -                contrib => 'http://www.debian.org/doc/debian-policy/ch-archive.html#s-contrib',
 -                'non-free' => 'http://www.debian.org/doc/debian-policy/ch-archive.html#s-non-free',
+ 
+    section_urls = {
+         }
+ 
  %]

diff --cc templates/config/mirrors.tmpl
index a37f7527219448bf4b261f5f0ce11b80d9752068,92c0e2dae977f20733376cacacec45fc3027f7d3..524712196b5c273b09dee6d8fa756edc29c6003a
--- 1/templates/config/mirrors.tmpl
--- 2/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@@ -1,62 -1,188 +1,63 @@@
  [%
  
 -# TODO: find a way to get the U.S. mirror list from a more authoritive
 -# location automatically. might not be overly smart to automatize it
 -# completely, since I hand pick sites that are up-to-date, fast, and
 -# have HTTP on a reasonably short URL
 -#   -- Joy
 -
 -# hint:
 -# grep-dctrl -F Site,Alias -e '(udel|bigfoot|kernel|crosslink|internap|cerias|lcs.mit|progeny)' Mirrors.masterlist | timestamps/archive_mirror_check.py
 - 
  mirrors = {
        us => {
 -              url => 'http://www.debian.org/',
 -              mirror_list => 'http://www.debian.org/mirror/list',
 -              north_america => [
 -                      "ftp.us.debian.org/debian",
 -                      "http.us.debian.org/debian",
 -#only amd64,i386      "ftp.debian.org/debian",
 -                      "ftp.ca.debian.org/debian",
 -                      "ftp.mx.debian.org/debian",
 -                      "ftp.egr.msu.edu/debian",
 -                      "mirrors.kernel.org/debian",
 -                      "ftp-mirror.internap.com/pub/debian",
 -#only some arches     "ftp.cerias.purdue.edu/pub/os/debian",
 -                      "debian.lcs.mit.edu/debian",
 -                      "debian.oregonstate.edu/debian",
 -              ],
 -              europa => [
 -                      "ftp.de.debian.org/debian",
 -                      "ftp.at.debian.org/debian",
 -                      "ftp.bg.debian.org/debian",
 -                      "ftp.ch.debian.org/debian",
 -                      "ftp.cz.debian.org/debian",
 -                      "ftp.dk.debian.org/debian",
 -                      "ftp.ee.debian.org/debian",
 -                      "ftp.es.debian.org/debian",
 -                      "ftp.fi.debian.org/debian",
 -                      "ftp.fr.debian.org/debian",
 -                      "ftp.hr.debian.org/debian",
 -                      "ftp.hu.debian.org/debian",
 -                      "ftp.ie.debian.org/debian",
 -                      "ftp.is.debian.org/debian",
 -                      "ftp.it.debian.org/debian",
 -                      "ftp.nl.debian.org/debian",
 -#only some arches     "ftp.no.debian.org/debian",
 -                      "ftp.pl.debian.org/debian",
 -                      "ftp.ro.debian.org/debian",
 -                      "ftp.ru.debian.org/debian",
 -                      "ftp.se.debian.org/debian",
 -#only some arches     "ftp.si.debian.org/debian",
 -                      "ftp.tr.debian.org/debian",
 -                      "ftp.uk.debian.org/debian",
 -              ],
 -              south_america => [
 -                      "ftp.br.debian.org/debian",
 -                      "ftp.cl.debian.org/debian",
 -                      "download.unesp.br/linux/debian",
 -                      "sft.if.usp.br/debian",
 -#not reachable                "debian.unesr.edu.ve/debian",
 -                      "debian.torredehanoi.org/debian",
 -              ],
 -              australia => [
 -                      "ftp.au.debian.org/debian",
 -                      "ftp.wa.au.debian.org/debian",
 -                      "ftp.nz.debian.org/debian",
 -                      "mirror.pacific.net.au/debian",
 -                      "ftp.iinet.net.au/debian/debian",
 -                      "mirror.optus.net/debian",
 -              ],
 -              asia => [
 -                      "ftp.jp.debian.org/debian",
 -                      "ftp2.jp.debian.org/debian",
 -                      "ftp.kr.debian.org/debian",
 -#only some arches     "ftp.hk.debian.org/debian",
 -                      "ftp.tw.debian.org/debian",
 -                      "debian.nctu.edu.tw/debian",
 -                      "debian.linux.org.tw/debian",
 -                      "linux.cdpa.nsysu.edu.tw/debian",
 -                      "ftp.nara.wide.ad.jp/debian",
 -                      "mirrors.geekbone.org/debian",
 -                      "ftp.yz.yamagata-u.ac.jp/debian",
 -                      "debian.thaios.net/debian",
 -                      "www.anheng.com.cn/debian",
 -                      "ftp.daum.net/debian",
 -              ],
 -              africa => [
 -                      "debian.mirror.ac.za/debian",
 -              ],
 -      },
 -
 -      volatile => {
 -              url => 'http://www.debian.org/volatile/',
 -              title => g('volatile packages that need major changes during the life of a stable release'),
 -              mirror_list => 'http://www.debian.org/volatile/volatile-mirrors',
 -              europa => [
 -                      "volatile.debian.org/debian-volatile",
 -                      "ftp.at.debian.org/debian-volatile",
 -                      "ftp.be.debian.org/debian-volatile",
 -                      "ftp.ch.debian.org/debian-volatile",
 -                      "ftp.de.debian.org/debian-volatile",
 -                      "ftp2.de.debian.org/debian-volatile",
 -                      "ftp.ee.debian.org/debian-volatile",
 -                      "ftp.fi.debian.org/debian-volatile",
 -                      "ftp.gr.debian.org/debian-volatile",
 -                      "ftp.nl.debian.org/debian-volatile",
 -                      "ftp.ru.debian.org/debian-volatile",
 -                      "ftp.sk.debian.org/debian-volatile",
 -                      "ftp.ua.debian.org/debian-volatile",
 -                      "ftp.uk.debian.org/debian-volatile",
 -              ],
 -              north_america => [
 -                      "mirror.csclub.uwaterloo.ca/debian-volatile",
 -                      "ftp3.nrc.ca/debian-volatile",
 -                      "gulus.usherbrooke.ca/debian-volatile",
 -              ],
 -              south_america => [
 -                      "ftp.br.debian.org/debian-volatile",
 -                      "ftp.cl.debian.org/debian-volatile",
 -                      "sft.if.usp.br/debian-volatile",
 -              ],
 -              asia => [
 -                      "ftp2.jp.debian.org/debian-volatile",
 -                      "ftp.tw.debian.org/debian-volatile",
 -                      "mirror.unej.ac.id/debian-volatile",
 -                      "mirrors.geekbone.org/debian-volatile",
 -              ],
 -              australia => [
 -                      "ftp.nz.debian.org/debian-volatile",
 -              ],
 -      },
 -
 -      backports => {
 -              url => 'http://www.backports.org/',
 -              title => g('newer packages that have been adapted to stable releases of Debian'),
 -              mirror_list => 'http://www.backports.org/debian/README.mirrors.html',
 -              europa => [
 -                      "www.backports.org/debian",
 -                      "debian.sil.at/backports.org/",
 -                      "backports.debian.or.at/backports.org",
 -                      "mirror.realroute.net/backports.org",
 -                      "backports.cisbg.com",
 -                      "backports.linuxdediziert.de/backports.org",
 -                      "debian.netcologne.de/debian-backports",
 -                      "ftp.de.debian.org/backports.org",
 -                      "mirror.buildd.net/backports.org",
 -                      "ftp.estpak.ee/backports.org",
 -                      "debian.acantho.net/backports.org",
 -                      "backports.essentkabel.com/backports.org",
 -                      "backports.sipo.nl",
 -                      "ftp.tuke.sk",
 -              ],
 -              asia => [
 -                      "backports.mithril-linux.org",
 -              ],
 -              australia => [
 -                      "mirror.linux.org.au/backports.org",
 -                      "mirror.pacific.net.au/linux/debian-backports",
 -              ],
 -      },
 -
 -      debports => {
 -              url => 'http://www.debian-ports.org/',
 -              title => g('ports of packages to architectures not yet or not anymore available in Debian'),
 -              mirror_list => 'http://wiki.debian.org/DebianPorts/Mirrors',
 -              unofficial_port => {
 -                      avr32 => {
 -                              url => 'http://avr32.debian.net/',
 -                              name => 'AVR32',
 -                      },
 -                      m68k => {
 -                              url_name => 'm68k',
 -                              name => 'M68K',
 -                      },
 -              },
 -              north_america => [
 -                      "www.gtlib.gatech.edu/pub/gnuab/debian",
 -              ],
 -              europa => [
 -                      "ftp.debian-ports.org/debian",
 -                      "ftp.de.debian.org/debian-ports",
 -                      "ftp.ch.debian.org/debian-ports",
 -              ],
 -              asia => [
 -                      "debian.nctu.edu.tw/debian-ports",
++              url => 'http://www.ubuntu.com/',
 +              mirror_list => 'https://launchpad.net/ubuntu/+archivemirrors',
 +              north_america = [
 +      "mirrors.kernel.org/ubuntu",
 +      "ftp.osuosl.org/pub/ubuntu",
 +      "lug.mtu.edu/ubuntu",
 +      "ubuntu.mirrors.tds.net/ubuntu",
 +      "ubuntu.secs.oakland.edu",
 +      "mirror.mcs.anl.gov/pub/ubuntu",
 +      "mirrors.cat.pdx.edu/ubuntu",
 +      "ubuntu.cs.utah.edu/ubuntu",
 +      "ftp.ussg.iu.edu/linux/ubuntu",
 +      "mirrors.xmission.com/ubuntu",
 +      "mirrors.cs.wmich.edu/ubuntu",
 +      "gulus.USherbrooke.ca/pub/distro/ubuntu",
 +                              ],
 +              europa = [
 +      "cz.archive.ubuntu.com/ubuntu",
 +      "de.archive.ubuntu.com/ubuntu",
 +      "dk.archive.ubuntu.com/ubuntu",
 +      "es.archive.ubuntu.com/ubuntu",
 +      "fr.archive.ubuntu.com/ubuntu",
 +      "ge.archive.ubuntu.com/ubuntu",
 +      "gr.archive.ubuntu.com/ubuntu",
 +      "hr.archive.ubuntu.com/ubuntu",
 +      "mt.archive.ubuntu.com/ubuntu",
 +      "nl.archive.ubuntu.com/ubuntu",
 +      "no.archive.ubuntu.com/ubuntu",
 +      "se.archive.ubuntu.com/ubuntu",
 +      "yu.archive.ubuntu.com/ubuntu",
 +                      ],
 +      south_americas = [
 +      "br.archive.ubuntu.com/ubuntu",
 +      "cl.archive.ubuntu.com/ubuntu",
 +      "espelhos.edugraf.ufsc.br/ubuntu",
 +      "ubuntu.c3sl.ufpr.br/ubuntu",
 +                      ],
 +      australia = [
 +      "nz.archive.ubuntu.com/ubuntu",
 +      "nz2.archive.ubuntu.com/ubuntu",
 +      "ftp.iinet.net.au/pub/ubuntu",
 +      "mirror.optus.net/ubuntu",
 +      "ftp.filearena.net/pub/ubuntu",
 +      "mirror.pacific.net.au/linux/ubuntu",
 +              ],
 +      asia = [
 +      "kr.archive.ubuntu.com/ubuntu",
 +      "th.archive.ubuntu.com/ubuntu",
 +      "mirror.lupaworld.com/ubuntu",
 +      "kambing.vlsm.org/ubuntu",
 +      "ubuntu.mithril-linux.org/archives",
 +      "mirror.in.th/ubuntu",
 +      "mirror.rootguide.org/ubuntu",
 +              ],
 +      africa = [
 +      "za.archive.ubuntu.com/ubuntu",
                ],
        },
  }

diff --cc templates/html/foot.tmpl
index d5287c2de38fd44acccb103bc48c43b62ce59054,7944c674cfd3dde188e62a65afb3a414580b7b9c..6dc492550d05ebf6ef95087f23e61a509ac0cd3d
--- 1/templates/html/foot.tmpl
--- 2/templates/html/foot.tmpl
+++ b/templates/html/foot.tmpl
@@@ -1,15 -1,14 +1,15 @@@
  [%- IF benchmark && debug -%]
  Total page evaluation took [% benchmark %]<br>
  [%- END -%]
 -</div> <!-- end inner -->
 +</div></div></div>
  
 +<div class=\"clear mozclear\"></div><div id=\"prefooter\">
  <div id="footer">
  
- [% IF langs.size > 0 %]
+ [% IF langs && langs.size > 0 %]
  <hr class="hidecss">
  <!--UdmComment-->
 -<p>[% g('This page is also available in the following languages (How to set <a href="%s">the default document language</a>):', cn_help_url) %]</p>
 +<p>[% g('This page is also available in the following languages:') %]</p>
  <p class="navpara">
  [% FOREACH l IN langs %]
  <a href="[% IF keyword_esc;

diff --cc templates/html/show.tmpl
Simple merge