[megaglest] 08/10: Drop patches/gcc-6-ftbfs.patch. Fixed 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 493ea87bec69d73d6cebf1a28f4466fcff0e2ebe
Author: Markus Koschany <apo at debian.org>
Date:   Sun Mar 12 22:17:05 2017 +0100

    Drop patches/gcc-6-ftbfs.patch. Fixed upstream.
---
 debian/changelog                 |  1 +
 debian/patches/gcc-6-ftbfs.patch | 24 ------------------------
 debian/patches/series            |  1 -
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6b8aa50..2726734 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ megaglest (3.13.0-1) experimental; urgency=medium
   * Drop debian menu file.
   * Update megaglest.lintian-overrides.
   * Update debian/copyright for new release.
+  * Drop gcc-6-ftbfs.patch. Fixed upstream.
 
  -- Markus Koschany <apo at debian.org>  Sun, 12 Mar 2017 22:15:24 +0100
 
diff --git a/debian/patches/gcc-6-ftbfs.patch b/debian/patches/gcc-6-ftbfs.patch
deleted file mode 100644
index c631f72..0000000
--- a/debian/patches/gcc-6-ftbfs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Fri, 15 Jul 2016 00:44:11 +0200
-Subject: gcc-6 ftbfs
-
-Bug: https://bugs.debian.org/831140
-Forwarded: not needed, already fixed.
----
- source/shared_lib/sources/platform/common/platform_common.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/source/shared_lib/sources/platform/common/platform_common.cpp b/source/shared_lib/sources/platform/common/platform_common.cpp
-index d416b0d..03cd0af 100644
---- a/source/shared_lib/sources/platform/common/platform_common.cpp
-+++ b/source/shared_lib/sources/platform/common/platform_common.cpp
-@@ -124,7 +124,8 @@ tm threadsafe_localtime(const time_t &time) {
- // extracting std::time_t from std:chrono for "now"
- time_t systemtime_now() {
- #if __cplusplus > 199711L
--	system_time_point system_now = std::chrono::system_clock::now();
-+	typedef std::chrono::time_point<std::chrono::system_clock> system_time_point_x;
-+	system_time_point_x system_now = std::chrono::system_clock::now();
- 	return std::chrono::system_clock::to_time_t(system_now);
- #else
- 	return time(NULL);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6e3cd40..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-gcc-6-ftbfs.patch

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