[megaglest] 62/143: Drop patches, they were applied upstream

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository megaglest.

commit 90d0eee00c3495350686269d65d295c30b7f4ca6
Author: Paul Wise <pabs at debian.org>
Date:   Fri Feb 3 09:31:43 2012 +0000

    Drop patches, they were applied upstream
---
 debian/changelog                        |  1 +
 debian/patches/drop-sse.patch           | 14 --------------
 debian/patches/fix-kFreeBSD-FTBFS.patch | 26 --------------------------
 debian/patches/series                   |  2 --
 4 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c33c04..d21b148 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ megaglest (3.6.0.3-1) unstable; urgency=low
 
   [ Paul Wise ]
   * megaglest should be priority extra since famfam is extra
+  * Drop patches, they were applied upstream
 
  -- Mark Vejvoda <mark_vejvoda at hotmail.com>  Wed, 25 Jan 2012 08:45:18 +0800
 
diff --git a/debian/patches/drop-sse.patch b/debian/patches/drop-sse.patch
deleted file mode 100644
index 9c4d395..0000000
--- a/debian/patches/drop-sse.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: drop SSE related flags since they prevent building on non-x86
-Origin: http://megaglest.svn.sourceforge.net/viewvc/megaglest?view=revision&revision=3023
-Forwarded: not-needed
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -74,7 +74,7 @@
- 	# For gcc warning options see: http://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
- 	IF(NOT MINGW)
- 		# For tons of verbose warnings add: -Wall
--		ADD_DEFINITIONS("-Wreturn-type -fno-strict-aliasing -frounding-math  -fsignaling-nans -mfpmath=sse -msse -rdynamic")
-+		ADD_DEFINITIONS("-Wreturn-type -fno-strict-aliasing -frounding-math  -fsignaling-nans -rdynamic")
- 	ELSE()
- 		ADD_DEFINITIONS("-Wreturn-type -fno-strict-aliasing -frounding-math  -fsignaling-nans -mfpmath=sse -msse -DUNICODE")
- 	ENDIF()
diff --git a/debian/patches/fix-kFreeBSD-FTBFS.patch b/debian/patches/fix-kFreeBSD-FTBFS.patch
deleted file mode 100644
index 8808128..0000000
--- a/debian/patches/fix-kFreeBSD-FTBFS.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: fix FTBFS on Debian GNU/kFreeBSD architectures
-Author: Paul Wise <pabs at debian.org>
-Forwarded: yes, <softcoder> will apply to svn shortly
-Applied-Upstream: http://megaglest.svn.sourceforge.net/viewvc/megaglest?view=revision&revision=3022
---- a/source/shared_lib/sources/platform/posix/socket.cpp
-+++ b/source/shared_lib/sources/platform/posix/socket.cpp
-@@ -313,7 +313,7 @@
- //	class Socket
- // ===============================================
- 
--#if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__) || defined(__linux__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(BSD) || defined(__APPLE__) || defined(__linux__)
- # define USE_GETIFADDRS 1
- # include <ifaddrs.h>
- #endif
---- a/source/glest_map_editor/CMakeLists.txt
-+++ b/source/glest_map_editor/CMakeLists.txt
-@@ -19,7 +19,7 @@
- 		# It was noticed that when using MinGW gcc it is essential that 'core' is mentioned before 'base'.
- 	
- 		IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
--		       SET(wxWidgets_CONFIG_OPTIONS --prefix=/usr/local)
-+		       SET(wxWidgets_CONFIG_OPTIONS)
- 		       MESSAGE(STATUS "Detected FreeBSD.....")
- 	       ENDIF()
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e709bae..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-#fix-kFreeBSD-FTBFS.patch
-#drop-sse.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/megaglest.git