The following commit has been merged in the debian-master branch:
commit 1e80ad6aa16dd270f2b4fefc702963ba50fac32b
Merge: 612e2b9e36627ebfbd2cc1e86f94ae90782d1b35
a27d9febd751f81ad7d48ce64a15ba68f36ff049
Author: Gerfried Fuchs <[email protected]>
Date: Mon Sep 13 08:53:31 2010 +0200
Merge branch 'master' into debian-master
diff --combined config.sh.sed.in
index 8bd89ba,09d080c..fae15fe
--- 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
@@@ -45,15 -45,17 +45,15 @@@ ddtplangs="ca cs da de eo es eu fi fr h
archives="us security debports backports volatile"
sections="main contrib non-free"
parts="$sections"
-suites="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile
lenny-backports squeeze squeeze-backports sid experimental"
+suites="lenny lenny-volatile lenny-backports squeeze squeeze-backports sid
experimental"
priorities="required important standard optional extra"
dists="$suites"
- architectures="alpha amd64 arm armel avr32 hppa hurd-i386 i386 ia64
kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc"
+ architectures="alpha amd64 arm armel avr32 hppa hurd-i386 i386 ia64
kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc powerpcspe s390 sh4 sparc
sparc64"
-arch_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
-arch_lenny="${arch_etch} armel"
+arch_lenny="alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390
sparc"
arch_squeeze="alpha amd64 armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64
mips mipsel powerpc s390 sparc"
- arch_sid="${arch_squeeze} avr32 hurd-i386 m68k"
+ arch_sid="${arch_squeeze} avr32 hurd-i386 m68k powerpcspe sh4 sparc64"
arch_experimental="${arch_sid}"
arch_lenny_proposed_updates="${arch_lenny}"
-arch_etch_proposed_updates="${arch_etch}"
# Miscellaneous
#
diff --combined templates/html/homepage.tmpl
index 3499aee,bdb8f3c..90f428b
--- a/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@@ -11,9 -11,10 +11,10 @@@
lenny => '5.0' }
current_release = 'lenny'
all_sections = [ 'main', 'contrib', 'non-free' ]
- all_architectures = [ 'alpha', 'arm', 'armel', 'amd64', 'avr32', 'hppa',
'i386',
- 'ia64', 'kfreebsd-amd64', 'kfreebsd-i386', 'mips',
- 'mipsel', 'm68k', 'powerpc', 's390', 'sparc' ]
+ all_architectures = [ 'alpha', 'arm', 'armel', 'amd64', 'avr32',
'hppa', 'i386',
+ 'ia64', 'kfreebsd-amd64', 'kfreebsd-i386', 'mips',
+ 'mipsel', 'm68k', 'powerpc', 'powerpcspe',
's390', 'sh4',
+ 'sparc', 'sparc64' ]
-%]
<p>[% g('This site provides you with information about all the packages
available in the <a href="%s">%s</a> Package archive.', project_homepage,
organisation) %]</p>
@@@ -117,4 -118,4 +118,4 @@@ Distribution
</select>
</form>
-[% PROCESS 'html/foot.tmpl' page_name=packages_homepage copyright.years =
'1997 - 2009' %]
+[% PROCESS 'html/foot.tmpl' page_name=packages_homepage copyright.years =
'1997 - 2010' %]
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
