Merge branch 'master' into ubuntu-master

Conflicts:

	cron.d/100syncarchive
	cron.d/300maintainerdb
	templates/config.tmpl
	templates/config/mirrors.tmpl

diff --combined templates/config.tmpl
index 451b0e60ff668c10c2acc1863274302ab129ff83,294d8f0a1ee8a3b3e764facbc44473621230f23a..9b71c474e604e39f24fd2e9f39d5465d501645b9
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -3,56 -3,55 +3,56 @@@
     po_lang = 'en'
     ddtp_lang = 'en'
  
 -   organisation = 'Debian'
 -   homepage = 'http://www.debian.org/'
 -   packages_homepage = 'http://packages.debian.net/'
 +   organisation = 'Ubuntu'
 +   homepage = 'http://www.ubuntu.com/'
 +   packages_homepage = 'http://packages.ubuntu.lichtenheld.net/'
     searchformurl = packages_homepage
     search_url = '/'
     tags_url = 'http://debtags.alioth.debian.org/'
     bugs_url = 'http://bugs.debian.org/'
 +   launchpad_url = 'https://launchpad.net/distros/ubuntu/+source/'
     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 = homepage _ 'intro/cn'
 +#   cn_help_url = homepage _ 'intro/cn'
     logo = {
        url => homepage,
          src => '/Pics/openlogo-nd-25.png',
          alt => organisation,
     }
     copyright = {
 -      url => 'http://www.spi-inc.org/',
 -        name => 'SPI Inc.',
 -        years => '1997 - ' _ timestamp.year,
 +      url => 'http://www.canonical.com/',
 +        name => 'Canonical Ltd.',
 +        years => timestamp.year,
     }
     license = {
 -      url => homepage _ 'license'
 +      url => homepage _ 'legal'
     }
     trademark = {
        name => copyright.name,
        url => homepage _ 'trademark'
     }
     contact = {
 -      name => g('Debian Web Mailinglist'),
 -      mail => 'debian-www@lists.debian.org',
 -        url => homepage _ 'contact',
 +      name => 'Frank Lichtenheld',
 +      mail => 'frank@lichtenheld.de',
 +        url => 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)
  -%]
  [%-
     # possible values for importance: high, normal, low
     sitewidemsg = { importance => "high",
-                  txt => g('Please note that this is an experimental version of <a href="http://packages.ubuntu.com/">packages.ubuntu.com</a>. Errors and obsolete information should be expected') }
 -                 txt => g('Please note that this is an experimental version of <a href="http://%s/">%s</a>. Errors and obsolete information should be expected', 'packages.debian.org', 'packages.debian.org') }
++                 txt => g('Please note that this is an experimental version of <a href="http://%s/">%s</a>. Errors and obsolete information should be expected', 'packages.ubuntu.com', 'packages.ubuntu.com') }
  -%]
  [%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
  [%- USE num = Number.Format( decimal_point => g('.'),