Merge commit 'origin/master' into debian-master

diff --git a/README b/README
index 5d7067b7753126728990b8f56fe5c68d51276d36..944fc32aba7d6d2044848752f8ebfc018efbb6e7 100644 (file)
--- a/README
+++ b/README
@@ -43,7 +43,6 @@ Cron
 010git                     -- pull changes from git
 050checkinst               -- check if all needed packages are installed
 100syncarchive             -- retrieve data from main Debian archive
-100syncarchive_amd64       -- retrieve data from sarge amd64 archive
 100syncarchive_backports   -- retrieve data from backports.org
 100syncarchive_debports    -- retrieve data from debian-ports.org
                               (kfreebsd-*, armel)
@@ -57,7 +56,7 @@ Cron
                               (see BACKEND)
 300maintainerdb            -- create data for @packages.d.o aliases
 400changelogs_map          -- create changelogs map (for changelog: shortcut)
-500update_mo               -- update .pot and .po files and generate .gmo
+500update_po               -- update .pot and .po files and generate .gmo
 600index_pages             -- create static index pages
                               <suite>/, <suite>/<subsection>, and
                               allpackages

diff --git a/config.sh.sed.in b/config.sh.sed.in
index ffa4e10e4d99a02b0bf7dc9c6a7c5566ad075825..2dd3417e89951fbb73490d5037879db812e0e4cd 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -45,14 +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="sarge sarge-volatile sarge-backports etch etch-m68k etch-volatile etch-backports lenny sid experimental"
+suites="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile 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_sarge="alpha arm hppa i386 ia64 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_sarge} armel hurd-i386 kfreebsd-i386 kfreebsd-amd64"
+arch_sid="${arch_lenny} 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 b/cron.d/100syncarchive
index cb6f18c2869067e794a6b69b9768b99217bfa8d5..35b936158464f30e01b327602c2f6fd39429cd71 100755 (executable)
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -87,7 +87,7 @@ fi
 
 # security archive
 #
-for dist in sarge etch lenny
+for dist in etch lenny
 do
     echo "retrieve Release(.gpg) $dist"
     test -d security/${dist} || mkdir -p security/${dist}

diff --git a/cron.d/100syncarchive_backports b/cron.d/100syncarchive_backports
index 84820cb306d68629639964a83a16f37b8a8df1dc..e560d859b4ba699afc889b6a5753bf0196a619be 100755 (executable)
--- a/cron.d/100syncarchive_backports
+++ b/cron.d/100syncarchive_backports
@@ -7,7 +7,7 @@ cd ${archivedir}
 
 # backports archive
 #
-for dist in sarge etch
+for dist in etch
 do
   echo "retrieve Release(.gpg) $dist-backports"
   test -d backports/${dist}-backports || mkdir -p backports/${dist}-backports

diff --git a/cron.d/100syncarchive_volatile b/cron.d/100syncarchive_volatile
index 567ebfb8a34fdafefa46a2861f0bdc6b8c4fe0b3..ae0f7013adac28c5b3294282d0b790773224c119 100755 (executable)
--- a/cron.d/100syncarchive_volatile
+++ b/cron.d/100syncarchive_volatile
@@ -7,7 +7,7 @@ cd ${archivedir}
 
 # volatile archive
 #
-for dist in sarge etch
+for dist in etch lenny
 do
   echo "retrieve Release(.gpg) $dist-volatile"
   test -d volatile/${dist}-volatile || mkdir -p volatile/${dist}-volatile

diff --git a/cron.d/120synctrans b/cron.d/120synctrans
index db71ae454ee1b80b5a4eebf35ec56744f3e1089c..a40736f15cbf64a15ceb6829cb9c0378ab556726 100755 (executable)
--- a/cron.d/120synctrans
+++ b/cron.d/120synctrans
@@ -43,3 +43,5 @@ else
        done
     done
 fi
+
+exit 0

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index d8b750c18d784604f2d37d461b16e50c543ede97..e2771b9fadd5df910fc1e0454484b86a0a1fc38d 100755 (executable)
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -64,11 +64,10 @@ sub do_dispatch {
     delete $ENV{'LC_ALL'};
     delete $ENV{'LC_MESSAGES'};
 
-    my %SUITES_ALIAS = ( oldstable => 'sarge',
+    my %SUITES_ALIAS = ( #oldstable => 'sarge',
                         stable => 'etch',
                         testing => 'lenny',
                         unstable => 'sid',
-                        '3.1' => 'sarge',
                         '4.0' => 'etch' );
 
     # Read in all the variables set by the form

diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index c33f1425322e0ddb10f0d18c51b2ef214919ea8b..12e00c3ef2339c6c16c9b2b15fa3b12c067e252e 100644 (file)
--- a/lib/Packages/Search.pm
+++ b/lib/Packages/Search.pm
@@ -103,8 +103,6 @@ sub read_entry {
 
 #FIXME: make configurable
 my %fallback_suites = (
-                      'sarge-backports' => 'sarge',
-                      'sarge-volatile' => 'sarge',
                       'etch-backports' => 'etch',
                       'etch-volatile' => 'etch',
                       experimental => 'sid' );

diff --git a/po/templates.fr.po b/po/templates.fr.po
index f29c15e83109e645d0754e5131b7dd717cd946f2..040e2c03051047a55f8b82d2dd1b5960a03feb75 100644 (file)
--- a/po/templates.fr.po
+++ b/po/templates.fr.po
@@ -792,7 +792,7 @@ msgstr "Liens pour %s"
 
 #: templates/html/show.tmpl:66
 msgid "%s Resources:"
-msgstr "Resources %s :"
+msgstr "Ressources %s :"
 
 #: templates/html/show.tmpl:68
 msgid "Bug Reports"

diff --git a/static/index.tmpl b/static/index.tmpl
index 4d2b38a744fea147157d183625afe2e8d70e6ace..033b6c7aadd822bfd982757de1d2403a35d1c993 100644 (file)
--- a/static/index.tmpl
+++ b/static/index.tmpl
@@ -4,9 +4,8 @@
        keywords = "$organisation, Packages"
 -%]
 [%-
-    all_suites = [ 'sarge', 'sarge-volatile', 'sarge-backports',
-                  'etch', 'etch-m68k', 'etch-volatile', 'etch-backports',
-                  'lenny', 'sid' ]
+    all_suites = [ 'etch', 'etch-m68k', 'etch-volatile', 'etch-backports',
+                  'lenny', 'lenny-volatile', 'sid' ]
     version_numbers = { sarge => '3.1',
                        etch   => '4.0' }
     current_release = 'etch'

diff --git a/static/packages-site.css b/static/packages-site.css
index 270098d81748a178b90b39cd774be1464fa03c3b..420506e644f90998b1d2a96ee0efec9bcf403279 100644 (file)
--- a/static/packages-site.css
+++ b/static/packages-site.css
@@ -1,3 +1,4 @@
-.sarge-volatile, .sarge-backports, .etch-m68k, .etch-backports {
+.sarge-volatile, .sarge-backports, .etch-m68k, .etch-backports,
+.lenny-volatile, .lenny-backports {
        font-size: smaller;
 }