Merge commit 'origin/master' into archive-master

Conflicts:

	config.sh.sed.in
	cron.d/100syncarchive
	cron.d/100syncarchive_backports
	cron.d/100syncarchive_volatile
	static/index.tmpl

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/cron.d/120synctrans b/cron.d/120synctrans
index 5bfd9599b67452147708d787d5778b5f30f67b44..705d7d097952d67ed5f8ffbcdb90f8245b454f75 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 35b04598f2a7b87824a41ca4f97541f57d0281e3..0856ef4e4d9a458e00bb0a3a8ffd7b30ec6b5409 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/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;
 }