From: Frank Lichtenheld Date: Sun, 12 Apr 2009 23:14:32 +0000 (+0200) Subject: Merge commit 'alioth/master' into ubuntu-master X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=7484a3adc951c00fd18c530bb88007b5d4632808;p=deb%2Fpackages.git Merge commit 'alioth/master' into ubuntu-master Conflicts: cron.d/100syncarchive_debports templates/config.tmpl templates/config/mirrors.tmpl --- 7484a3adc951c00fd18c530bb88007b5d4632808 diff --cc templates/config.tmpl index 3526f5e,77e6db1..91731bb --- a/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 trademark 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