From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Wed, 29 Oct 2008 11:22:17 +0000 (+0100)
Subject: Merge commit 'origin/master' into archive-master
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=34728f0ea88eef1aab0c5fa1d369e1d6874265d7;hp=9083dcf3a523120cfb4cd905d26dada501678aea;p=deb%2Fpackages.git

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 5d7067b..944fc32 100644
--- 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 5bfd959..705d7d0 100755
--- 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 35b0459..0856ef4 100755
--- 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 c33f142..12e00c3 100644
--- 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 f29c15e..040e2c0 100644
--- 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 270098d..420506e 100644
--- 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;
 }