The following commit has been merged in the ubuntu-master branch:
commit 70fbc048de65db4f013ce06b16fa5e01fc26c8b0
Merge: 0a408bcfa254712cd4f4ed0bd19bc24d412a6eb6
53ec702600ecf0c792e9df5e6422a77e92ce5ad6
Author: Frank Lichtenheld <[email protected]>
Date: Thu Jun 11 19:26:31 2009 +0200
Merge branch 'master' into ubuntu-master
Conflicts:
config.sh.sed.in
diff --combined config.sh.sed.in
index b82322d,4e228e4..8ab6a25
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -24,9 -24,12 +24,9 @@@ cachedir=${topdir}/cach
# path to private ftp directory
#ftproot=/org/ftp.root
-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
-debports_ftpsite=http://ftp.debian-ports.org/debian
-ddtp_ftpsite=
+ftpsite=http://archive.ubuntu.com/ubuntu
+security_ftpsite=http://archive.ubuntu.com/ubuntu
+#ddtp_ftpsite=http://archive.ubuntu.com/ubuntu
wget_cmd="wget --no-verbose --tries=2 --timeout=60"
check_release_cmd="perl -I${libdir} ${bindir}/check-release --verbose
--ignoremissing --keyring ${configdir}/trusted.gpg"
@@@ -37,30 -40,22 +37,30 @@@ search_url="/search
# Architectures
#
- polangs="de fi fr hu ja nl ru sv uk zh-cn"
+ polangs="de fi fr hu ja nl ru sk sv uk zh-cn"
-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 debports backports volatile"
-sections="main contrib non-free"
+ddtplangs="be ca cs da de en-gb eo es et eu fi fr gl hu id it ja ka km ko lt
ml nl oc pl pt pt-br ro ru sk sl sv tr uk vi zh-cn zh-hk zh-tw"
+archives="us security"
+sections="main multiverse restricted universe"
parts="$sections"
-suites="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile
lenny-backports squeeze sid experimental"
-priorities="required important standard optional extra"
+suites="dapper dapper-updates dapper-backports hardy hardy-updates
hardy-backports intrepid intrepid-updates intrepid-backports jaunty
jaunty-updates jaunty-backports karmic"
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_squeeze="alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc"
-arch_sid="${arch_squeeze} avr32 hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k"
-arch_experimental="${arch_sid}"
-arch_lenny_proposed_updates="${arch_lenny}"
-arch_etch_proposed_updates="${arch_etch}"
+priorities="required important standard optional extra"
+architectures="i386 amd64 powerpc"
+arch_dapper="i386 amd64 powerpc"
+arch_dapper_updates="${arch_dapper}"
+arch_dapper_backports="${arch_dapper}"
+arch_hardy="i386 amd64"
+arch_hardy_updates="${arch_hardy}"
+arch_hardy_backports="${arch_hardy}"
+arch_intrepid="${arch_hardy}"
+arch_intrepid_updates="${arch_intrepid}"
+arch_intrepid_backports="${arch_intrepid}"
+arch_jaunty="${arch_intrepid}"
+arch_jaunty_updates="${arch_jaunty}"
+arch_jaunty_backports="${arch_jaunty}"
+arch_karmic="${arch_jaunty}"
+arch_karmic_updates="${arch_karmic}"
+arch_karmic_backports="${arch_karmic}"
# Miscellaneous
#
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
