[SCM] advanced 3D real time strategy game engine branch, master, updated. debian/85.0+dfsg1-3-4-g714df1c

[Marco Amadori]

The following commit has been merged in the master branch:
commit 714df1cc77a4131da3c18563c3e2e53d65c54ab9
Author: Marco Amadori <amadori at fbk.eu>
Date:   Mon Mar 12 15:49:11 2012 +0100

    Refreshed boost fix patch.

diff --git a/debian/changelog b/debian/changelog
index 459918d..c4dffeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 spring (87.0+dfsg1-1) UNRELEASED; urgency=low
 
+  [ Jan Dittberner ]
   * New upstream version.
   * remove include/GL and include/SDL when repacking upstream tarball
   * debian/rules: remove unneeded repacking from get-orig-source target.
     Repacking is done in debian/new-upstream that is called by uscan
 
- -- Jan Dittberner <jandd at debian.org>  Sun, 11 Mar 2012 18:10:59 +0100
+  [ Marco Amadori ]
+  * Refreshed boost fix patch.
+
+ -- Marco Amadori <marco.amadori at gmail.com>  Mon, 12 Mar 2012 15:49:50 +0100
 
 spring (85.0+dfsg1-3) unstable; urgency=low
 
diff --git a/debian/patches/0006-fix-boost.1.48-compilation.patch b/debian/patches/0006-fix-boost.1.48-compilation.patch
index 9e734fa..8d21592 100644
--- a/debian/patches/0006-fix-boost.1.48-compilation.patch
+++ b/debian/patches/0006-fix-boost.1.48-compilation.patch
@@ -4,18 +4,6 @@ Reviewed-by: Marco Amadori <marco.amadori at gmail.com>
 Bug: http://springrts.com/mantis/view.php?id=2768
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=660450
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5f89045..a0bc4c6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -245,6 +245,7 @@ set(DEBUG_WARNINGS "-Wall -Wno-sign-compare ${COMMON_WARNINGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsingle-precision-constant -frounding-math")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IEEE_FP_FLAG} -pipe -fno-strict-aliasing ${VISIBILITY_HIDDEN} ${VISIBILITY_INLINES_HIDDEN}")
- add_definitions(-DSTREFLOP_SSE) # would break AI compiling, but is undefined in ./AI/CMakeLists.txt
-+add_definitions(-DBOOST_NO_FENV_H) # streflop overrides fenv.h
- if (UNIX)
- 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
- endif (UNIX)
 diff --git a/rts/lib/assimp/code/StandardShapes.cpp b/rts/lib/assimp/code/StandardShapes.cpp
 index b284824..b038f77 100644
 --- a/rts/lib/assimp/code/StandardShapes.cpp

-- 
advanced 3D real time strategy game engine