[overgod] 02/13: Import Debian changes 1.0-4.2

[Markus Koschany]

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

apo pushed a commit to branch master
in repository overgod.

commit b0cbd546e31ba96d742216c748cda43223ef3118
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Jul 24 00:58:52 2015 +0200

    Import Debian changes 1.0-4.2
    
    overgod (1.0-4.2) unstable; urgency=medium
    
      * Non-maintainer upload.
      * Drop patch 060_gcc5.patch.
        This only works with gcc5 and leads to FTBFS with gcc4.9.
      * Add -fgnu89-inline to CFLAGS in debian/rules instead.
---
 debian/changelog              |  9 +++++++++
 debian/patches/060_gcc5.patch | 33 ---------------------------------
 debian/patches/series         |  1 -
 debian/rules                  |  2 ++
 4 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0ff2487..d0c2954 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+overgod (1.0-4.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop patch 060_gcc5.patch.
+    This only works with gcc5 and leads to FTBFS with gcc4.9.
+  * Add -fgnu89-inline to CFLAGS in debian/rules instead.
+
+ -- gregor herrmann <gregoa at debian.org>  Fri, 24 Jul 2015 00:58:52 +0200
+
 overgod (1.0-4.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/patches/060_gcc5.patch b/debian/patches/060_gcc5.patch
deleted file mode 100644
index a3d56ae..0000000
--- a/debian/patches/060_gcc5.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Fixed GCC5 build issue.
- ADD "extern" to xpart and ypart functions
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778051
-Author: Nicholas Luedtke <nicholas.luedtke at hp.com>
-Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2015-07-18
-
---- a/stuff.c
-+++ b/stuff.c
-@@ -51,7 +51,6 @@
- float cos_table [ANGLE_FULL];
- float sin_table [ANGLE_FULL];
- 
--inline int xpart(int angle, int length);
- 
- void init_trig(void)
- {
-@@ -66,13 +65,13 @@
-  
- }
- 
--inline int xpart(int angle, int length)
-+extern inline int xpart(int angle, int length)
- {
- // return (lcos(angle) * length);// / ANGLE_FULL;
-  return (cos_table [angle & 1023] * length);// / ANGLE_FULL;
- }
- 
--inline int ypart(int angle, int length)
-+extern inline int ypart(int angle, int length)
- {
-  return (sin_table [angle & 1023] * length);// / ANGLE_FULL;
- }
diff --git a/debian/patches/series b/debian/patches/series
index c241a17..63c419d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@
 030_security_build_warns.patch
 040_fix_array_overrun.patch
 050_fix_speaker_text.patch
-060_gcc5.patch
diff --git a/debian/rules b/debian/rules
index 2f1a708..433a311 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,8 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 CFLAGS+=$(shell allegro-config --cflags)
 LIBS=$(shell allegro-config --libs) -lm
 
+CFLAGS+=-fgnu89-inline
+
 %:
 	dh $@
 

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