[SCM] blobby Debian packaging branch, master, updated. debian/0.8-dfsg-1-19-g316053b

Felix Geyer debfx-pkg at fobos.de
Thu Oct 20 12:25:51 UTC 2011 

The following commit has been merged in the master branch:
commit 0727a6480f21b736b51b1dab30442a5ec14a0d3d
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Thu Oct 20 12:01:05 2011 +0200

    Refresh patches.

diff --git a/debian/changelog b/debian/changelog
index 48b5edb..885df3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ blobby (0.8-dfsg-3) UNRELEASED; urgency=low
   * Enable parallel building.
   * Switch to source format 3.0 (quilt).
     - Add unapply-patches and abort-on-upstream-changes to local-options.
+    - Refresh patches.
 
  -- Felix Geyer <debfx-pkg at fobos.de>  Wed, 21 Apr 2010 15:29:25 +0200
 
diff --git a/debian/patches/01_sdl_default.patch b/debian/patches/01_sdl_default.patch
index d708b22..4a8f686 100644
--- a/debian/patches/01_sdl_default.patch
+++ b/debian/patches/01_sdl_default.patch
@@ -1,9 +1,8 @@
 Description: Use SDL by default since it's faster without hardware acceleration
 Author: Felix Geyer <debfx-pkg at fobos.de>
 
-diff -Nur blobby-volley2-0.7~svn430.orig/data/config.xml blobby-volley2-0.7~svn430/data/config.xml
---- blobby-volley2-0.7~svn430.orig/data/config.xml	2008-03-13 22:51:40.000000000 +0100
-+++ blobby-volley2-0.7~svn430/data/config.xml	2008-04-10 20:21:53.000000000 +0200
+--- a/data/config.xml
++++ b/data/config.xml
 @@ -1,7 +1,7 @@
  <?xml version="1.0" encoding="utf-8"?>
  
@@ -13,10 +12,9 @@ diff -Nur blobby-volley2-0.7~svn430.orig/data/config.xml blobby-volley2-0.7~svn4
  	<var name="fullscreen" value="false"/>
  	<var name="left_blobby_color_r" value="0"/>
  	<var name="left_blobby_color_g" value="0"/>
-diff -Nur blobby-volley2-0.7~svn430.orig/src/main.cpp blobby-volley2-0.7~svn430/src/main.cpp
---- blobby-volley2-0.7~svn430.orig/src/main.cpp	2008-03-13 22:51:40.000000000 +0100
-+++ blobby-volley2-0.7~svn430/src/main.cpp	2008-04-10 20:22:39.000000000 +0200
-@@ -143,8 +143,8 @@
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -160,8 +160,8 @@ int main(int argc, char* argv[])
  		else
  		{
  			std::cerr << "Warning: Unknown renderer selected!";
diff --git a/debian/patches/02_use_system_lua.patch b/debian/patches/02_use_system_lua.patch
index f69eaf2..8d4f9c7 100644
--- a/debian/patches/02_use_system_lua.patch
+++ b/debian/patches/02_use_system_lua.patch
@@ -1,27 +1,25 @@
 Description: Use system lua library instead of building a local copy
 Author: Felix Geyer <debfx-pkg at fobos.de>
 
-diff -Nur blobby-volley2-0.7~svn430.orig/src/CMakeLists.txt blobby-volley2-0.7~svn430/src/CMakeLists.txt
---- blobby-volley2-0.7~svn430.orig/src/CMakeLists.txt	2008-03-23 20:24:20.000000000 +0100
-+++ blobby-volley2-0.7~svn430/src/CMakeLists.txt	2008-04-10 20:16:39.000000000 +0200
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
 @@ -1,4 +1,3 @@
 -add_subdirectory(lua)
  add_subdirectory(tinyxml)
  add_subdirectory(raknet)
  
-@@ -64,7 +63,7 @@
+@@ -64,7 +63,7 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows
  endif (CMAKE_SYSTEM_NAME STREQUAL Windows)
  
  add_executable(blobby ${blobby_SRC})
 -target_link_libraries(blobby lua raknet tinyxml ${RAKNET_LIBRARIES} ${PHYSFS_LIBRARY} ${SDL_LIBRARY} ${OPENGL_LIBRARIES})
 +target_link_libraries(blobby lua5.1 raknet tinyxml ${RAKNET_LIBRARIES} ${PHYSFS_LIBRARY} ${SDL_LIBRARY} ${OPENGL_LIBRARIES})
  
- if (CMAKE_SYSTEM_NAME STREQUAL Linux)
+ if (UNIX)
  	add_executable(blobby-server ${blobby-server_SRC})
-diff -Nur blobby-volley2-0.7~svn430.orig/src/ScriptedInputSource.cpp blobby-volley2-0.7~svn430/src/ScriptedInputSource.cpp
---- blobby-volley2-0.7~svn430.orig/src/ScriptedInputSource.cpp	2008-03-13 22:51:40.000000000 +0100
-+++ blobby-volley2-0.7~svn430/src/ScriptedInputSource.cpp	2008-04-10 20:18:39.000000000 +0200
-@@ -22,9 +22,9 @@
+--- a/src/ScriptedInputSource.cpp
++++ b/src/ScriptedInputSource.cpp
+@@ -22,9 +22,9 @@ Foundation, Inc., 59 Temple Place, Suite
  
  extern "C"
  {
diff --git a/debian/patches/03_detect_endianness_glibc.patch b/debian/patches/03_detect_endianness_glibc.patch
index f912b41..528a70b 100644
--- a/debian/patches/03_detect_endianness_glibc.patch
+++ b/debian/patches/03_detect_endianness_glibc.patch
@@ -3,7 +3,6 @@ Author: Felix Geyer <debfx-pkg at fobos.de>
 Bug: https://sourceforge.net/apps/mantisbt/blobby/view.php?id=12
 Bug-Debian: http://bugs.debian.org/572025
 
-diff --git a/src/raknet/Types.h b/src/raknet/Types.h
 --- a/src/raknet/Types.h
 +++ b/src/raknet/Types.h
 @@ -98,6 +98,18 @@
diff --git a/debian/patches/04_use_system_tinyxml.patch b/debian/patches/04_use_system_tinyxml.patch
index 2e81ab3..d06398d 100644
--- a/debian/patches/04_use_system_tinyxml.patch
+++ b/debian/patches/04_use_system_tinyxml.patch
@@ -1,18 +1,16 @@
 Description: Use system tinyxml library instead of building a local copy
 Author: Felix Geyer <debfx-pkg at fobos.de>
 
-diff -Nur blobby-0.8-dfsg.orig/src/CMakeLists.txt blobby-0.8-dfsg/src/CMakeLists.txt
---- blobby-0.8-dfsg.orig/src/CMakeLists.txt	2010-04-17 00:43:49.000000000 +0200
-+++ blobby-0.8-dfsg/src/CMakeLists.txt	2010-04-17 00:44:43.474092360 +0200
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
 @@ -1,4 +1,3 @@
 -add_subdirectory(tinyxml)
  add_subdirectory(raknet)
  
  add_definitions(-DTIXML_USE_STL)
-diff -Nur blobby-0.8-dfsg.orig/src/ReplayRecorder.cpp blobby-0.8-dfsg/src/ReplayRecorder.cpp
---- blobby-0.8-dfsg.orig/src/ReplayRecorder.cpp	2010-02-26 12:36:23.000000000 +0100
-+++ blobby-0.8-dfsg/src/ReplayRecorder.cpp	2010-04-17 00:45:26.964094447 +0200
-@@ -19,7 +19,7 @@
+--- a/src/ReplayRecorder.cpp
++++ b/src/ReplayRecorder.cpp
+@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite
  
  #include "ReplayRecorder.h"
  #include "physfs.h"
@@ -21,10 +19,9 @@ diff -Nur blobby-0.8-dfsg.orig/src/ReplayRecorder.cpp blobby-0.8-dfsg/src/Replay
  
  #include <algorithm>
  #include <sstream>
-diff -Nur blobby-0.8-dfsg.orig/src/UserConfig.cpp blobby-0.8-dfsg/src/UserConfig.cpp
---- blobby-0.8-dfsg.orig/src/UserConfig.cpp	2010-02-26 12:36:23.000000000 +0100
-+++ blobby-0.8-dfsg/src/UserConfig.cpp	2010-04-17 00:45:20.674096589 +0200
-@@ -19,7 +19,7 @@
+--- a/src/UserConfig.cpp
++++ b/src/UserConfig.cpp
+@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite
  
  #include <iostream>
  #include <physfs.h>

-- 
blobby Debian packaging

More information about the Pkg-games-commits mailing list