Merge commit 'alioth/master'

diff --git a/bin/parse-packages b/bin/parse-packages
index 97edffcd19666bc4a438c7b1bfe1108a4ecfd132..6f89070915800afb508d1d56c70bab4e18f721f9 100755 (executable)
--- 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 6637fb28fe229c30fc9f1c6d21bc69ede5d6264f..c9091d2657dd5d47bacf389813dc01dcbd1f6734 100644 (file)
--- 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 e560d859b4ba699afc889b6a5753bf0196a619be..2be4de7c972f8da3b497973e1a2bb34254a99271 100755 (executable)
--- 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 ba9df21b193eeb2b7cb983e235828209db9bb026..53da03076329001a90359ee473630e4ac450190d 100644 (file)
--- 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 e2771b9fadd5df910fc1e0454484b86a0a1fc38d..484e222f02bd0e433038c329309fa240a2119beb 100755 (executable)
--- 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 2316706f6bbf2c5b29738f43e755518cc9e4ffb6..a51ee8e01330dc223a9cb0e38edefb4f475e863b 100644 (file)
--- 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 12e00c3ef2339c6c16c9b2b15fa3b12c067e252e..61b37b5c1ee722c29f586ea2549bbd9c35d2aabe 100644 (file)
--- 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 f64e53962720dd68d87e728d7bdc516776d6fb22..136f89e50258b45cd5ffc773c0c1d0d0a2a61609 100644 (file)
--- 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' ]
 -%]
 
 <p>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 30c28501fa39671a1774c9998cbc7d54a034dfc5..36ae346ca253e0f26ac4936c79ec05390a0b2a0a 100644 (file)
--- 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',
                   }