The following commit has been merged in the debian-master branch:
commit 8f9b848244e4a32f420260bb01362ce147f1781e
Merge: 7b9c982f4855eb06a98a8c3a663761a1fea5cc51
3d5a72874e7898645841a33b357af6ec2eff226b
Author: Gerfried Fuchs <[email protected]>
Date: Tue Nov 9 20:36:39 2010 +0100
Merge branch 'master' into debian-master
diff --combined templates/config.tmpl
index 92d18d0,4d24e05..9d5d3ea
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -6,7 -6,7 +6,7 @@@
organisation = 'Debian'
project_homepage = 'http://www.debian.org/'
packages_homepage = '/'
- packages_homepage_abs = 'http://packages.debian.net/'
+ packages_homepage_abs = 'http://packages.debian.org/'
old_releases = 'http://archive.debian.net/'
searchformurl = packages_homepage
search_url = '/search'
@@@ -19,12 -19,12 +19,12 @@@
security_mirror = 'security.debian.org'
security_mirror_url = security_mirror _ '/debian-security'
security_suite_suffix = '/updates'
- changelogs_url = 'http://packages.debian.org/changelogs/'
+ changelogs_url = '/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'
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',
@@@ -54,28 -54,19 +54,28 @@@
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://1und1.de/',
+ name => '1&1 Internet AG',
},
{
- url => 'http://example2.invalid/',
- name => 'Example2 Sponsor, Inc.',
+ 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',
},
]
-%]
[%-
# 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') }
+# 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." }
-%]
[%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
[%- USE num = Number.Format( decimal_point => g('.'),
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
