From: Gerfried Fuchs Date: Mon, 30 Aug 2010 18:27:35 +0000 (+0200) Subject: Merge branch 'master' into archive-master X-Git-Url: https://git.deb.at/?a=commitdiff_plain;ds=sidebyside;h=819a72ebf5dc96d6b36d0a36da859e97fb2733e4;hp=-c;p=deb%2Fpackages.git Merge branch 'master' into archive-master --- 819a72ebf5dc96d6b36d0a36da859e97fb2733e4 diff --combined config.sh.sed.in index 25db2cc,92679b8..4590580 --- a/config.sh.sed.in +++ b/config.sh.sed.in @@@ -19,16 -19,17 +19,16 @@@ 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/archive.debian.org/ftp # 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.debian.org/debian +security_ftpsite=http://archive.debian.org/debian-security +volatile_ftpsite=http://archive.debian.org/debian-volatile +backports_ftpsite=http://archive.debian.org/backports.org +ddtp_ftpsite=http://ftp.de.debian.org/debian wget_cmd="wget --no-verbose --tries=2 --timeout=60" check_release_cmd="perl -I${libdir} ${bindir}/check-release --verbose --ignoremissing --keyring ${configdir}/trusted.gpg" @@@ -39,22 -40,22 +39,22 @@@ search_url="/search # Architectures # - polangs="bg de fi fr hu ja nl ru sk sv uk zh-cn" + polangs="bg de fi fr hu ja nl ru sk sv uk zh-cn zh-tw" 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" +archives="us security backports volatile" sections="main contrib non-free" parts="$sections" -suites="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile lenny-backports squeeze sid experimental" +suites="bo hamm slink potato woody sarge sarge-volatile sarge-backports" 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 hppa i386 ia64 m68k mips mipsel powerpc s390 sparc" +arch_bo="i386" +arch_hamm="i386 m68k" +arch_slink="alpha i386 m68k sparc" +arch_potato="alpha arm i386 ia64 m68k powerpc sparc" +arch_woody="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc" +arch_sarge="${arch_woody}" 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 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 templates/config.tmpl index 8c86558,aa1dee5..1500a8f --- a/templates/config.tmpl +++ b/templates/config.tmpl @@@ -6,7 -6,8 +6,7 @@@ organisation = 'Debian' project_homepage = 'http://www.debian.org/' packages_homepage = '/' - packages_homepage_abs = 'http://packages.debian.net/' - old_releases = 'http://archive.debian.net/' + packages_homepage_abs = 'http://archive.debian.net/' searchformurl = packages_homepage search_url = '/search' tags_url = 'http://debtags.alioth.debian.org/' @@@ -15,13 -16,15 +15,15 @@@ ddpo_url = 'http://qa.debian.org/developer.php?login=' src_bugs_url = bugs_url _ 'src:' mirror_url = 'http://ftp.debian.org/' - security_mirror = 'security.debian.org' + security_mirror = 'archive.debian.org' security_mirror_url = security_mirror _ '/debian-security' security_suite_suffix = '/updates' - changelogs_url = 'http://packages.debian.org/changelogs/' + changelogs_url = 'http://archive.debian.net/changelogs/' policy_url = 'http://www.debian.org/doc/debian-policy/' cn_help_url = project_homepage _ 'intro/cn' - patch_tracking_url = 'http://patch-tracker.debian.org/package' - screenshots_url = 'http://screenshots.debian.net/package/' - screenshots_thumb_url = 'http://screenshots.debian.net/thumbnail/' +# patch_tracking_url = 'http://patch-tracker.debian.org/package' ++# screenshots_url = 'http://screenshots.debian.net/package/' ++# screenshots_thumb_url = 'http://screenshots.debian.net/thumbnail/' logo = { url => project_homepage, src => '/Pics/openlogo-nd-25.png', @@@ -40,32 -43,30 +42,32 @@@ url => project_homepage _ 'trademark' } contact = { - name => g('Debian Web Mailinglist'), - mail => 'debian-www@lists.debian.org', + name => 'Frank Lichtenheld', + mail => 'djpig@debian.org', url => project_homepage _ 'contact', } admin = { - name => g('%s Webmaster', organisation), - mail => 'webmaster@debian.org', + name => 'Frank Lichtenheld', + mail => 'djpig@debian.org', } trademarknotes = g('%s is a trademark of %s', organisation, trademark.url, trademark.name) sponsors = [ - { - url => 'http://example.invalid/', - name => 'Example Sponsor, Inc.', - }, - { - url => 'http://example2.invalid/', - name => 'Example2 Sponsor, Inc.', - }, +# { +# url => 'http://example.invalid/', +# name => 'Example Sponsor, Inc.', +# }, +# { +# url => 'http://example2.invalid/', +# name => 'Example2 Sponsor, Inc.', +# }, ] -%] [%- # possible values for importance: high, normal, low + #sitewidemsg = { importance => "high", + # txt => g('Please note that this is an experimental version of %s. 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 %s. Errors and obsolete information should be expected', 'packages.debian.org', 'packages.debian.org') } + txt => g('Please note that this site contains information about obsolete %s releases; if you search for current data, please use %s.', organisation, 'packages.debian.org', 'packages.debian.org') } -%] [%# @translators: . = decimal_point , = thousands_sep, see Number::Format %] [%- USE num = Number.Format( decimal_point => g('.'),