From: Frank Lichtenheld Date: Tue, 5 Aug 2008 21:09:28 +0000 (-0300) Subject: Merge branch 'master' into ubuntu-master X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=90b972730bae671e726706892b471e0ce0ac097a;hp=-c;p=deb%2Fpackages.git Merge branch 'master' into ubuntu-master Conflicts: templates/html/foot.tmpl --- 90b972730bae671e726706892b471e0ce0ac097a diff --combined templates/config.tmpl index 9b02b63,98525eb..d6e9bd6 --- a/templates/config.tmpl +++ b/templates/config.tmpl @@@ -3,56 -3,59 +3,60 @@@ po_lang = 'en' ddtp_lang = 'en' - organisation = 'Debian' - project_homepage = 'http://www.debian.org/' - packages_homepage = 'http://packages.debian.net/' + organisation = 'Ubuntu' + project_homepage = 'http://www.ubuntu.com/' + packages_homepage = 'http://packages.ubuntu.com/' searchformurl = packages_homepage search_url = '/search' 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 = project_homepage _ 'intro/cn' +# cn_help_url = project_homepage _ 'intro/cn' logo = { url => project_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 => project_homepage _ 'license' + url => project_homepage _ 'legal' } 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.', + # } -%] [%- # possible values for importance: high, normal, low - sitewidemsg = { importance => "high", - txt => g('Please note that this is an experimental version of %s. Errors and obsolete information should be expected', 'packages.debian.org', 'packages.debian.org') } +# sitewidemsg = { importance => "high", +# txt => g('Please note that this is an experimental version of %s. 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('.'), diff --combined templates/html/foot.tmpl index ba4e030,cbabd66..580e280 --- a/templates/html/foot.tmpl +++ b/templates/html/foot.tmpl @@@ -1,15 -1,14 +1,15 @@@ [%- IF benchmark && debug -%] Total page evaluation took [% benchmark %]
[%- END -%] - + +
-
+