Merge commit 'alioth/master' into ubuntu-master

Conflicts:
	cron.d/100syncarchive_debports
	templates/config.tmpl
	templates/config/mirrors.tmpl

diff --cc bin/parse-contents
Simple merge

diff --cc templates/config.tmpl
index 3526f5e707cf7fc0ae779f4d5bb953bdf191ad8f,77e6db13984fe4f7fbb116c57f29f702b771e852..91731bbe955a866c66a9d34024a1d15776129498
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -3,9 -3,10 +3,10 @@@
     po_lang = 'en'
     ddtp_lang = 'en'
  
 -   organisation = 'Debian'
 -   project_homepage = 'http://www.debian.org/'
 +   organisation = 'Ubuntu'
 +   project_homepage = 'http://www.ubuntu.com/'
-    packages_homepage = 'http://packages.ubuntu.com/'
+    packages_homepage = '/'
 -   packages_homepage_abs = 'http://packages.debian.net/'
++   packages_homepage_abs = 'http://packages.ubuntu.com/'
     searchformurl = packages_homepage
     search_url = '/search'
     tags_url = 'http://debtags.alioth.debian.org/'
@@@ -37,22 -37,28 +38,28 @@@
     }
     trademark = {
        name => copyright.name,
 -      url => project_homepage _ 'trademark'
 +      url => project_homepage _ 'aboutus/trademarkpolicy'
     }
     contact = {
 -      name => g('Debian Web Mailinglist'),
 -      mail => 'debian-www@lists.debian.org',
 -        url => project_homepage _ 'contact',
 +      name => 'Frank Lichtenheld',
 +      mail => 'frank@lichtenheld.de',
 +        url => project_homepage _ 'support',
     }
     admin = {
 -      name => g('%s Webmaster', organisation),
 -      mail => 'webmaster@debian.org',
 +      name => 'Frank Lichtenheld',
 +      mail => 'frank@lichtenheld.de',
     }
     trademarknotes = g('%s is a <a href="%s">trademark</a> of %s', organisation, trademark.url, trademark.name)
- #   sponsor = {
- #     url => 'http://example.invalid/',
- #     name => 'Example Sponsor, Inc.',
- #   }
+    sponsors = [
+    {
+       url => 'http://example.invalid/',
+       name => 'Example Sponsor, Inc.',
+    },
+    {
+       url => 'http://example2.invalid/',
+       name => 'Example2 Sponsor, Inc.',
+    },
+    ]
  -%]
  [%-
     # possible values for importance: high, normal, low

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

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