Merge remote branch 'origin/debian-master' into archive-master

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

diff --git a/templates/config.tmpl b/templates/config.tmpl
index 92d18d0096e926d7faff9791ca672a4a565bbf3a..af03918735c1c93010950a3dc3df5529fe33f0e8 100644 (file)
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -6,8 +6,7 @@
    organisation = 'Debian'
    project_homepage = 'http://www.debian.org/'
    packages_homepage = '/'
-   packages_homepage_abs = 'http://packages.debian.org/'
-   old_releases = 'http://archive.debian.net/'
+   packages_homepage_abs = 'http://archive.debian.net/'
    searchformurl = packages_homepage
    search_url = '/search'
    tags_url = 'http://debtags.alioth.debian.org/'
@@ -16,15 +15,15 @@
    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 = 'archive.debian.org'
    security_mirror_url = security_mirror _ '/debian-security'
    security_suite_suffix = '/updates'
-   changelogs_url = '/changelogs/'
+   changelogs_url = 'http://archive.debian.net/changelogs/'
    policy_url = 'http://www.debian.org/doc/debian-policy/'
    cn_help_url = project_homepage _ 'intro/cn'
-   patch_tracking_url = 'http://patch-tracker.debian.org/package'
+#   patch_tracking_url = 'http://patch-tracker.debian.org/package'
    screenshots_url = 'http://screenshots.debian.net/package/'
-   screenshots_thumb_url = 'http://screenshots.debian.net/thumbnail/'
+   screenshots_thumb_url = 'http://screenshots.debian.net/thumbnail-with-version/'
    logo = {
        url => project_homepage,
         src => '/Pics/openlogo-nd-25.png',
@@ -43,39 +42,32 @@
        url => project_homepage _ 'trademark'
    }
    contact = {
-       name => g('Debian Web Mailinglist'),
-       mail => 'debian-www@lists.debian.org',
+       name => 'Frank Lichtenheld',
+       mail => 'djpig@debian.org',
         url => project_homepage _ 'contact',
    }
    admin = {
-       name => g('%s Webmaster', organisation),
-       mail => 'webmaster@debian.org',
+       name => 'Frank Lichtenheld',
+       mail => 'djpig@debian.org',
    }
    trademarknotes = g('%s is a <a href="%s">trademark</a> of %s', organisation, trademark.url, trademark.name)
    sponsors = [
-   {
-       url => 'http://1und1.de/',
-       name => '1&1 Internet AG',
-   },
-   {
-       url => 'http://www.hp.com/',
-       name => 'Hewlett-Packard',
-   },
-   {
-       url => 'http://cs.helsinki.fi/index.en.html',
-       name => 'University of Helsinki - Department of Computer Science',
-   },
-   {
-       url => 'http://www.csail.mit.edu/',
-       name => 'MIT Computer Science & Artificial Intelligence Lab',
-   },
+#   {
+#      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.debian.org', 'packages.debian.org') }
-#                 txt => "Site maintainance in progress, some temporary problems might occour." }
+   #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.debian.org', 'packages.debian.org') }
+   sitewidemsg = { importance => "high",
+                  txt => g('Please note that this site contains information about obsolete %s releases; if you search for current data, please use <a href="http://%s/">%s</a>.', organisation, 'packages.debian.org', 'packages.debian.org') }
 -%]
 [%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
 [%- USE num = Number.Format( decimal_point => g('.'),