The following commit has been merged in the debian-master branch:
commit 6f6ac7022520a2b335f5b43a262022c65cad6163
Author: Gerfried Fuchs <[email protected]>
Date: Sat Feb 5 17:25:05 2011 +0100
Updates for squeeze release
diff --git a/config.sh.sed.in b/config.sh.sed.in
index 479cbcc..7b06e5e 100644
--- 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 d8b9f79..5738151 100755
--- 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 706f017..0e37ab2 100644
--- 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 08c6f96..67488e9 100755
--- 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 a51ee8e..ec3ab8b 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} = [ '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 c563e6e..0cad75b 100644
--- 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 c40310d..aac2444 100644
--- 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',
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
