The following commit has been merged in the debian-master branch:
commit cc64e538174791c4999696bb47fd1bdc585384f0
Merge: b3b605e02a0cc13e7f70de400c93c1ef21a4273e
74d7be314bf1a32288e89a7f020910bbe37e0b60
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Fri May 2 14:59:33 2008 +0200
Merge branch 'master' into debian-master
diff --combined config.sh.sed.in
index 5d58e84,9fddcb8..7feedbc
--- 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=/org/ftp.root/debian
# path to private ftp directory
#ftproot=/org/ftp.root
@@@ -32,9 -32,12 +32,12 @@@ amd64_ftpsite=http://amd64.debian.net/d
debports_ftpsite=http://ftp.debian-ports.org/debian
ddtp_ftpsite=http://ddtp.debian.net/debian
- wget_cmd="wget --no-verbose --tries=2 --timeout=60"
+ wget_cmd="wget --no-verbose --tries=2 --timeout=60"
+ check_release_cmd="perl -I${libdir} ${bindir}/check-release --verbose
--ignoremissing --keyring ${configdir}/trusted.gpg"
+ # URLs that need to be known in the code (as opposed to the templates)
root=""
+ search_url="/search"
# Architectures
#
diff --combined templates/config.tmpl
index addbd8d,3e91e26..f7392b8
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -5,9 -5,9 +5,9 @@@
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_url = '/search'
tags_url = 'http://debtags.alioth.debian.org/'
bugs_url = 'http://bugs.debian.org/'
pts_url = 'http://packages.qa.debian.org/'
@@@ -50,9 -50,8 +50,9 @@@
-%]
[%-
# 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]
