From: Frank Lichtenheld Date: Thu, 11 Jun 2009 17:44:59 +0000 (+0200) Subject: Merge branch 'master' into archive-master X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=b2b9a31b9adfdd251590eb1bfb72c95d5538e392;p=deb%2Fpackages.git Merge branch 'master' into archive-master Conflicts: config.sh.sed.in cron.d/100syncarchive_backports cron.d/100syncarchive_debports cron.d/100syncarchive_m68k lib/Deb/Versions.pm lib/Packages/DoSearchContents.pm lib/Packages/DoShow.pm static/index.tmpl templates/config.tmpl templates/config/mirrors.tmpl --- b2b9a31b9adfdd251590eb1bfb72c95d5538e392 diff --cc config.sh.sed.in index eb96154,4e228e4..50f6dc1 --- a/config.sh.sed.in +++ b/config.sh.sed.in @@@ -39,21 -40,22 +39,21 @@@ 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" +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" -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}" +architectures="alpha 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}" # Miscellaneous # diff --cc lib/Deb/Versions.pm index eb83819,774c9b5..9c50a4c --- a/lib/Deb/Versions.pm +++ b/lib/Deb/Versions.pm @@@ -152,11 -165,16 +165,16 @@@ sub _lcmp return length( $v1 ) <=> length( $v2 ); } - our @SUITES_SORT = qw( bo hamm slink potato woody - oldstable sarge stable stable-proposed-updates - etch etch-m68k testing testing-proposed-updates lenny - sid unstable experimental - warty hoary breezy dapper edgy feisty gutsy intrepid jaunty); -our @SUITES_SORT = qw( woody ++our @SUITES_SORT = qw( bo hamm slink potato woody + sarge + oldstable + etch etch-m68k + stable stable-proposed-updates + lenny + testing testing-proposed-updates + squeeze + sid unstable experimental + warty hoary breezy dapper edgy feisty gutsy hardy intrepid jaunty); our @ARCHIVE_SORT = qw( non-US security updates volatile backports ); our @PRIORITY_SORT = qw( required important standard optional extra ); my $i = 1000; diff --cc templates/config.tmpl index 50d7b75,77e6db1..828a1c8 --- 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://archive.debian.net/' + packages_homepage = '/' - packages_homepage_abs = 'http://packages.debian.net/' ++ packages_homepage_abs = 'http://archive.debian.net/' searchformurl = packages_homepage search_url = '/search' tags_url = 'http://debtags.alioth.debian.org/' @@@ -44,14 -45,20 +45,20 @@@ 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) - # sponsor = { - # url => 'http://example.invalid/', - # name => 'Example Sponsor, Inc.', - # } + sponsors = [ + { + url => 'http://example.invalid/', + name => 'Example Sponsor, Inc.', + }, + { + url => 'http://example2.invalid/', + name => 'Example2 Sponsor, Inc.', + }, + ] -%] [%- # possible values for importance: high, normal, low