[bloboats] 12/16: Revert "Add gcc-6.patch"

Markus Koschany apo at moszumanska.debian.org
Sun Jul 10 20:52:53 UTC 2016


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

apo pushed a commit to branch master
in repository bloboats.

commit 9d780d768d64c869ab05f6ac1855c0f10d12eb7c
Author: Markus Koschany <apo at debian.org>
Date:   Sun Jul 10 22:33:18 2016 +0200

    Revert "Add gcc-6.patch"
    
    This reverts commit 6f4bcd65a1f071139d0bd8dc988f33afd0a708e7.
---
 debian/patches/gcc-6.patch | 27 ---------------------------
 debian/patches/series      |  1 -
 2 files changed, 28 deletions(-)

diff --git a/debian/patches/gcc-6.patch b/debian/patches/gcc-6.patch
deleted file mode 100644
index ef43596..0000000
--- a/debian/patches/gcc-6.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Sun, 10 Jul 2016 22:13:21 +0200
-Subject: gcc-6
-
----
- Makefile | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 879cc67..d6eab6a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -60,10 +60,10 @@ ICON_CMD = i586-mingw32msvc-windres -i src/icon.rc -o $(ICON)
- 
- 
- ### C++ compiler to be used
--CXX_DEFAULT = g++
--CXX_FREEBSD = g++
--CXX_NETBSD = g++
--CXX_MACOSX = g++
-+CXX_DEFAULT = g++-6
-+CXX_FREEBSD = g++-6
-+CXX_NETBSD = g++-6
-+CXX_MACOSX = g++-6
- CXX_CROSS = i586-mingw32msvc-g++
- 
- CXX = $(CXX_$(TARGET))
diff --git a/debian/patches/series b/debian/patches/series
index 8103ca7..4378357 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@
 02-fix-Makefile.patch
 03-uint32.patch
 Hardening.patch
-gcc-6.patch
 gcc-6-FTBFS.patch

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



More information about the Pkg-games-commits mailing list