From: Frank Lichtenheld Date: Sat, 14 Feb 2009 11:15:52 +0000 (+0100) Subject: Merge commit 'alioth/master' X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=commitdiff_plain;h=d335139f37934f9128a39ffd0933a163fb71cce7;hp=744b4b7bdcb152104b9912c1930c4d8bd098f496 Merge commit 'alioth/master' --- diff --git a/bin/parse-packages b/bin/parse-packages index 97edffc..6f89070 100755 --- a/bin/parse-packages +++ b/bin/parse-packages @@ -115,10 +115,12 @@ for my $suite (@SUITES) { foreach (@complete_tags) { my ($facet, $tag) = split( /::/, $_, 2); if ($tag =~ s/^\{(.+)\}$/$1/) { + warn "pkg=$data{package} tags=$data{tag}\n" unless $facet && $tag; foreach (split( /,/, $tag )) { push @tags, "${facet}::$_"; } } else { + warn "pkg=$data{package} tags=$data{tag}\n" unless $facet && $tag; push @tags, "${facet}::$tag"; } } diff --git a/config.sh.sed.in b/config.sh.sed.in index 6637fb2..c9091d2 100644 --- a/config.sh.sed.in +++ b/config.sh.sed.in @@ -45,13 +45,14 @@ 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="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile sid experimental" +suites="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile lenny-backports squeeze 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_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc" arch_lenny="${arch_etch} armel" -arch_sid="${arch_lenny} hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k" +arch_squeeze="${arch_lenny}" +arch_sid="${arch_squeeze} 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_backports b/cron.d/100syncarchive_backports index e560d85..2be4de7 100755 --- a/cron.d/100syncarchive_backports +++ b/cron.d/100syncarchive_backports @@ -7,7 +7,7 @@ cd ${archivedir} # backports archive # -for dist in etch +for dist in etch lenny do echo "retrieve Release(.gpg) $dist-backports" test -d backports/${dist}-backports || mkdir -p backports/${dist}-backports diff --git a/lib/Deb/Versions.pm b/lib/Deb/Versions.pm index ba9df21..53da030 100644 --- a/lib/Deb/Versions.pm +++ b/lib/Deb/Versions.pm @@ -152,10 +152,16 @@ sub _lcmp { return length( $v1 ) <=> length( $v2 ); } -our @SUITES_SORT = qw( 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 hardy intrepid jaunty); +our @SUITES_SORT = qw( 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 --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm index e2771b9..484e222 100755 --- a/lib/Packages/Dispatcher.pm +++ b/lib/Packages/Dispatcher.pm @@ -64,11 +64,12 @@ sub do_dispatch { delete $ENV{'LC_ALL'}; delete $ENV{'LC_MESSAGES'}; - my %SUITES_ALIAS = ( #oldstable => 'sarge', - stable => 'etch', - testing => 'lenny', + my %SUITES_ALIAS = ( oldstable => 'etch', + stable => 'lenny', + testing => 'squeeze', unstable => 'sid', - '4.0' => 'etch' ); + '4.0' => 'etch', + '5.0' => 'lenny' ); # Read in all the variables set by the form my $input; diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm index 2316706..a51ee8e 100644 --- a/lib/Packages/DoSearchContents.pm +++ b/lib/Packages/DoSearchContents.pm @@ -33,7 +33,7 @@ sub do_search_contents { #FIXME: that's extremely hacky atm if ($params->{values}{suite}{no_replace}[0] eq 'default') { $params->{values}{suite}{no_replace} = - $params->{values}{suite}{final} = $opts->{suite} = [ 'etch' ]; + $params->{values}{suite}{final} = $opts->{suite} = [ 'lenny' ]; } if (@{$opts->{suite}} > 1) { diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm index 12e00c3..61b37b5 100644 --- a/lib/Packages/Search.pm +++ b/lib/Packages/Search.pm @@ -105,6 +105,8 @@ sub read_entry { my %fallback_suites = ( 'etch-backports' => 'etch', 'etch-volatile' => 'etch', + 'lenny-backports' => 'lenny', + 'lenny-volatile' => 'lenny', experimental => 'sid' ); sub read_entry_simple { diff --git a/static/index.tmpl b/static/index.tmpl index f64e539..136f89e 100644 --- a/static/index.tmpl +++ b/static/index.tmpl @@ -5,14 +5,15 @@ -%] [%- all_suites = [ 'etch', 'etch-m68k', 'etch-volatile', 'etch-backports', - 'lenny', 'lenny-volatile', 'sid' ] + 'lenny', 'lenny-volatile', 'lenny-backports', 'squeeze', 'sid' ] version_numbers = { sarge => '3.1', - etch => '4.0' } - current_release = 'etch' + etch => '4.0', + lenny => '5.0' } + current_release = 'lenny' all_sections = [ 'main', 'contrib', 'non-free' ] all_architectures = [ 'alpha', 'arm', 'armel', 'amd64', 'hppa', 'i386', 'ia64', 'kfreebsd-amd64', 'kfreebsd-i386', 'mips', - 'mipsel', 'powerpc', 's390', 'sparc' ] + 'mipsel', 'm68k', 'powerpc', 's390', 'sparc' ] -%]

This site provides you with information about all the packages diff --git a/templates/config/archive_layout.tmpl b/templates/config/archive_layout.tmpl index 30c2850..36ae346 100644 --- a/templates/config/archive_layout.tmpl +++ b/templates/config/archive_layout.tmpl @@ -4,9 +4,9 @@ standard_priority = 'optional' suite_aliases = { - sarge => 'oldstable', - etch => 'stable', - lenny => 'testing', + etch => 'oldstable', + lenny => 'stable', + squeeze => 'testing', sid => 'unstable', }