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

[Cyril Brulebois]

Author: kibi-guest
Date: 2008-02-28 17:45:23 +0000 (Thu, 28 Feb 2008)
New Revision: 5926

Added:
   packages/trunk/pingus/debian/patches/1O_fix_data_directory
   packages/trunk/pingus/debian/patches/20_fix_FTBFS_with_gcc-4.3
Removed:
   packages/trunk/pingus/debian/patches/data_dir.patch
Modified:
   packages/trunk/pingus/debian/changelog
   packages/trunk/pingus/debian/patches/series
Log:
Fix FTBFS with gcc-4.3 (Closes: #462238). Rename former patch.

Modified: packages/trunk/pingus/debian/changelog
===================================================================
--- packages/trunk/pingus/debian/changelog	2008-02-27 19:05:29 UTC (rev 5925)
+++ packages/trunk/pingus/debian/changelog	2008-02-28 17:45:23 UTC (rev 5926)
@@ -1,3 +1,15 @@
+pingus (0.7.2-2) unstable; urgency=low
+
+  * Fix FTBFS with gcc-4.3 by adding the missing include in
+    src/input/evdev_device.cpp (Closes: #462238):
+     + debian/patches/20_fix_FTBFS_with_gcc-4.3.
+  * Rename former patch so that the filename reflects the order in which
+    the patches are applied:
+     - debian/patches/data_dir.patch
+     + debian/patches/10_fix_data_directory.
+
+ -- Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>  Thu, 28 Feb 2008 19:44:25 +0100
+
 pingus (0.7.2-1) unstable; urgency=low
 
   [Marco Rodrigues]

Copied: packages/trunk/pingus/debian/patches/1O_fix_data_directory (from rev 5925, packages/trunk/pingus/debian/patches/data_dir.patch)
===================================================================
--- packages/trunk/pingus/debian/patches/1O_fix_data_directory	                        (rev 0)
+++ packages/trunk/pingus/debian/patches/1O_fix_data_directory	2008-02-28 17:45:23 UTC (rev 5926)
@@ -0,0 +1,14 @@
+# Copyright (C) 2007 Miriam Ruiz <little_miry at yahoo.es>
+# Licensed under the GPL, see /usr/share/common-licenses/GPL
+
+--- pingus-0.7.1/src/pingus_main.orig.cpp	2007-09-22 16:58:45.000000000 +0100
++++ pingus-0.7.1/src/pingus_main.cpp	2007-09-23 23:02:21.000000000 +0100
+@@ -578,7 +578,7 @@
+         }
+
+       char* exe_path = br_find_exe_dir(".");
+-      path_manager.add_path(exe_path + std::string("/../share/pingus/data/"));
++      path_manager.add_path(exe_path + std::string("/../share/games/pingus/data/"));
+       path_manager.add_path(exe_path + std::string("/data"));
+       path_manager.add_path("data"); // assume game is run from source dir, without any magic
+       free(exe_path);

Added: packages/trunk/pingus/debian/patches/20_fix_FTBFS_with_gcc-4.3
===================================================================
--- packages/trunk/pingus/debian/patches/20_fix_FTBFS_with_gcc-4.3	                        (rev 0)
+++ packages/trunk/pingus/debian/patches/20_fix_FTBFS_with_gcc-4.3	2008-02-28 17:45:23 UTC (rev 5926)
@@ -0,0 +1,12 @@
+# Copyright 2008 Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
+# Licensed under the GPL, see /usr/share/common-licenses/GPL
+--- a/src/input/evdev_device.cpp
++++ b/src/input/evdev_device.cpp
+@@ -25,6 +25,7 @@
+ #include <stdexcept>
+ #include <iostream>
+ #include <errno.h>
++#include <cstring>
+ 
+ #include "evdev_device.hpp"
+ 

Deleted: packages/trunk/pingus/debian/patches/data_dir.patch
===================================================================
--- packages/trunk/pingus/debian/patches/data_dir.patch	2008-02-27 19:05:29 UTC (rev 5925)
+++ packages/trunk/pingus/debian/patches/data_dir.patch	2008-02-28 17:45:23 UTC (rev 5926)
@@ -1,14 +0,0 @@
-# Copyright (C) 2007 Miriam Ruiz <little_miry at yahoo.es>
-# Licensed under the GPL, see /usr/share/common-licenses/GPL
-
---- pingus-0.7.1/src/pingus_main.orig.cpp	2007-09-22 16:58:45.000000000 +0100
-+++ pingus-0.7.1/src/pingus_main.cpp	2007-09-23 23:02:21.000000000 +0100
-@@ -578,7 +578,7 @@
-         }
-
-       char* exe_path = br_find_exe_dir(".");
--      path_manager.add_path(exe_path + std::string("/../share/pingus/data/"));
-+      path_manager.add_path(exe_path + std::string("/../share/games/pingus/data/"));
-       path_manager.add_path(exe_path + std::string("/data"));
-       path_manager.add_path("data"); // assume game is run from source dir, without any magic
-       free(exe_path);

Modified: packages/trunk/pingus/debian/patches/series
===================================================================
--- packages/trunk/pingus/debian/patches/series	2008-02-27 19:05:29 UTC (rev 5925)
+++ packages/trunk/pingus/debian/patches/series	2008-02-28 17:45:23 UTC (rev 5926)
@@ -1 +1,2 @@
-data_dir.patch
+1O_fix_data_directory
+20_fix_FTBFS_with_gcc-4.3