[berusky2] 07/11: Update gcc-6-FTBFS.patch

[Markus Koschany]

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

apo pushed a commit to branch master
in repository berusky2.

commit 82085e63d287b154e9dc8fe18559a09e416091de
Author: Markus Koschany <apo at debian.org>
Date:   Fri Jul 8 03:08:59 2016 +0200

    Update gcc-6-FTBFS.patch
---
 ...id-literal-suffixes.patch => gcc-6-FTBFS.patch} | 32 ++++++++++++++++++++--
 debian/patches/series                              |  2 +-
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/debian/patches/gcc-6-invalid-literal-suffixes.patch b/debian/patches/gcc-6-FTBFS.patch
similarity index 50%
rename from debian/patches/gcc-6-invalid-literal-suffixes.patch
rename to debian/patches/gcc-6-FTBFS.patch
index 425a8f6..284e614 100644
--- a/debian/patches/gcc-6-invalid-literal-suffixes.patch
+++ b/debian/patches/gcc-6-FTBFS.patch
@@ -1,11 +1,26 @@
 From: Markus Koschany <apo at debian.org>
 Date: Fri, 8 Jul 2016 02:55:28 +0200
-Subject: gcc-6 invalid literal suffixes
+Subject: gcc-6 FTBFS
 
 ---
+ src/age/include/defs.h    | 2 +-
  src/komat/Berusky3d_ini.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ src/tmp/compat_mini.h     | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
 
+diff --git a/src/age/include/defs.h b/src/age/include/defs.h
+index 48662a7..c573c46 100644
+--- a/src/age/include/defs.h
++++ b/src/age/include/defs.h
+@@ -37,7 +37,7 @@
+ #endif
+ 
+ #ifndef  FALSE
+-#define  FALSE            (1!=1)
++#define  FALSE            0
+ #endif
+ 
+ #ifndef  NULL
 diff --git a/src/komat/Berusky3d_ini.h b/src/komat/Berusky3d_ini.h
 index 064baa7..d13f112 100644
 --- a/src/komat/Berusky3d_ini.h
@@ -23,3 +38,16 @@ index 064baa7..d13f112 100644
  #endif
  
  #endif
+diff --git a/src/tmp/compat_mini.h b/src/tmp/compat_mini.h
+index bab7aa9..4b02ae6 100644
+--- a/src/tmp/compat_mini.h
++++ b/src/tmp/compat_mini.h
+@@ -47,7 +47,7 @@ extern "C" {
+ #define  MAX_JMENO       50
+ 
+ #define  TRUE   (1==1)
+-#define  FALSE  (1!=1)
++#define  FALSE  0
+ 
+ #ifndef  ERROR
+ #define  ERROR (-1)
diff --git a/debian/patches/series b/debian/patches/series
index 4c7e8ce..a538f62 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 docs.patch
 data.patch
 fix-mmalloc-usage.patch
-gcc-6-invalid-literal-suffixes.patch
+gcc-6-FTBFS.patch

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