From: Frank Lichtenheld Date: Tue, 28 Oct 2008 18:19:16 +0000 (+0000) Subject: Merge commit 'origin/master' into debian-master X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=c5021513a3bf129c3179ee2edad4b3e18b6103a7;hp=233101015535e2e723fe6455a8d91d0be54703bb;p=deb%2Fpackages.git Merge commit 'origin/master' into debian-master --- diff --git a/README b/README index 5d7067b..944fc32 100644 --- a/README +++ b/README @@ -43,7 +43,6 @@ Cron 010git -- pull changes from git 050checkinst -- check if all needed packages are installed 100syncarchive -- retrieve data from main Debian archive -100syncarchive_amd64 -- retrieve data from sarge amd64 archive 100syncarchive_backports -- retrieve data from backports.org 100syncarchive_debports -- retrieve data from debian-ports.org (kfreebsd-*, armel) @@ -57,7 +56,7 @@ Cron (see BACKEND) 300maintainerdb -- create data for @packages.d.o aliases 400changelogs_map -- create changelogs map (for changelog: shortcut) -500update_mo -- update .pot and .po files and generate .gmo +500update_po -- update .pot and .po files and generate .gmo 600index_pages -- create static index pages /, /, and allpackages diff --git a/config.sh.sed.in b/config.sh.sed.in index ffa4e10..2dd3417 100644 --- a/config.sh.sed.in +++ b/config.sh.sed.in @@ -45,14 +45,13 @@ ddtplangs="ca cs da de eo es eu fi fr hu it ja km ko nl pl pt pt-br ru sk sv uk archives="us security debports backports volatile" sections="main contrib non-free" parts="$sections" -suites="sarge sarge-volatile sarge-backports etch etch-m68k etch-volatile etch-backports lenny sid experimental" +suites="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile sid experimental" priorities="required important standard optional extra" dists="$suites" architectures="alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc" -arch_sarge="alpha arm hppa i386 ia64 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_sid="${arch_sarge} armel hurd-i386 kfreebsd-i386 kfreebsd-amd64" +arch_sid="${arch_lenny} hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k" arch_experimental="${arch_sid}" arch_lenny_proposed_updates="${arch_lenny}" arch_etch_proposed_updates="${arch_etch}" diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive index cb6f18c..35b9361 100755 --- a/cron.d/100syncarchive +++ b/cron.d/100syncarchive @@ -87,7 +87,7 @@ fi # security archive # -for dist in sarge etch lenny +for dist in etch lenny do echo "retrieve Release(.gpg) $dist" test -d security/${dist} || mkdir -p security/${dist} diff --git a/cron.d/100syncarchive_backports b/cron.d/100syncarchive_backports index 84820cb..e560d85 100755 --- a/cron.d/100syncarchive_backports +++ b/cron.d/100syncarchive_backports @@ -7,7 +7,7 @@ cd ${archivedir} # backports archive # -for dist in sarge etch +for dist in etch do echo "retrieve Release(.gpg) $dist-backports" test -d backports/${dist}-backports || mkdir -p backports/${dist}-backports diff --git a/cron.d/100syncarchive_volatile b/cron.d/100syncarchive_volatile index 567ebfb..ae0f701 100755 --- a/cron.d/100syncarchive_volatile +++ b/cron.d/100syncarchive_volatile @@ -7,7 +7,7 @@ cd ${archivedir} # volatile archive # -for dist in sarge etch +for dist in etch lenny do echo "retrieve Release(.gpg) $dist-volatile" test -d volatile/${dist}-volatile || mkdir -p volatile/${dist}-volatile diff --git a/cron.d/120synctrans b/cron.d/120synctrans index db71ae4..a40736f 100755 --- a/cron.d/120synctrans +++ b/cron.d/120synctrans @@ -43,3 +43,5 @@ else done done fi + +exit 0 diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm index d8b750c..e2771b9 100755 --- a/lib/Packages/Dispatcher.pm +++ b/lib/Packages/Dispatcher.pm @@ -64,11 +64,10 @@ sub do_dispatch { delete $ENV{'LC_ALL'}; delete $ENV{'LC_MESSAGES'}; - my %SUITES_ALIAS = ( oldstable => 'sarge', + my %SUITES_ALIAS = ( #oldstable => 'sarge', stable => 'etch', testing => 'lenny', unstable => 'sid', - '3.1' => 'sarge', '4.0' => 'etch' ); # Read in all the variables set by the form diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm index c33f142..12e00c3 100644 --- a/lib/Packages/Search.pm +++ b/lib/Packages/Search.pm @@ -103,8 +103,6 @@ sub read_entry { #FIXME: make configurable my %fallback_suites = ( - 'sarge-backports' => 'sarge', - 'sarge-volatile' => 'sarge', 'etch-backports' => 'etch', 'etch-volatile' => 'etch', experimental => 'sid' ); diff --git a/po/templates.fr.po b/po/templates.fr.po index f29c15e..040e2c0 100644 --- a/po/templates.fr.po +++ b/po/templates.fr.po @@ -792,7 +792,7 @@ msgstr "Liens pour %s" #: templates/html/show.tmpl:66 msgid "%s Resources:" -msgstr "Resources %s :" +msgstr "Ressources %s :" #: templates/html/show.tmpl:68 msgid "Bug Reports" diff --git a/static/index.tmpl b/static/index.tmpl index 4d2b38a..033b6c7 100644 --- a/static/index.tmpl +++ b/static/index.tmpl @@ -4,9 +4,8 @@ keywords = "$organisation, Packages" -%] [%- - all_suites = [ 'sarge', 'sarge-volatile', 'sarge-backports', - 'etch', 'etch-m68k', 'etch-volatile', 'etch-backports', - 'lenny', 'sid' ] + all_suites = [ 'etch', 'etch-m68k', 'etch-volatile', 'etch-backports', + 'lenny', 'lenny-volatile', 'sid' ] version_numbers = { sarge => '3.1', etch => '4.0' } current_release = 'etch' diff --git a/static/packages-site.css b/static/packages-site.css index 270098d..420506e 100644 --- a/static/packages-site.css +++ b/static/packages-site.css @@ -1,3 +1,4 @@ -.sarge-volatile, .sarge-backports, .etch-m68k, .etch-backports { +.sarge-volatile, .sarge-backports, .etch-m68k, .etch-backports, +.lenny-volatile, .lenny-backports { font-size: smaller; }