Merge branch 'master' into ubuntu-master

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

diff --git a/templates/config.tmpl b/templates/config.tmpl
index d08c26a7df0a3360719cb1270c017359260ae966..0cc78480e3ed331059a4a1be78b3d25a36b2cc25 100644 (file)
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -5,9 +5,10 @@
 
    organisation = 'Ubuntu'
    project_homepage = 'http://www.ubuntu.com/'
-   packages_homepage = 'http://packages.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/'
@@ -21,6 +22,7 @@
    changelogs_url = 'http://changelogs.ubuntu.com/changelogs/'
    policy_url = 'http://www.debian.org/doc/debian-policy/'
 #   cn_help_url = project_homepage _ 'intro/cn'
+#   patch_tracking_url = 'http://patch-tracking.debian.net/package'
    logo = {
        url => project_homepage,
         src => '/Pics/openlogo-nd-25.png',
@@ -36,7 +38,7 @@
    }
    trademark = {
        name => copyright.name,
-       url => project_homepage _ 'trademark'
+       url => project_homepage _ 'aboutus/trademarkpolicy'
    }
    contact = {
        name => 'Frank Lichtenheld',
@@ -48,11 +50,19 @@
        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 => 'Site switched to completly new codebase. Please report any problems.' }
 #   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') }
 -%]