[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 5a21cb531751a25e5f6d7469cdf7bd2795283dc0
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Fri Nov 11 12:21:02 2011 +0100

    Cover more cases where the embedded libs are used.

diff --git a/debian/patches/02_use_system_lua.patch b/debian/patches/02_use_system_lua.patch
index 519a314..a5a48a3 100644
--- a/debian/patches/02_use_system_lua.patch
+++ b/debian/patches/02_use_system_lua.patch
@@ -8,7 +8,7 @@ Author: Felix Geyer <debfx-pkg at fobos.de>
  add_subdirectory(tinyxml)
  add_subdirectory(raknet)
  
-@@ -64,7 +63,7 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows
+@@ -64,11 +63,11 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows
  endif (CMAKE_SYSTEM_NAME STREQUAL Windows)
  
  add_executable(blobby ${blobby_SRC})
@@ -17,6 +17,11 @@ Author: Felix Geyer <debfx-pkg at fobos.de>
  
  if (UNIX)
  	add_executable(blobby-server ${blobby-server_SRC})
+-	target_link_libraries(blobby-server lua raknet tinyxml ${RAKNET_LIBRARIES} ${PHYSFS_LIBRARY} ${SDL_LIBRARY})
++	target_link_libraries(blobby-server lua5.1 raknet tinyxml ${RAKNET_LIBRARIES} ${PHYSFS_LIBRARY} ${SDL_LIBRARY})
+ endif (UNIX)
+ 
+ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
 --- a/src/ScriptedInputSource.cpp
 +++ b/src/ScriptedInputSource.cpp
 @@ -22,9 +22,9 @@ Foundation, Inc., 59 Temple Place, Suite
@@ -32,3 +37,18 @@ Author: Felix Geyer <debfx-pkg at fobos.de>
  }
  
  #include <iostream>
+--- a/src/GameLogic.cpp
++++ b/src/GameLogic.cpp
+@@ -24,9 +24,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+ extern "C"
+ {
+-#include "lua/lua.h"
+-#include "lua/lauxlib.h"
+-#include "lua/lualib.h"
++#include <lua5.1/lua.h>
++#include <lua5.1/lauxlib.h>
++#include <lua5.1/lualib.h>
+ }
+ 
+ #include <physfs.h>
diff --git a/debian/patches/04_use_system_tinyxml.patch b/debian/patches/04_use_system_tinyxml.patch
index 1b24803..ad5dc3f 100644
--- a/debian/patches/04_use_system_tinyxml.patch
+++ b/debian/patches/04_use_system_tinyxml.patch
@@ -19,6 +19,17 @@ Author: Felix Geyer <debfx-pkg at fobos.de>
  
  #include <algorithm>
  #include <iostream>
+--- a/src/TextManager.cpp
++++ b/src/TextManager.cpp
+@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+ #include <iostream>
+ #include <physfs.h>
+-#include "tinyxml/tinyxml.h"
++#include <tinyxml.h>
+ #include "Global.h"
+ #include <algorithm>
+ 
 --- a/src/UserConfig.cpp
 +++ b/src/UserConfig.cpp
 @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite

-- 
blobby Debian packaging