[SCM] blobby Debian packaging branch, master, updated. debian/1.0_rc1-1

[Felix Geyer]

The following commit has been merged in the master branch:
commit 040bfcb611c65cedb8d685281433830a18c25cc7
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Fri Apr 13 15:06:48 2012 +0200

    Refresh patches.

diff --git a/debian/changelog b/debian/changelog
index 024e9e5..9cadacb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 blobby (1.0~rc1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refresh patches.
   * Fix Vcs-Browser url.
 
  -- Felix Geyer <debfx-pkg at fobos.de>  Wed, 07 Dec 2011 21:33:59 +0100
diff --git a/debian/patches/02_use_system_lua.patch b/debian/patches/02_use_system_lua.patch
index a5a48a3..e01b02e 100644
--- a/debian/patches/02_use_system_lua.patch
+++ b/debian/patches/02_use_system_lua.patch
@@ -51,4 +51,4 @@ Author: Felix Geyer <debfx-pkg at fobos.de>
 +#include <lua5.1/lualib.h>
  }
  
- #include <physfs.h>
+ #include "FileRead.h"
diff --git a/debian/patches/04_use_system_tinyxml.patch b/debian/patches/04_use_system_tinyxml.patch
index ad5dc3f..cdbad6e 100644
--- a/debian/patches/04_use_system_tinyxml.patch
+++ b/debian/patches/04_use_system_tinyxml.patch
@@ -11,9 +11,9 @@ Author: Felix Geyer <debfx-pkg at fobos.de>
 --- a/src/ReplayRecorder.cpp
 +++ b/src/ReplayRecorder.cpp
 @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite
- 
- #include "ReplayRecorder.h"
- #include "physfs.h"
+ /* includes */
+ #include "IReplayLoader.h"
+ #include "FileWrite.h"
 -#include "tinyxml/tinyxml.h"
 +#include <tinyxml.h>
  
@@ -22,22 +22,22 @@ Author: Felix Geyer <debfx-pkg at fobos.de>
 --- 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>
- 
+ #include "Global.h"
+ #include "FileRead.h"
+ 
+-#include "tinyxml/tinyxml.h"
++#include <tinyxml.h>
+ 
+ #include <iostream>
+ #include <algorithm>
 --- a/src/UserConfig.cpp
 +++ b/src/UserConfig.cpp
 @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite
- 
  #include <iostream>
- #include <physfs.h>
+ #include "FileRead.h"
+ #include "FileWrite.h"
 -#include "tinyxml/tinyxml.h"
 +#include <tinyxml.h>
- #include "UserConfig.h"
- #include "Global.h"
  
+ #include "Global.h"
+ #include <map>
diff --git a/debian/patches/05_server_config_file.patch b/debian/patches/05_server_config_file.patch
index 48a4004..21e5031 100644
--- a/debian/patches/05_server_config_file.patch
+++ b/debian/patches/05_server_config_file.patch
@@ -4,10 +4,10 @@ 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
+--- a/src/server/DedicatedServer.cpp
++++ b/src/server/DedicatedServer.cpp
 @@ -35,6 +35,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- #include "raknet/GetTime.h"
+ #include <SDL/SDL_timer.h>
  // We need no stringcompressor only for the names
  
 +#include "config.h"
@@ -16,7 +16,7 @@ Bug-Debian: http://bugs.debian.org/648204
  #include "InputSource.h"
  #include "PhysicWorld.h"
 @@ -107,6 +109,8 @@ int main(int argc, char** argv)
- 	Color firstPlayerColor;
+ 	NetworkPlayer firstPlayer;
  
  	config.loadFile("server.xml");
 +	// make sure the config is present in the user dir

-- 
blobby Debian packaging