The following commit has been merged in the debian-master branch:
commit 1fbeeb0e19b44543525a8a36e7d5a1b5d386c4ec
Merge: 6c216987d1e3085640d6ce511b35d68ea5adc84f
d4847b84cec9655e66d5faf9e9078c86bec11ecd
Author: Frank Lichtenheld <[email protected]>
Date: Sun Mar 15 19:49:58 2009 +0100
Merge commit 'alioth/master' into debian-master
Conflicts:
templates/config.tmpl
diff --combined config.sh.sed.in
index b6709c1,f9c1b07..b85a83b
--- 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/mirrors/ftp.debian.org
# path to private ftp directory
#ftproot=/org/ftp.root
@@@ -51,7 -51,7 +51,7 @@@ dists="$suites
architectures="alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc"
arch_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
arch_lenny="${arch_etch} armel"
- arch_squeeze="${arch_lenny}"
+ arch_squeeze="alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc"
arch_sid="${arch_squeeze} hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k"
arch_experimental="${arch_sid}"
arch_lenny_proposed_updates="${arch_lenny}"
diff --combined templates/config.tmpl
index 68531a8,77e6db1..b1ae799
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -5,7 -5,8 +5,8 @@@
organisation = 'Debian'
project_homepage = 'http://www.debian.org/'
- packages_homepage = 'http://packages.debian.org/'
+ packages_homepage = '/'
- packages_homepage_abs = 'http://packages.debian.net/'
++ packages_homepage_abs = 'http://packages.debian.org/'
searchformurl = packages_homepage
search_url = '/search'
tags_url = 'http://debtags.alioth.debian.org/'
@@@ -17,7 -18,7 +18,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 = '/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'
@@@ -48,16 -49,21 +49,18 @@@
mail => '[email protected]',
}
trademarknotes = g('%s is a <a href="%s">trademark</a> of %s',
organisation, trademark.url, trademark.name)
- sponsor = {
+ sponsors = [
+ {
- url => 'http://example.invalid/',
- name => 'Example Sponsor, Inc.',
- },
- {
- url => 'http://example2.invalid/',
- name => 'Example2 Sponsor, Inc.',
- },
+ 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]
