[SCM] blobby Debian packaging branch, master, updated. upstream/0.9c-32-gbd44776

[Felix Geyer]

The following commit has been merged in the master branch:
commit 5b26478c76f870f45cd12f5f40168659666bd135
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Fri Nov 11 13:02:52 2011 +0100

    Append /usr/share/blobby to the server's search path so it's able to find server.xml.
    
    Closes: #648204

diff --git a/debian/changelog b/debian/changelog
index e62f6f1..ee7b8ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ blobby (0.9c-1) UNRELEASED; urgency=low
   * Generate blobby icons during the build.
   * Update copyright file to latest DEP-5 spec.
   * Pass --fail-missing to dh_install.
+  * Add 05_server_search_path.patch: append /usr/share/blobby to the server's
+    search path so it's able to find server.xml. (Closes: #648204)
 
  -- Felix Geyer <debfx-pkg at fobos.de>  Wed, 21 Apr 2010 15:29:25 +0200
 
diff --git a/debian/patches/05_server_search_path.patch b/debian/patches/05_server_search_path.patch
new file mode 100644
index 0000000..19d99fd
--- /dev/null
+++ b/debian/patches/05_server_search_path.patch
@@ -0,0 +1,25 @@
+Description: Add /usr/share/blobby to the server's search path so it's
+ able to find server.xml.
+Author: Felix Geyer <debfx-pkg at fobos.de>
+Bug: https://sourceforge.net/apps/mantisbt/blobby/view.php?id=33
+Bug-Debian: http://bugs.debian.org/648204
+
+--- a/src/DedicatedServer.cpp
++++ b/src/DedicatedServer.cpp
+@@ -35,6 +35,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ #include "raknet/GetTime.h"
+ // We need no stringcompressor only for the names
+ 
++#include "config.h"
++
+ #include "DedicatedServer.h"
+ #include "InputSource.h"
+ #include "PhysicWorld.h"
+@@ -497,6 +499,7 @@ void setup_physfs(char* argv0)
+ {
+ 	PHYSFS_init(argv0);
+ 	PHYSFS_addToSearchPath("data", 1);
++	PHYSFS_addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby", 1);
+ 	
+ 	#if defined(WIN32)
+ 	// Just write in installation directory
diff --git a/debian/patches/series b/debian/patches/series
index ce60635..17e4b5e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_sdl_default.patch
 02_use_system_lua.patch
 04_use_system_tinyxml.patch
+05_server_search_path.patch

-- 
blobby Debian packaging