[freeorion] 01/10: Drop all patches. Fixed upstream.

[Markus Koschany]

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

apo pushed a commit to branch master
in repository freeorion.

commit 2b4e18e940d13f142412e3ba8b00ad413a69333c
Author: Markus Koschany <apo at debian.org>
Date:   Sat May 6 00:27:35 2017 +0200

    Drop all patches. Fixed upstream.
---
 debian/patches/boost1.62.patch     | 113 -------------------------------------
 debian/patches/multiarch-fix.patch |  24 --------
 debian/patches/series              |   2 -
 3 files changed, 139 deletions(-)

diff --git a/debian/patches/boost1.62.patch b/debian/patches/boost1.62.patch
deleted file mode 100644
index 4189128..0000000
--- a/debian/patches/boost1.62.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Description: Fix FTBFS with Boost 1.62
- The previous Boost version checks were too specific.
-Origin: upstream, https://github.com/freeorion/freeorion/commit/f6e6d8abce56688de425775ff7db9ed1396d46d8
-Origin: upstream, https://github.com/freeorion/freeorion/commit/6b971f65dbef4614cd0c9020bcc6670d3f11b961 
-Author: Graham Inggs <ginggs at debian.org>
-Last-Update: 2016-11-04
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -141,7 +141,7 @@
- find_package(ZLIB REQUIRED)
- find_package(Freetype REQUIRED)
- 
--if(${Boost_VERSION} EQUAL "106100")
-+if(${Boost_VERSION} EQUAL "106100" OR ${Boost_VERSION} GREATER "106100")
-     # with boost 1.61 some boost::optional internals were changed. However
-     # boost::spirit relies on some API the old implementation provided.  This
-     # define enables the usage of the old boost::optional implementation.
---- a/universe/Building.h
-+++ b/universe/Building.h
-@@ -69,11 +69,11 @@
-     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
-     template <class T> friend void boost::checked_delete(T* x);
- 
--#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- public:
- #endif
-     ~Building() {}
--#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- protected:
- #endif
- 
---- a/universe/Field.h
-+++ b/universe/Field.h
-@@ -48,11 +48,11 @@
-     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
-     template <class T> friend void boost::checked_delete(T* x);
- 
--#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- public:
- #endif
-     ~Field() {}
--#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- protected:
- #endif
- 
---- a/universe/Fleet.h
-+++ b/universe/Fleet.h
-@@ -150,11 +150,11 @@
-     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
-     template <class T> friend void boost::checked_delete(T* x);
- 
--#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- public:
- #endif
-     ~Fleet() {}
--#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- protected:
- #endif
- 
---- a/universe/Planet.h
-+++ b/universe/Planet.h
-@@ -185,11 +185,11 @@
-     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
-     template <class T> friend void boost::checked_delete(T* x);
- 
--#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- public:
- #endif
-     ~Planet() {}
--#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- protected:
- #endif
- 
---- a/universe/Ship.h
-+++ b/universe/Ship.h
-@@ -104,11 +104,11 @@
-     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
-     template <class T> friend void boost::checked_delete(T* x);
- 
--#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- public:
- #endif
-     ~Ship() {}
--#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- protected:
- #endif
- 
---- a/universe/System.h
-+++ b/universe/System.h
-@@ -134,11 +134,11 @@
-     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
-     template <class T> friend void boost::checked_delete(T* x);
- 
--#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- public:
- #endif
-     ~System() {}
--#if BOOST_VERSION == 106100
-+#if BOOST_VERSION >= 106100
- protected:
- #endif
- 
diff --git a/debian/patches/multiarch-fix.patch b/debian/patches/multiarch-fix.patch
deleted file mode 100644
index f42a79f..0000000
--- a/debian/patches/multiarch-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: the include(GNUInstallDirs) should go *after* "project" declaration.
-Author: Gianfranco Costamagna <locutusofborg at debian.org>
-
-Last-Update: 2016-10-23
-
---- freeorion-0.4.6.orig/CMakeLists.txt
-+++ freeorion-0.4.6/CMakeLists.txt
-@@ -1,7 +1,5 @@
- cmake_minimum_required(VERSION 2.8.5)
- 
--include(GNUInstallDirs)
--
- list(APPEND CMAKE_MODULE_PATH ${CMAKE_HOME_DIRECTORY}/cmake ${CMAKE_HOME_DIRECTORY}/GG/cmake)
- set(CMAKE_CONFIGURATION_TYPES Debug Release)
- IF(NOT CMAKE_BUILD_TYPE)
-@@ -18,6 +16,8 @@ message(STATUS "Build type CMAKE_BUILD_T
- ########################################
- project(FreeOrion)
- 
-+include(GNUInstallDirs)
-+
- set(FreeOrion_VERSION 0.4.6)
- 
- set(MINIMUM_BOOST_VERSION 1.54.0)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index df9be18..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-multiarch-fix.patch
-boost1.62.patch

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