The following commit has been merged in the archive-master branch:
commit ba6fa55e176be2e079c8a46a8c6fdd5e06184e21
Merge: 1c11bb86bf5ae74dd41f0d23193e955f806109ad
c8f25b919183b1416bc717c59ab8b0d7de6c9374
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Tue Aug 5 18:10:15 2008 -0300
Merge branch 'master' into archive-master
diff --combined templates/config.tmpl
index 70f14a8,98525eb..719dcf9
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -5,7 -5,7 +5,7 @@@
organisation = 'Debian'
project_homepage = 'http://www.debian.org/'
- packages_homepage = 'http://packages.debian.net/'
+ packages_homepage = 'http://archive.debian.net/'
searchformurl = packages_homepage
search_url = '/search'
tags_url = 'http://debtags.alioth.debian.org/'
@@@ -17,7 -17,7 +17,7 @@@
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 = 'http://archive.debian.net/changelogs/'
policy_url = 'http://www.debian.org/doc/debian-policy/'
cn_help_url = project_homepage _ 'intro/cn'
logo = {
@@@ -38,22 -38,24 +38,26 @@@
url => project_homepage _ 'trademark'
}
contact = {
- name => g('Debian Web Mailinglist'),
- mail => '[EMAIL PROTECTED]',
+ name => 'Frank Lichtenheld',
+ mail => '[EMAIL PROTECTED]',
url => project_homepage _ 'contact',
}
admin = {
- name => g('%s Webmaster', organisation),
- mail => '[EMAIL PROTECTED]',
+ name => 'Frank Lichtenheld',
+ mail => '[EMAIL PROTECTED]',
}
trademarknotes = g('%s is a <a href="%s">trademark</a> 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 <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 => 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('.'),
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
