[SCM] advanced 3D real time strategy game engine branch, master, updated. debian/0.80.5.2-2-3-g6919173

Sat Jan 23 11:06:16 UTC 2010

The following commit has been merged in the master branch:
commit 6919173dc76ca38dc9144fec11b72d4fcca62a0c
Author: Marco Amadori <marco.amadori at gmail.com>
Date:   Tue Jan 19 11:54:16 2010 +0100

    Add a way to not set -march flag (Closes: #563686).
    
    * removed upstream merged patches and manpages.

diff --git a/debian/manpages/Makefile b/debian/manpages/Makefile
deleted file mode 100644
index 2c3eead..0000000
--- a/debian/manpages/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/make -f
-
-build: spring.6 spring-dedicated.6
-
-%.6 : %.6.xml
-	xsltproc /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl $<
-
-%.6.xml : %.6.txt
-	asciidoc -d manpage -b docbook $<
-
-clean:
-	rm -f *.6
diff --git a/debian/manpages/spring-dedicated.6.txt b/debian/manpages/spring-dedicated.6.txt
deleted file mode 100644
index c8f35cd..0000000
--- a/debian/manpages/spring-dedicated.6.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-spring-dedicated(6)
-===================
-:man source:  Spring package
-:man manual:  Games
-
-
-Name
-----
-spring-dedicated - GUI-less dedicated server for playing spring(6) games
-
-
-Synopsis
---------
-*spring* SCRIPT
-
-
-Description
------------
-Spring is a free Real Time Strategy (RTS) game engine originally designed to
-play Total Annihilation ((C) 1997 Cavedog) content which has evolved into a general RTS
-engine capable of running various kinds of games (mods).
-
-It is mainly designed around online multiplayer games but can be played in
-single-player mode against an AI.
-
-This is the dedicated GUI-less server for hosting multiplayer games. You need to
-feed it a properly formatted script in order to have it host a game.
-
-Files
------
-
-  /etc/spring/datadir
-
-Contains the path used by spring and springlobby to save downloaded files and temporary data.
-
-See also
---------
-
-spring(6)
-
-Homepage
---------
-
-More information about Spring can be found at
-link:http://springrts.com
-
-Author
-------
-Spring was written by the Spring developers.
-
-This manual page was written by Marco Amadori <marco.amadori at gmail.com>,
-for the Debian project (and may be used by others).
diff --git a/debian/manpages/spring.6.txt b/debian/manpages/spring.6.txt
deleted file mode 100644
index d0c2711..0000000
--- a/debian/manpages/spring.6.txt
+++ /dev/null
@@ -1,105 +0,0 @@
-spring(6)
-=========
-:man source:  Spring package
-:man manual:  Games
-
-
-Name
-----
-spring - An open source RTS with similar gameplay to TA
-
-
-Synopsis
---------
-*spring* [-f|--fullscreen] [-w|--window] [-x|--xresolution 'SIZE'] [-y|--yresolution 'SIZE'] [-m|--minimise] [[-c|--client] | [-s|--server]] [-p|--projectiledump] [-t|--textureatlas] [-n|--name 'STRING'] [-C|--config 'FILE']
-
-*spring* --list-ai-interfaces
-
-*spring* --list-skirmish-ais
-
-*spring* [-h|--help]
-
-*spring* [-V|--version]
-
-
-Description
------------
-Spring is a free Real Time Strategy (RTS) game engine originally designed to
-play Total Annihilation ((C) 1997 Cavedog) content which has evolved into a general RTS
-engine capable of running various kinds of games (mods).
-
-It is mainly designed around online multiplayer games but can be played in
-single-player mode against an AI.
-
-
-Options
--------
-*-h, --help*::
-  Print the options help message and exit
-
-*-V, --version*::
-  Display program version and exit
-
-*-f, --fullscreen*::
-  Run in fullscreen mode
-
-*-w, --window*::
-  Run in windowed mode
-
-*-x, --xresolution*::'SIZE'
-  Set X resolution
-
-*-y, --yresolution*::'SIZE'
-  Set Y resolution
-
-*-m, --minimise*::
-  Start minimised
-
-*-s, --server*::
-  Run as a server
-
-*-c, --client*::
-  Run as a client
-
-*-p, --projectiledump*::
-  Dump projectile class info into projectiles.txt
-
-*-t, --textureatlas*::
-  Dump each finalised textureatlas into textureatlasN.tga
-
-*-n, --name*::'NAME'
-  Set your player name
-
- *-C, --config*::'FILE'
-  Configuration file
-
-*--list-ai-interfaces*::
-  Dump a list of available AI Interfaces to STDOUT
-
-*--list-skirmish-ais*::
-  Dump a list of available Skirmish AIs to STDOUT
-
-Files
------
-
-  /etc/spring/datadir
-
-Contains the path used by spring and springlobby to save downloaded files and temporary data.
-
-See also
---------
-
-spring-dedicated(6)
-
-Homepage
---------
-
-More information about Spring can be found at
-link:http://springrts.com
-
-Author
-------
-Spring was written by the Spring developers.
-
-This manual page was written by Marco Amadori <marco.amadori at gmail.com>,
-for the Debian project (and may be used by others).
diff --git a/debian/patches/0001-Add-a-way-to-not-set-march-flag.patch b/debian/patches/0001-Add-a-way-to-not-set-march-flag.patch
new file mode 100644
index 0000000..5780800
--- /dev/null
+++ b/debian/patches/0001-Add-a-way-to-not-set-march-flag.patch
@@ -0,0 +1,40 @@
+From: Marco Amadori <marco.amadori at gmail.com>
+Subject: [PATCH] Add a way to not set -march flag.
+
+---
+ CMakeLists.txt |   19 ++++++++++++-------
+ 1 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dee413a..4ab2104 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -131,13 +131,18 @@ endif  (MINGW)
+ 
+ ### Compiler flags and defines based on build type
+ INCLUDE(TestCXXFlags)
+-if    (CMAKE_SIZEOF_VOID_P EQUAL 8)
+-	message (STATUS "Building Spring for 64bit environment")
+-	set (MARCH_FLAG CACHE STRING "CPU optimization (use i686 for generic optimization)")
+-else  (CMAKE_SIZEOF_VOID_P EQUAL 8)
+-	message (STATUS "Building Spring for 32bit environment")
+-	set (MARCH_FLAG "i686" CACHE STRING "CPU optimization (use i686 for generic optimization)")
+-endif (CMAKE_SIZEOF_VOID_P EQUAL 8)
++set (DO_SET_MARCH_FLAG TRUE CACHE BOOL "Set to FALSE if your OS handles -march itself")
++if (DO_SET_MARCH_FLAG)
++	if    (CMAKE_SIZEOF_VOID_P EQUAL 8)
++		message (STATUS "Building Spring for 64bit environment")
++		set (MARCH_FLAG CACHE STRING "CPU optimization (use i686 for generic optimization)")
++	else  (CMAKE_SIZEOF_VOID_P EQUAL 8)
++		message (STATUS "Building Spring for 32bit environment")
++		set (MARCH_FLAG "i686" CACHE STRING "CPU optimization (use i686 for generic optimization)")
++	endif (CMAKE_SIZEOF_VOID_P EQUAL 8)
++else (DO_SET_MARCH_FLAG)
++	set (MARCH_FLAG CACHE STRING "CPU optimization")
++endif (DO_SET_MARCH_FLAG)
+ 
+ if    ($ENV{CXX} MATCHES "icpc")
+ 	# intel C/C++ compiler fix; it does not support these flags:
+-- 
+1.6.6
+
diff --git a/debian/patches/0001-Clarify-GML-license-as-per-request.patch b/debian/patches/0001-Clarify-GML-license-as-per-request.patch
deleted file mode 100644
index 1130b5e..0000000
--- a/debian/patches/0001-Clarify-GML-license-as-per-request.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 46850e9463d2a4e5505299501a9765696d31797b Mon Sep 17 00:00:00 2001
-From: zerver <mr at zerver.net>
-Date: Mon, 11 Jan 2010 22:06:48 +0200
-Subject: [PATCH] Clarify GML license as per request
-
----
- rts/lib/gml/gml.cpp  |    5 +++--
- rts/lib/gml/gml.h    |    5 +++--
- rts/lib/gml/gmlcls.h |    5 +++--
- rts/lib/gml/gmlcnt.h |    5 +++--
- rts/lib/gml/gmldef.h |    5 +++--
- rts/lib/gml/gmlfun.h |    5 +++--
- rts/lib/gml/gmlimp.h |    5 +++--
- rts/lib/gml/gmlsrv.h |    5 +++--
- 8 files changed, 24 insertions(+), 16 deletions(-)
-
-diff --git a/rts/lib/gml/gml.cpp b/rts/lib/gml/gml.cpp
-index 3a0a7f7..c0a21da 100644
---- a/rts/lib/gml/gml.cpp
-+++ b/rts/lib/gml/gml.cpp
-@@ -3,8 +3,9 @@
- // Author: Mattias "zerver" Radeskog
- // (C) Ware Zerver Tech. http://zerver.net
- // Ware Zerver Tech. licenses this library
--// to be used freely for any purpose, as
--// long as this notice remains unchanged
-+// to be used, distributed and modified 
-+// freely for any purpose, as long as 
-+// this notice remains unchanged
- 
- // GML works by "patching" all OpenGL calls. It is injected via a #include "gml.h" statement located in myGL.h.
- // All files that need GL should therefore include myGL.h. INCLUDING gl.h, glu.h, glext.h ... IS FORBIDDEN.
-diff --git a/rts/lib/gml/gml.h b/rts/lib/gml/gml.h
-index 2c933ae..7dfa9c7 100644
---- a/rts/lib/gml/gml.h
-+++ b/rts/lib/gml/gml.h
-@@ -3,8 +3,9 @@
- // Author: Mattias "zerver" Radeskog
- // (C) Ware Zerver Tech. http://zerver.net
- // Ware Zerver Tech. licenses this library
--// to be used freely for any purpose, as
--// long as this notice remains unchanged
-+// to be used, distributed and modified 
-+// freely for any purpose, as long as 
-+// this notice remains unchanged
- 
- #ifndef GML_H
- #define GML_H
-diff --git a/rts/lib/gml/gmlcls.h b/rts/lib/gml/gmlcls.h
-index bc7cb88..927d041 100644
---- a/rts/lib/gml/gmlcls.h
-+++ b/rts/lib/gml/gmlcls.h
-@@ -3,8 +3,9 @@
- // Author: Mattias "zerver" Radeskog
- // (C) Ware Zerver Tech. http://zerver.net
- // Ware Zerver Tech. licenses this library
--// to be used freely for any purpose, as
--// long as this notice remains unchanged
-+// to be used, distributed and modified 
-+// freely for any purpose, as long as 
-+// this notice remains unchanged
- 
- #ifndef GMLCLASSES_H
- #define GMLCLASSES_H
-diff --git a/rts/lib/gml/gmlcnt.h b/rts/lib/gml/gmlcnt.h
-index a7e1833..f04fa66 100644
---- a/rts/lib/gml/gmlcnt.h
-+++ b/rts/lib/gml/gmlcnt.h
-@@ -3,8 +3,9 @@
- // Author: Mattias "zerver" Radeskog
- // (C) Ware Zerver Tech. http://zerver.net
- // Ware Zerver Tech. licenses this library
--// to be used freely for any purpose, as
--// long as this notice remains unchanged
-+// to be used, distributed and modified 
-+// freely for any purpose, as long as 
-+// this notice remains unchanged
- 
- // This code is largely based on boost::detail::atomic_count
- //
-diff --git a/rts/lib/gml/gmldef.h b/rts/lib/gml/gmldef.h
-index c29d28f..a43e4c2 100644
---- a/rts/lib/gml/gmldef.h
-+++ b/rts/lib/gml/gmldef.h
-@@ -3,8 +3,9 @@
- // Author: Mattias "zerver" Radeskog
- // (C) Ware Zerver Tech. http://zerver.net
- // Ware Zerver Tech. licenses this library
--// to be used freely for any purpose, as
--// long as this notice remains unchanged
-+// to be used, distributed and modified 
-+// freely for any purpose, as long as 
-+// this notice remains unchanged
- 
- #undef glDisable
- #undef glEnable
-diff --git a/rts/lib/gml/gmlfun.h b/rts/lib/gml/gmlfun.h
-index 56fcae3..5b4f9b6 100644
---- a/rts/lib/gml/gmlfun.h
-+++ b/rts/lib/gml/gmlfun.h
-@@ -3,8 +3,9 @@
- // Author: Mattias "zerver" Radeskog
- // (C) Ware Zerver Tech. http://zerver.net
- // Ware Zerver Tech. licenses this library
--// to be used freely for any purpose, as
--// long as this notice remains unchanged
-+// to be used, distributed and modified 
-+// freely for any purpose, as long as 
-+// this notice remains unchanged
- 
- #ifndef GMLFUN_H
- #define GMLFUN_H
-diff --git a/rts/lib/gml/gmlimp.h b/rts/lib/gml/gmlimp.h
-index b3e7cf9..11bbfcf 100644
---- a/rts/lib/gml/gmlimp.h
-+++ b/rts/lib/gml/gmlimp.h
-@@ -3,8 +3,9 @@
- // Author: Mattias "zerver" Radeskog
- // (C) Ware Zerver Tech. http://zerver.net
- // Ware Zerver Tech. licenses this library
--// to be used freely for any purpose, as
--// long as this notice remains unchanged
-+// to be used, distributed and modified 
-+// freely for any purpose, as long as 
-+// this notice remains unchanged
- 
- #undef glAccum
- #undef glActiveStencilFaceEXT
-diff --git a/rts/lib/gml/gmlsrv.h b/rts/lib/gml/gmlsrv.h
-index 2eeb621..738fe22 100644
---- a/rts/lib/gml/gmlsrv.h
-+++ b/rts/lib/gml/gmlsrv.h
-@@ -3,8 +3,9 @@
- // Author: Mattias "zerver" Radeskog
- // (C) Ware Zerver Tech. http://zerver.net
- // Ware Zerver Tech. licenses this library
--// to be used freely for any purpose, as
--// long as this notice remains unchanged
-+// to be used, distributed and modified 
-+// freely for any purpose, as long as 
-+// this notice remains unchanged
- 
- #ifndef GMLSRV_H
- #define GMLSRV_H
--- 
-1.6.6
-
diff --git a/debian/patches/0002-allow-building-without-SSE-flags-but-give-a-warning-.patch b/debian/patches/0002-allow-building-without-SSE-flags-but-give-a-warning-.patch
deleted file mode 100644
index cefb9a6..0000000
--- a/debian/patches/0002-allow-building-without-SSE-flags-but-give-a-warning-.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 10e71a7e195a1351397a25703553e83ecbb73b7f Mon Sep 17 00:00:00 2001
-From: Karl-Robert Ernst <k-r.ernst at my-mail.ch>
-Date: Sat, 9 Jan 2010 01:41:42 +0100
-Subject: [PATCH] allow building without SSE flags, but give a warning (probably should do something to prevent online play)
-
----
- CMakeLists.txt                                     |    7 +--
- rts/build/cmake/TestCXXAcceptsVisibilityFlag.cmake |   30 ------------
- rts/build/cmake/TestCXXFlags.cmake                 |   50 ++++++++++++++++++++
- 3 files changed, 53 insertions(+), 34 deletions(-)
- delete mode 100644 rts/build/cmake/TestCXXAcceptsVisibilityFlag.cmake
- create mode 100644 rts/build/cmake/TestCXXFlags.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d01ea3c..dee413a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -31,7 +31,6 @@ else  (UNIX AND NOT MINGW)
- 	add_definitions(-D_WIN32_WINNT=0x500) ## win2k is minimum
- 	# some cross-compile fixes
- 	set (CMAKE_FIND_ROOT_PATH ${MINGWLIBS} ${CMAKE_FIND_ROOT_PATH})
--	#set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
- 	set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
- 	set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
- 	set (STABS_DEBUG_SYMBOLS FALSE CACHE BOOL "Use stabs debug symbols (-stabs) instead of the GDB format (-gdb). This probably makes gdb and eg. addr2line work better with windows binaries (depends mainly on the tools version).")
-@@ -131,7 +130,7 @@ else   (UNIX)
- endif  (MINGW)
- 
- ### Compiler flags and defines based on build type
--INCLUDE(TestCXXAcceptsVisibilityFlag)
-+INCLUDE(TestCXXFlags)
- if    (CMAKE_SIZEOF_VOID_P EQUAL 8)
- 	message (STATUS "Building Spring for 64bit environment")
- 	set (MARCH_FLAG CACHE STRING "CPU optimization (use i686 for generic optimization)")
-@@ -149,7 +148,7 @@ else  ($ENV{CXX} MATCHES "icpc")
- 	if    (MARCH_FLAG)
- 		set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${MARCH_FLAG}")
- 	endif (MARCH_FLAG)
--	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -mfpmath=sse") # SSE1
-+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SSE_FLAGS}") # SSE1
- 	if    (MINGW)
- 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mthreads") # SSE1
- 	endif (MINGW)
-@@ -167,7 +166,7 @@ endif(SIGNAL_NANS)
- # This should produce a sane ammount of warnings
- set(DEBUG_WARNINGS "-Wall -Wno-sign-compare")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsingle-precision-constant -frounding-math")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mieee-fp -pipe -fno-strict-aliasing ${VISIBILITY_HIDDEN} ${VISIBILITY_INLINES_HIDDEN}")
-+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
- if (UNIX)
- 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
-diff --git a/rts/build/cmake/TestCXXAcceptsVisibilityFlag.cmake b/rts/build/cmake/TestCXXAcceptsVisibilityFlag.cmake
-deleted file mode 100644
-index 366a84a..0000000
---- a/rts/build/cmake/TestCXXAcceptsVisibilityFlag.cmake
-+++ /dev/null
-@@ -1,30 +0,0 @@
--# - Test whether the C++ compiler supports "-fvisibility=hidden"
--# Once done this will define
--#
--# VISIBILITY_HIDDEN - -fvisibility=hidden   if supported, an empty string otherwise.
--# VISIBILITY_INLINES_HIDDEN - -fvisibility-inlines-hidden   likewise
--#
--# Copyright (C) 2008 Tobi Vollebregt
--# Copyright (C) 2008 Karl-Robert Ernst
--#
--# Note: gcc for windows supports these flags, but give lots of errors when compiling, so use only for linux builds
--
--INCLUDE(TestCXXAcceptsFlag)
--
--IF(NOT DEFINED VISIBILITY_HIDDEN)
--	CHECK_CXX_ACCEPTS_FLAG(-fvisibility=hidden HAS_VISIBILITY_HIDDEN)
--	IF(HAS_VISIBILITY_HIDDEN AND NOT MINGW)
--		SET(VISIBILITY_HIDDEN "-fvisibility=hidden")
--	ELSE(HAS_VISIBILITY_HIDDEN AND NOT MINGW)
--		SET(VISIBILITY_HIDDEN "")
--	ENDIF(HAS_VISIBILITY_HIDDEN AND NOT MINGW)
--ENDIF(NOT DEFINED VISIBILITY_HIDDEN)
--	
--IF(NOT DEFINED VISIBILITY_INLINES_HIDDEN)
--	CHECK_CXX_ACCEPTS_FLAG(-fvisibility-inlines-hidden HAS_VISIBILITY_INLINES_HIDDEN)
--	IF(HAS_VISIBILITY_INLINES_HIDDEN AND NOT MINGW)
--		SET(VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")
--	ELSE(HAS_VISIBILITY_INLINES_HIDDEN AND NOT MINGW)
--		SET(VISIBILITY_INLINES_HIDDEN "")
--	ENDIF(HAS_VISIBILITY_INLINES_HIDDEN AND NOT MINGW)
--ENDIF(NOT DEFINED VISIBILITY_INLINES_HIDDEN)
-diff --git a/rts/build/cmake/TestCXXFlags.cmake b/rts/build/cmake/TestCXXFlags.cmake
-new file mode 100644
-index 0000000..35f7b1b
---- /dev/null
-+++ b/rts/build/cmake/TestCXXFlags.cmake
-@@ -0,0 +1,50 @@
-+# - Test whether the C++ compiler supports "-fvisibility=hidden"
-+# Once done this will define
-+#
-+# VISIBILITY_HIDDEN - -fvisibility=hidden   if supported, an empty string otherwise.
-+# VISIBILITY_INLINES_HIDDEN - -fvisibility-inlines-hidden   likewise
-+#
-+# Copyright (C) 2008 Tobi Vollebregt
-+# Copyright (C) 2008 Karl-Robert Ernst
-+#
-+# Note: gcc for windows supports these flags, but give lots of errors when compiling, so use only for linux builds
-+
-+INCLUDE(TestCXXAcceptsFlag)
-+
-+IF(NOT DEFINED VISIBILITY_HIDDEN)
-+	CHECK_CXX_ACCEPTS_FLAG(-fvisibility=hidden HAS_VISIBILITY_HIDDEN)
-+	IF(HAS_VISIBILITY_HIDDEN AND NOT MINGW)
-+		SET(VISIBILITY_HIDDEN "-fvisibility=hidden")
-+	ELSE(HAS_VISIBILITY_HIDDEN AND NOT MINGW)
-+		SET(VISIBILITY_HIDDEN "")
-+	ENDIF(HAS_VISIBILITY_HIDDEN AND NOT MINGW)
-+ENDIF(NOT DEFINED VISIBILITY_HIDDEN)
-+	
-+IF(NOT DEFINED VISIBILITY_INLINES_HIDDEN)
-+	CHECK_CXX_ACCEPTS_FLAG(-fvisibility-inlines-hidden HAS_VISIBILITY_INLINES_HIDDEN)
-+	IF(HAS_VISIBILITY_INLINES_HIDDEN AND NOT MINGW)
-+		SET(VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")
-+	ELSE(HAS_VISIBILITY_INLINES_HIDDEN AND NOT MINGW)
-+		SET(VISIBILITY_INLINES_HIDDEN "")
-+	ENDIF(HAS_VISIBILITY_INLINES_HIDDEN AND NOT MINGW)
-+ENDIF(NOT DEFINED VISIBILITY_INLINES_HIDDEN)
-+
-+IF(NOT DEFINED SSE_FLAGS)
-+	CHECK_CXX_ACCEPTS_FLAG("-msse -mfpmath=sse" HAS_SSE_FLAGS)
-+	IF(HAS_SSE_FLAGS)
-+		SET(SSE_FLAGS "-msse -mfpmath=sse")
-+	ELSE(HAS_SSE_FLAGS)
-+		SET(SSE_FLAGS "")
-+		message(WARNING "SSE support missing, online play is highly discouraged with this build")
-+	ENDIF(HAS_SSE_FLAGS)
-+ENDIF(NOT DEFINED SSE_FLAGS)
-+
-+IF(NOT DEFINED IEEE_FP_FLAG)
-+	CHECK_CXX_ACCEPTS_FLAG("-mieee-fp" HAS_IEEE_FP_FLAG)
-+	IF(HAS_IEEE_FP_FLAG)
-+		SET(IEEE_FP_FLAG "-mieee-fp")
-+	ELSE(HAS_IEEE_FP_FLAG)
-+		message(WARNING "IEEE-FP support missing, online play is highly discouraged with this build")
-+		SET(IEEE_FP_FLAG "")
-+	ENDIF(HAS_IEEE_FP_FLAG)
-+ENDIF(NOT DEFINED IEEE_FP_FLAG)
--- 
-1.6.6
-
diff --git a/debian/patches/series b/debian/patches/series
index 200e599..5819df9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Clarify-GML-license-as-per-request.patch
-0002-allow-building-without-SSE-flags-but-give-a-warning-.patch
+0001-Add-a-way-to-not-set-march-flag.patch
diff --git a/debian/rules b/debian/rules
index 5860b24..2198c1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,11 +10,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 endif
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBINDIR=/usr/games -DLIBDIR=/usr/lib/spring -DAI_LIBS_DIR=/usr/lib/spring -DAI_DATA_DIR=/usr/share/games/spring -DAI_TYPES=NATIVE -DCMAKE_BUILD_TYPE=RELWITHDEBINFO
-
-override_dh_auto_build:
-	+dh_auto_build
-	$(MAKE) -C debian/manpages
+	dh_auto_configure -- -DBINDIR=/usr/games -DLIBDIR=/usr/lib/spring -DAI_LIBS_DIR=/usr/lib/spring -DAI_DATA_DIR=/usr/share/games/spring -DAI_TYPES=NATIVE -DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DDO_SET_MARCH_FLAG=FALSE
 
 override_dh_auto_install:
 	+dh_auto_install
@@ -38,11 +34,6 @@ override_dh_strip:
 override_dh_installchangelogs:
 	+dh_installchangelogs Documentation/changelog.txt
 
-override_dh_auto_clean:
-	+dh_auto_clean
-	$(MAKE) -C debian/manpages clean
-
 %:
 	+dh --with quilt $@
 
-
diff --git a/debian/spring.manpages b/debian/spring.manpages
deleted file mode 100644
index 7a4d160..0000000
--- a/debian/spring.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/manpages/spring.6
-debian/manpages/spring-dedicated.6

-- 
advanced 3D real time strategy game engine

