[ARCHIVE] Add sarge

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 051f1ae69c1de139d60be430f6b7bcad17861612..fb317ed7853e00da0ea62a34f7f8f8d766c1dfcd 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -41,7 +41,7 @@ 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"
 sections="main contrib non-free"
 parts="$sections"
-suites="bo hamm slink potato woody"
+suites="bo hamm slink potato woody sarge"
 priorities="required important standard optional extra"
 dists="$suites"
 architectures="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
@@ -50,6 +50,7 @@ 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 --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm
index 69de9cd335f5a5c7fc4be60124054f1a4500c296..34643949f69a66bfd221d2138effc07510a6476c 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} = [ 'woody' ];
+           $params->{values}{suite}{final} = $opts->{suite} = [ 'sarge' ];
     }
 
     if (@{$opts->{suite}} > 1) {

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 388cc034e344f705d8c278cf2d4fc6fee10cbd2c..9f59690589d59ec1745a27dc937fd24ee2bda1b3 100644 (file)
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -242,7 +242,7 @@ sub do_show {
                        # more information
                        #
                        my $changesandcopy = 0;
-                       $changesandcopy = 1 if $suite eq "woody";
+                       $changesandcopy = 1 if suites_cmp($suite, "woody") >= 0;
                        moreinfo( name => $pkg, data => $page, vars => \%contents,
                                  opts => $opts,
                                  env => \%FTP_SITES,
@@ -324,7 +324,7 @@ sub do_show {
                    # more information
                    #
                    my $changesandcopy = 0;
-                   $changesandcopy = 1 if $suite eq "woody";
+                   $changesandcopy = 1 if suites_cmp($suite, "woody") >= 0;
                    moreinfo( name => $pkg, data => $page, vars => \%contents,
                              opts => $opts,
                              env => \%FTP_SITES,

diff --git a/static/index.tmpl b/static/index.tmpl
index 70ba0f8f3aa07907498e8b7fc4495ebdd64bd68b..9766ffdba8dbb2c24dc2786eb191d346e3d36f2b 100644 (file)
--- a/static/index.tmpl
+++ b/static/index.tmpl
@@ -4,13 +4,14 @@
        keywords = "$organisation, Packages"
 -%]
 [%-
-    all_suites = [ 'bo', 'hamm', 'slink', 'potato', 'woody' ]
-    version_numbers = { woody  => '3.0',
+    all_suites = [ 'bo', 'hamm', 'slink', 'potato', 'woody', 'sarge' ]
+    version_numbers = { sarge  => '3.1',
+                       woody  => '3.0',
                        potato => '2.2',
                        slink  => '2.1',
                        hamm   => '2.0',
                        bo     => '1.3.1'}
-    current_release = 'woody'
+    current_release = 'sarge'
     all_sections = [ 'main', 'contrib', 'non-free' ]
     all_architectures = [ 'alpha', 'arm', 'hppa', 'i386', 'ia64',
                          'mips', 'mipsel', 'powerpc', 's390', 'sparc' ]