[megaglest] 08/21: Drop all patches. 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 df358e3815257738b3577e3aec5cfc9241ee5db3
Author: Markus Koschany <apo at debian.org>
Date:   Tue Jan 26 23:30:45 2016 +0100

    Drop all patches. Applied upstream.
---
 debian/patches/fix-cmake-3.2-X11-FTBFS.patch | 27 ------------------------
 debian/patches/reproducible-build.patch      | 31 ----------------------------
 debian/patches/series                        |  2 --
 3 files changed, 60 deletions(-)

diff --git a/debian/patches/fix-cmake-3.2-X11-FTBFS.patch b/debian/patches/fix-cmake-3.2-X11-FTBFS.patch
deleted file mode 100644
index 8fd3c64..0000000
--- a/debian/patches/fix-cmake-3.2-X11-FTBFS.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Thu, 18 Jun 2015 02:37:43 +0200
-Subject: fix cmake-3.2-X11 FTBFS
-
-Fixes a build failure with CMake >= 3.2.
-
-Forwarded: https://github.com/MegaGlest/megaglest-source/issues/65
----
- source/shared_lib/CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
-index 9a4c7c9..4e4c7a4 100644
---- a/source/shared_lib/CMakeLists.txt
-+++ b/source/shared_lib/CMakeLists.txt
-@@ -95,6 +95,11 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
- 		SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})
- 	ENDIF()
- 
-+	FIND_PACKAGE(X11 REQUIRED)
-+	INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
-+	IF(UNIX)
-+		SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${X11_LIBRARIES})
-+	ENDIF()
- 
-         IF(WANT_XERCES)
- 	        FIND_PACKAGE(XercesC REQUIRED)
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
deleted file mode 100644
index e63e01b..0000000
--- a/debian/patches/reproducible-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Fri, 13 Nov 2015 20:44:49 +0100
-Subject: reproducible build
-
----
- source/glest_game/facilities/game_util.cpp | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/source/glest_game/facilities/game_util.cpp b/source/glest_game/facilities/game_util.cpp
-index e83b0a7..f3b9b5c 100644
---- a/source/glest_game/facilities/game_util.cpp
-+++ b/source/glest_game/facilities/game_util.cpp
-@@ -198,9 +198,6 @@ string getNetworkVersionGITString() {
- 
- string getCompileDateTime() {
- 	static string result = "";
--	if(result == "") {
--		result = string(__DATE__) + " " + string(__TIME__);
--	}
- 	return result;
- }
- 
-@@ -211,7 +208,7 @@ string getNetworkPlatformFreeVersionString() {
- string getAboutString1(int i) {
- 	switch(i) {
- 	case 0: return "MegaGlest " + glestVersionString + " (" + "Shared Library " + sharedLibVersionString + ")";
--	case 1: return "Built: " + string(__DATE__) + " " + GIT_Rev;
-+	case 1: return "Built: " + GIT_Rev;
- 	case 2: return "Copyright 2001-2010 The Glest Team";
- 	case 3: return "Copyright 2010-2015 The MegaGlest Team";
- 	}
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5bcaaf6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-fix-cmake-3.2-X11-FTBFS.patch
-reproducible-build.patch

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