r14209 - in packages/trunk/neverball/debian: . patches

[Markus Koschany]

Author: apo-guest
Date: 2013-06-02 12:08:59 +0000 (Sun, 02 Jun 2013)
New Revision: 14209

Added:
   packages/trunk/neverball/debian/patches/update-french-po-file.patch
Modified:
   packages/trunk/neverball/debian/changelog
   packages/trunk/neverball/debian/control
   packages/trunk/neverball/debian/patches/fix-build-gold-linker.patch
   packages/trunk/neverball/debian/patches/reset-video-mode.patch
   packages/trunk/neverball/debian/patches/separate-data-and-bin.patch
   packages/trunk/neverball/debian/patches/series
Log:
Release 1.5.4-6. Add new patch.

- Add update-french-po-file patch.
- Improve DEP-3 headers. Forward patches.



Modified: packages/trunk/neverball/debian/changelog
===================================================================
--- packages/trunk/neverball/debian/changelog	2013-06-02 09:03:37 UTC (rev 14208)
+++ packages/trunk/neverball/debian/changelog	2013-06-02 12:08:59 UTC (rev 14209)
@@ -30,11 +30,13 @@
   * Build with --parallel.
   * Drop NEWS file. Users who upgrade from Squeeze or Wheezy are not affected.
     Upgrading directly from Lenny to Jessie is not supported.
-  * Add DEP-3 headers to all patches.
+  * Add DEP-3 headers to all patches and forward them upstream.
   * Install all debugging symbols correctly and make neverball-dbg useful again.
     (Closes: #651180)
+  * Update French .po file. Change the occurrences of "sauver" to
+    "enregistrer". (Closes: #700287)
 
- -- Markus Koschany <apo at gambaru.de>  Thu, 23 May 2013 20:05:25 +0200
+ -- Markus Koschany <apo at gambaru.de>  Sun, 02 Jun 2013 12:41:18 +0200
 
 neverball (1.5.4-5) unstable; urgency=medium
 

Modified: packages/trunk/neverball/debian/control
===================================================================
--- packages/trunk/neverball/debian/control	2013-06-02 09:03:37 UTC (rev 14208)
+++ packages/trunk/neverball/debian/control	2013-06-02 12:08:59 UTC (rev 14209)
@@ -16,7 +16,7 @@
  libvorbis-dev
 Standards-Version: 3.9.4
 Homepage: http://neverball.org/
-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-games/packages/trunk/neverball/
+Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/neverball/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/neverball/
 
 Package: neverball

Modified: packages/trunk/neverball/debian/patches/fix-build-gold-linker.patch
===================================================================
--- packages/trunk/neverball/debian/patches/fix-build-gold-linker.patch	2013-06-02 09:03:37 UTC (rev 14208)
+++ packages/trunk/neverball/debian/patches/fix-build-gold-linker.patch	2013-06-02 12:08:59 UTC (rev 14209)
@@ -5,7 +5,7 @@
 Build with GNU binutils-gold.
 
 Bug: http://bugs.debian.org/556916
-
+Forwarded: http://forum.nevercorner.net/viewtopic.php?id=2683
 ---
  Makefile |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

Modified: packages/trunk/neverball/debian/patches/reset-video-mode.patch
===================================================================
--- packages/trunk/neverball/debian/patches/reset-video-mode.patch	2013-06-02 09:03:37 UTC (rev 14208)
+++ packages/trunk/neverball/debian/patches/reset-video-mode.patch	2013-06-02 12:08:59 UTC (rev 14209)
@@ -6,7 +6,7 @@
 file no longer works.
 
 Bug: http://bugs.debian.org/677409
-
+Forwarded: http://forum.nevercorner.net/viewtopic.php?id=2682
 ---
  share/video.c |    8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)

Modified: packages/trunk/neverball/debian/patches/separate-data-and-bin.patch
===================================================================
--- packages/trunk/neverball/debian/patches/separate-data-and-bin.patch	2013-06-02 09:03:37 UTC (rev 14208)
+++ packages/trunk/neverball/debian/patches/separate-data-and-bin.patch	2013-06-02 12:08:59 UTC (rev 14209)
@@ -5,7 +5,6 @@
 Fix FTBFS on buildd.
 
 Bug: http://bugs.debian.org/598614
-
 ---
  Makefile |    4 ++++
  1 file changed, 4 insertions(+)

Modified: packages/trunk/neverball/debian/patches/series
===================================================================
--- packages/trunk/neverball/debian/patches/series	2013-06-02 09:03:37 UTC (rev 14208)
+++ packages/trunk/neverball/debian/patches/series	2013-06-02 12:08:59 UTC (rev 14209)
@@ -1,3 +1,4 @@
 reset-video-mode.patch
 separate-data-and-bin.patch
 fix-build-gold-linker.patch
+update-french-po-file.patch

Added: packages/trunk/neverball/debian/patches/update-french-po-file.patch
===================================================================
--- packages/trunk/neverball/debian/patches/update-french-po-file.patch	                        (rev 0)
+++ packages/trunk/neverball/debian/patches/update-french-po-file.patch	2013-06-02 12:08:59 UTC (rev 14209)
@@ -0,0 +1,44 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Sun, 2 Jun 2013 12:29:32 +0200
+Subject: update french po file
+
+Use a better translation for "save" in French.
+
+Bug: http://bugs.debian.org/700287
+Forwarded: http://forum.nevercorner.net/viewtopic.php?id=2680
+
+---
+ po/fr.po |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/po/fr.po b/po/fr.po
+index aaacf7b..34148fa 100644
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -367,7 +367,7 @@ msgstr "Retenter"
+ 
+ #: ball/st_fall_out.c:103 ball/st_goal.c:225 ball/st_time_out.c:94
+ msgid "Save Replay"
+-msgstr "Sauver un film"
++msgstr "Enregistrer un film"
+ 
+ #: ball/st_goal.c:115
+ msgid "New Record"
+@@ -538,7 +538,7 @@ msgstr "Nom du film"
+ 
+ #: ball/st_save.c:124
+ msgid "Save"
+-msgstr "Sauver"
++msgstr "Enregistrer"
+ 
+ #: ball/st_save.c:200
+ msgid "Overwrite?"
+@@ -2141,7 +2141,7 @@ msgstr "item/coin/euro_coin"
+ #~ msgstr "Le fichier du niveau ne peut être chargé"
+ 
+ #~ msgid "Save a replay file"
+-#~ msgstr "Sauver le film dans un fichier"
++#~ msgstr "Enregistrer le film dans un fichier"
+ 
+ #~ msgid "Replay file already saved"
+ #~ msgstr "Film déjà sauvé"