[SCM] advanced 3D real time strategy game engine branch, experimental, updated. debian/85.0+dfsg1-3-20-g7104960

[Jan Dittberner]

The following commit has been merged in the experimental branch:
commit 710496079feb494345ad6d88133d32b5dc4a0977
Author: Jan Dittberner <jan at dittberner.info>
Date:   Wed Jul 11 22:30:46 2012 +0200

    refresh debian/patches/0005-fix-sdl-build.patch

diff --git a/debian/changelog b/debian/changelog
index 745c63c..48b0deb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ spring (89.0+dfsg1-1) experimental; urgency=low
 
   * New upstream version.
   * Thanks to Matthias Klose for the NMU.
+  * refresh debian/patches/0005-fix-sdl-build.patch
 
  -- Jan Dittberner <jandd at debian.org>  Wed, 11 Jul 2012 22:23:57 +0200
 
diff --git a/debian/patches/0005-fix-sdl-build.patch b/debian/patches/0005-fix-sdl-build.patch
index 1b29820..9472537 100644
--- a/debian/patches/0005-fix-sdl-build.patch
+++ b/debian/patches/0005-fix-sdl-build.patch
@@ -3,9 +3,9 @@ Subject: Use Debian version of SDL headers instead of missing included
 
 --- a/rts/lib/headlessStubs/CMakeLists.txt
 +++ b/rts/lib/headlessStubs/CMakeLists.txt
-@@ -12,18 +12,8 @@
- 		)
- ENDIF (WIN32)
+@@ -6,18 +6,8 @@
+ 		"sdlstub_cppbit"
+ 	)
  
 -IF    (MINGW)
 -	# We still need these header files,
@@ -26,18 +26,22 @@ Subject: Use Debian version of SDL headers instead of missing included
  TARGET_LINK_LIBRARIES(headlessStubs ${Boost_THREAD_LIBRARY})
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -165,9 +165,8 @@
- 	add_definitions(${CUSTOM_COMPILER_DEFINITIONS})
- endif (CUSTOM_COMPILER_DEFINITIONS)
+@@ -190,14 +190,11 @@
  
+ 
+ ### external libs
 -if    (MINGW)
 -	set(SDL_INCLUDE_DIR "${MINGWLIBS}/include/SDL")
 -endif (MINGW)
-+FIND_PACKAGE(SDL REQUIRED)
+-
+ FIND_PACKAGE(Boost 1.35.0 COMPONENTS thread regex program_options system signals REQUIRED)
+ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
+ 
+ FIND_PACKAGE(SDL REQUIRED)
 +INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
- if    (WIN32)
- 	FIND_PACKAGE(Windres)
- endif (WIN32)
+ 
+ FIND_PACKAGE_STATIC(DevIL REQUIRED)
+ IF    (PREFER_STATIC_LIBS)
 --- a/tools/unitsync/CMakeLists.txt
 +++ b/tools/unitsync/CMakeLists.txt
 @@ -13,18 +13,8 @@

-- 
advanced 3D real time strategy game engine