Merge branch 'master' into ubuntu-master

[deb/packages.git] / templates / config.tmpl

diff --git a/templates/config.tmpl b/templates/config.tmpl
index 9b71c474e604e39f24fd2e9f39d5465d501645b9..0cc78480e3ed331059a4a1be78b3d25a36b2cc25 100644 (file)
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -4,10 +4,11 @@
    ddtp_lang = 'en'
 
    organisation = 'Ubuntu'
-   homepage = 'http://www.ubuntu.com/'
-   packages_homepage = 'http://packages.ubuntu.lichtenheld.net/'
+   project_homepage = 'http://www.ubuntu.com/'
+   packages_homepage = '/'
+   packages_homepage_abs = 'http://packages.ubuntu.com/'
    searchformurl = packages_homepage
-   search_url = '/'
+   search_url = '/search'
    tags_url = 'http://debtags.alioth.debian.org/'
    bugs_url = 'http://bugs.debian.org/'
    launchpad_url = 'https://launchpad.net/distros/ubuntu/+source/'
@@ -20,9 +21,10 @@
    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 = project_homepage _ 'intro/cn'
+#   patch_tracking_url = 'http://patch-tracking.debian.net/package'
    logo = {
-       url => homepage,
+       url => project_homepage,
         src => '/Pics/openlogo-nd-25.png',
         alt => organisation,
    }
@@ -32,27 +34,37 @@
         years => timestamp.year,
    }
    license = {
-       url => homepage _ 'legal'
+       url => project_homepage _ 'legal'
    }
    trademark = {
        name => copyright.name,
-       url => homepage _ 'trademark'
+       url => project_homepage _ 'aboutus/trademarkpolicy'
    }
    contact = {
        name => 'Frank Lichtenheld',
        mail => 'frank@lichtenheld.de',
-        url => homepage _ 'support',
+        url => project_homepage _ 'support',
    }
    admin = {
        name => 'Frank Lichtenheld',
        mail => 'frank@lichtenheld.de',
    }
    trademarknotes = g('%s is a <a href="%s">trademark</a> of %s', organisation, trademark.url, trademark.name)
+#   sponsors = [
+#   {
+#      url => 'http://example.invalid/',
+#      name => 'Example Sponsor, Inc.',
+#   },
+#   {
+#      url => 'http://example2.invalid/',
+#      name => 'Example2 Sponsor, Inc.',
+#   },
+#   ]
 -%]
 [%-
    # possible values for importance: high, normal, low
-   sitewidemsg = { importance => "high",
-                  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') }
+#   sitewidemsg = { importance => "high",
+#                 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('.'),