r4277 - packages/trunk/pingus/debian/patches

[Marco Rodrigues]

Author: gothicx-guest
Date: 2007-09-23 22:28:53 +0000 (Sun, 23 Sep 2007)
New Revision: 4277

Modified:
   packages/trunk/pingus/debian/patches/data_dir.patch
Log:
updated data_dir.patch for 0.7.1

Modified: packages/trunk/pingus/debian/patches/data_dir.patch
===================================================================
--- packages/trunk/pingus/debian/patches/data_dir.patch	2007-09-23 21:19:09 UTC (rev 4276)
+++ packages/trunk/pingus/debian/patches/data_dir.patch	2007-09-23 22:28:53 UTC (rev 4277)
@@ -1,16 +1,11 @@
-# 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 @@
+         }
 
-Index: pingus-0.7.0/src/pingus_main.cpp
-===================================================================
---- pingus-0.7.0.orig/src/pingus_main.cpp	2007-08-31 17:26:52.000000000 +0000
-+++ pingus-0.7.0/src/pingus_main.cpp	2007-08-31 17:27:53.000000000 +0000
-@@ -622,7 +622,7 @@
-     }
-   
-   std::string data_path = br_find_prefix("data");
--  data_path += "/share/pingus/data/";
-+  data_path += "/share/games/pingus/data/";
-   //std::cout << "DataPath: " << data_path << std::endl;
-   path_manager.add_path(data_path);
-   path_manager.add_path("data");
+       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);