r11154 - in packages/trunk/pingus/debian: . patches

[Bertrand Marc]

Author: bbk-guest
Date: 2010-07-22 17:21:32 +0000 (Thu, 22 Jul 2010)
New Revision: 11154

Removed:
   packages/trunk/pingus/debian/patches/40_fix_FTBFS_with_gcc-4.4
Modified:
   packages/trunk/pingus/debian/changelog
   packages/trunk/pingus/debian/patches/series
Log:
patch french translation

Modified: packages/trunk/pingus/debian/changelog
===================================================================
--- packages/trunk/pingus/debian/changelog	2010-07-22 16:18:09 UTC (rev 11153)
+++ packages/trunk/pingus/debian/changelog	2010-07-22 17:21:32 UTC (rev 11154)
@@ -3,12 +3,14 @@
   * New upstream release.
   * Switch to dpkg-source 3.0 (quilt) format.
   * Refresh patches.
-  * Deactivate 20_fix_FTBFS_with_gcc-4.3, seems included.
-  * Deactivate 40_fix_FTBFS_with_gcc-4.4, unnecessary.
+  * Disable 20_fix_FTBFS_with_gcc-4.3, seems included.
+  * Remove 40_fix_FTBFS_with_gcc-4.4, unnecessary.
   * Bump Standards Version to 3.9.0.
   * update patches/60_bashisms to avoid echo -e (Closes: #535879).
+  * Patch french translation (Closes: #563395) thanks to 
+    Tanguy Ortolo.
 
- -- Bertrand Marc <beberking at gmail.com>  Thu, 22 Jul 2010 16:44:14 +0200
+ -- Bertrand Marc <beberking at gmail.com>  Thu, 22 Jul 2010 19:19:00 +0200
 
 pingus (0.7.2-4) unstable; urgency=low
 

Deleted: packages/trunk/pingus/debian/patches/40_fix_FTBFS_with_gcc-4.4
===================================================================
--- packages/trunk/pingus/debian/patches/40_fix_FTBFS_with_gcc-4.4	2010-07-22 16:18:09 UTC (rev 11153)
+++ packages/trunk/pingus/debian/patches/40_fix_FTBFS_with_gcc-4.4	2010-07-22 17:21:32 UTC (rev 11154)
@@ -1,12 +0,0 @@
-#Author: Barry deFreese (fix from Martin Michlmayr).
-#Description: Missing includes to build with gcc-4.4.
---- a/src/tinygettext/po_file_reader.cpp
-+++ b/src/tinygettext/po_file_reader.cpp
-@@ -18,6 +18,7 @@
- //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
- #include <config.h>
-+#include <cstdio>
- #include <vector>
- #include <iconv.h>
- #include <errno.h>

Modified: packages/trunk/pingus/debian/patches/series
===================================================================
--- packages/trunk/pingus/debian/patches/series	2010-07-22 16:18:09 UTC (rev 11153)
+++ packages/trunk/pingus/debian/patches/series	2010-07-22 17:21:32 UTC (rev 11154)
@@ -2,6 +2,6 @@
 #20_fix_FTBFS_with_gcc-4.3
 30_update_nl_translation
 30_update_es_translation
-#40_fix_FTBFS_with_gcc-4.4
+30_update_fr_translation
 50_boost_signals_mt
 60_bashisms