The following commit has been merged in the debian-master branch:
commit 612e2b9e36627ebfbd2cc1e86f94ae90782d1b35
Merge: 3fea9935b57097d1275b3139dd3dc89e07dfcf5e
124a3f1f7d55089e3b369bf2495495db8b6e1d6a
Author: Gerfried Fuchs <[email protected]>
Date: Sat Sep 11 19:36:55 2010 +0200
Merge branch 'master' into debian-master
diff --combined config.sh.sed.in
index fe395be,d3dde1f..8bd89ba
--- 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
@@@ -27,7 -27,7 +27,7 @@@
ftpsite=http://ftp.de.debian.org/debian
security_ftpsite=http://security.debian.org/debian-security
volatile_ftpsite=http://volatile.debian.org/debian-volatile
- backports_ftpsite=http://backports.org/debian
+ backports_ftpsite=http://backports.debian.org/debian-backports
debports_ftpsite=http://ftp.debian-ports.org/debian
ddtp_ftpsite=
@@@ -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="lenny lenny-volatile lenny-backports squeeze sid experimental"
-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"
-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_experimental="${arch_sid}"
arch_lenny_proposed_updates="${arch_lenny}"
-arch_etch_proposed_updates="${arch_etch}"
# Miscellaneous
#
diff --combined static/packages-site.css
index 7254f37,dc09e55..dcd43c5
--- a/static/packages-site.css
+++ b/static/packages-site.css
@@@ -1,17 -1,4 +1,17 @@@
.sarge-volatile, .sarge-backports, .etch-m68k, .etch-backports,
- .lenny-volatile, .lenny-backports {
+ .lenny-volatile, .lenny-backports .squeeze-backports {
font-size: smaller;
}
+
+table#sponsorslist {
+ text-align: center;
+ border: 1px solid black;
+ padding: 1em;
+ border-collapse: collapse;
+ empty-cells: show;
+}
+
+#sponsorslist th, #sponsorslist td {
+ border: 1px solid black;
+ padding: .5em;
+}
diff --combined templates/html/homepage.tmpl
index 2c91e2a,5b1b293..3499aee
--- a/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@@ -4,7 -4,8 +4,8 @@@
keywords = g('Packages')
-%]
[%-
- all_suites = [ 'lenny', 'lenny-volatile', 'lenny-backports', 'squeeze',
'sid' ]
+ all_suites = [ 'etch', 'etch-m68k', 'etch-volatile', 'etch-backports',
+ 'lenny', 'lenny-volatile', 'lenny-backports', 'squeeze',
'squeeze-backports', 'sid' ]
version_numbers = { sarge => '3.1',
etch => '4.0',
lenny => '5.0' }
@@@ -116,4 -117,4 +117,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]
