r11142 - packages/trunk/pingus/debian/patches

[Bertrand Marc]

Author: bbk-guest
Date: 2010-07-22 14:02:43 +0000 (Thu, 22 Jul 2010)
New Revision: 11142

Modified:
   packages/trunk/pingus/debian/patches/40_fix_FTBFS_with_gcc-4.4
   packages/trunk/pingus/debian/patches/50_boost_signals_mt
   packages/trunk/pingus/debian/patches/60_bashisms
Log:
refresh 40_fix_FTBFS_with_gcc-4.4, maybe fixed

Modified: 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 13:58:07 UTC (rev 11141)
+++ packages/trunk/pingus/debian/patches/40_fix_FTBFS_with_gcc-4.4	2010-07-22 14:02:43 UTC (rev 11142)
@@ -1,21 +1,7 @@
 #Author: Barry deFreese (fix from Martin Michlmayr).
 #Description: Missing includes to build with gcc-4.4.
-Index: pingus-0.7.2/src/input/evdev_device.cpp
-===================================================================
---- pingus-0.7.2.orig/src/input/evdev_device.cpp	2009-05-26 11:05:57.000000000 -0400
-+++ pingus-0.7.2/src/input/evdev_device.cpp	2009-05-26 11:06:16.000000000 -0400
-@@ -25,6 +25,7 @@
- #include <stdexcept>
- #include <iostream>
- #include <errno.h>
-+#include <cstdio>
- #include <cstring>
- 
- #include "evdev_device.hpp"
-Index: pingus-0.7.2/src/tinygettext/po_file_reader.cpp
-===================================================================
---- pingus-0.7.2.orig/src/tinygettext/po_file_reader.cpp	2009-05-26 11:06:32.000000000 -0400
-+++ pingus-0.7.2/src/tinygettext/po_file_reader.cpp	2009-05-26 11:06:55.000000000 -0400
+--- 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.
  

Modified: packages/trunk/pingus/debian/patches/50_boost_signals_mt
===================================================================
--- packages/trunk/pingus/debian/patches/50_boost_signals_mt	2010-07-22 13:58:07 UTC (rev 11141)
+++ packages/trunk/pingus/debian/patches/50_boost_signals_mt	2010-07-22 14:02:43 UTC (rev 11142)
@@ -1,8 +1,8 @@
 #Author: Barry deFreese
 #Description: New boost only has multithreaded libs now, so check for it.
---- pingus-0.7.2.orig/SConstruct
-+++ pingus-0.7.2/SConstruct
-@@ -476,8 +476,8 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -475,8 +475,8 @@
          env['optional_sources'] += ['src/input/xinput_driver.cpp',
                                      'src/input/xinput_device.cpp']
          

Modified: packages/trunk/pingus/debian/patches/60_bashisms
===================================================================
--- packages/trunk/pingus/debian/patches/60_bashisms	2010-07-22 13:58:07 UTC (rev 11141)
+++ packages/trunk/pingus/debian/patches/60_bashisms	2010-07-22 14:02:43 UTC (rev 11142)
@@ -1,9 +1,7 @@
 #Author: Barry deFreese <bdefreese at debian.org>
 #Description: Replaces echo -e with printf in clanlib scripts.
-Index: pingus-0.7.2/contrib/clanlib_make_datafile.sh
-===================================================================
---- pingus-0.7.2.orig/contrib/clanlib_make_datafile.sh	2009-05-26 11:48:28.000000000 -0400
-+++ pingus-0.7.2/contrib/clanlib_make_datafile.sh	2009-05-26 11:51:56.000000000 -0400
+--- a/contrib/clanlib_make_datafile.sh
++++ b/contrib/clanlib_make_datafile.sh
 @@ -23,9 +23,9 @@
      #echo "Datafile line:"
  
@@ -16,10 +14,8 @@
      fi
  
  done
-Index: pingus-0.7.2/doc/clanlib_make_datafile.sh
-===================================================================
---- pingus-0.7.2.orig/doc/clanlib_make_datafile.sh	2009-05-26 11:52:14.000000000 -0400
-+++ pingus-0.7.2/doc/clanlib_make_datafile.sh	2009-05-26 11:54:04.000000000 -0400
+--- a/doc/clanlib_make_datafile.sh
++++ b/doc/clanlib_make_datafile.sh
 @@ -23,9 +23,10 @@
      #echo "Datafile line:"