From: Frank Lichtenheld Date: Sun, 15 Mar 2009 18:49:58 +0000 (+0100) Subject: Merge commit 'alioth/master' into debian-master X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=1fbeeb0e19b44543525a8a36e7d5a1b5d386c4ec;p=deb%2Fpackages.git Merge commit 'alioth/master' into debian-master Conflicts: templates/config.tmpl --- 1fbeeb0e19b44543525a8a36e7d5a1b5d386c4ec diff --cc templates/config.tmpl index 68531a8,77e6db1..b1ae799 --- a/templates/config.tmpl +++ b/templates/config.tmpl @@@ -5,7 -5,8 +5,8 @@@ organisation = 'Debian' project_homepage = 'http://www.debian.org/' - packages_homepage = 'http://packages.debian.org/' + packages_homepage = '/' - packages_homepage_abs = 'http://packages.debian.net/' ++ packages_homepage_abs = 'http://packages.debian.org/' searchformurl = packages_homepage search_url = '/search' tags_url = 'http://debtags.alioth.debian.org/' @@@ -48,10 -49,16 +49,12 @@@ mail => 'webmaster@debian.org', } trademarknotes = g('%s is a trademark of %s', organisation, trademark.url, trademark.name) - sponsor = { + sponsors = [ + { - url => 'http://example.invalid/', - name => 'Example Sponsor, Inc.', - }, - { - url => 'http://example2.invalid/', - name => 'Example2 Sponsor, Inc.', - }, + url => 'http://1und1.de/', + name => '1&1 Internet AG', + } + ] -%] [%- # possible values for importance: high, normal, low