The following commit has been merged in the debian-master branch:
commit 7a62bb904edb6a895752ddc61ad6a8a1a95151e4
Merge: 82c671b748143c54658ca42069f95c3ec391183a
2b844aa9bea0db0d63db27975b275dde295bcd94
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Fri Oct 3 12:29:20 2008 +0200
Merge commit 'alioth/master' into debian-master
diff --combined config.sh.sed.in
index 56b4ab8,63bc714..e8b5148
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -19,7 -19,7 +19,7 @@@ cachedir=${topdir}/cach
# unset this if %SITE% moves somewhere where the packages files
# cannot be obtained locally
#
-#localdir=/org/ftp.debian.org/debian
+localdir=/srv/ftp.debian.org/ftp
# path to private ftp directory
#ftproot=/org/ftp.root
@@@ -42,7 -42,7 +42,7 @@@ search_url="/search
# Architectures
#
polangs="de fi fr hu ja nl ru sv uk zh-cn"
- ddtplangs="ca cs da de eo es fi fr hu it ja km-kh ko nl pl pt pt-br ru sk sv
uk zh-cn zh-tw"
+ ddtplangs="ca cs da de eo es eu fi fr hu it ja km ko nl pl pt pt-br ru sk sv
uk zh zh-cn zh-tw"
archives="us security amd64 debports backports volatile"
sections="main contrib non-free"
parts="$sections"
diff --combined templates/config.tmpl
index e79d091,5ce7cc7..22f00a0
--- 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://packages.debian.org/'
searchformurl = packages_homepage
search_url = '/search'
tags_url = 'http://debtags.alioth.debian.org/'
@@@ -20,6 -20,7 +20,7 @@@
changelogs_url = 'http://packages.debian.org/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',
@@@ -47,16 -48,15 +48,16 @@@
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.',
-# }
+ sponsor = {
+ url => 'http://1und1.de/',
+ name => '1&1 Internet AG',
+ }
-%]
[%-
# 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]
