Updates for squeeze release

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 479cbcc90e1ee23320654eb0c4ab91fa73cd678f..7b06e5eeab20b965df04a0a509ceb342fb562a3a 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -45,12 +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="lenny lenny-volatile lenny-backports lenny-backports-sloppy squeeze squeeze-backports sid experimental"
+suites="lenny lenny-volatile lenny-backports lenny-backports-sloppy squeeze squeeze-backports wheezy sid experimental"
 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 powerpcspe s390 sh4 sparc sparc64"
 arch_lenny="alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc"
 arch_squeeze="alpha amd64 armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc"
+arch_wheezy="${arch_squeeze}"
 arch_sid="${arch_squeeze} avr32 hurd-i386 m68k powerpcspe sh4 sparc64"
 arch_experimental="${arch_sid}"
 arch_lenny_proposed_updates="${arch_lenny}"

diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index d8b9f79bc28b8248fd63b67c1c2af7d6068bd5e1..5738151ae023ac4a4a3ea6c7b9980c0279c43086 100755 (executable)
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -81,7 +81,7 @@ fi
 
 # security archive
 #
-for dist in etch lenny
+for dist in etch lenny squeeze
 do
     echo "retrieve Release(.gpg) $dist"
     test -d security/${dist} || mkdir -p security/${dist}

diff --git a/lib/Deb/Versions.pm b/lib/Deb/Versions.pm
index 706f017f20c185f25beab1cb6cae6b1d7864622f..0e37ab272d5fdadb22be1f75345ee6292370891d 100644 (file)
--- a/lib/Deb/Versions.pm
+++ b/lib/Deb/Versions.pm
@@ -174,10 +174,11 @@ our @SUITES_SORT = qw(
                        sarge
                        oldstable
                        etch etch-m68k
-                       stable stable-proposed-updates
                        lenny
-                       testing testing-proposed-updates
+                       stable stable-proposed-updates
                        squeeze
+                       testing testing-proposed-updates
+                       wheezy
                        sid unstable experimental
                        warty hoary breezy dapper edgy feisty gutsy hardy
                        intrepid jaunty karmic lucid maverick);

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 08c6f96a1c7cee40a1985e2a88eeb3006908f27f..67488e9794e65f3749468f206c7a270555f82f27 100755 (executable)
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -64,12 +64,12 @@ sub do_dispatch {
     delete $ENV{'LC_ALL'};
     delete $ENV{'LC_MESSAGES'};
 
-    my %SUITES_ALIAS = ( oldstable => 'etch',
-                        stable => 'lenny',
-                        testing => 'squeeze',
+    my %SUITES_ALIAS = ( oldstable => 'lenny',
+                        stable => 'squeeze',
+                        testing => 'wheezy',
                         unstable => 'sid',
-                        '4.0' => 'etch',
-                        '5.0' => 'lenny' );
+                        '5.0' => 'lenny',
+                        '6.0' => 'squeeze' );
 
     # Read in all the variables set by the form
     my $input;

diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm
index a51ee8e01330dc223a9cb0e38edefb4f475e863b..ec3ab8b082043a2afe2f6873d68ffd7a7d2bd497 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} = [ 'lenny' ];
+           $params->{values}{suite}{final} = $opts->{suite} = [ 'squeeze' ];
     }
 
     if (@{$opts->{suite}} > 1) {

diff --git a/templates/config/archive_layout.tmpl b/templates/config/archive_layout.tmpl
index c563e6e3386ee8971711ce1d5eb98727c7c46327..0cad75b213b1e4d322aa3f932bf3ee011971ff94 100644 (file)
--- a/templates/config/archive_layout.tmpl
+++ b/templates/config/archive_layout.tmpl
@@ -4,9 +4,9 @@
    standard_priority = 'optional'
 
    suite_aliases = {
-               etch => 'oldstable', 
-               lenny => 'stable',
-               squeeze => 'testing',
+               lenny => 'oldstable', 
+               squeeze => 'stable',
+               wheezy => 'testing',
                sid => 'unstable',
                   }
 

diff --git a/templates/html/homepage.tmpl b/templates/html/homepage.tmpl
index c40310d5f6d1f1bade4c8fb804e5fd4d792002a9..aac2444e0af287dde8ee7beb543ca3714cb89468 100644 (file)
--- a/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@ -4,11 +4,12 @@
        keywords = g('Packages')
 -%]
 [%-
-    all_suites = [ 'lenny', 'lenny-volatile', 'lenny-backports', 'lenny-backports-sloppy', 'squeeze', 'squeeze-backports', 'sid' ]
+    all_suites = [ 'lenny', 'lenny-volatile', 'lenny-backports', 'lenny-backports-sloppy', 'squeeze', 'squeeze-backports', 'wheezy', 'sid' ]
     version_numbers = { sarge => '3.1',
                        etch  => '4.0',
-                       lenny => '5.0' }
-    current_release = 'lenny'
+                       lenny => '5.0',
+                       squeeze => '6.0' }
+    current_release = 'squeeze'
     all_sections = [ 'main', 'contrib', 'non-free' ]
     all_architectures = [   'alpha', 'arm', 'armel', 'amd64', 'avr32', 'hppa', 'i386',
                             'ia64', 'kfreebsd-amd64', 'kfreebsd-i386', 'mips',