r15469 - in packages/trunk/excellent-bifurcation/debian: . patches

[Vincent Cheng]

Author: vcheng
Date: 2015-06-29 06:03:52 +0000 (Mon, 29 Jun 2015)
New Revision: 15469

Removed:
   packages/trunk/excellent-bifurcation/debian/patches/fix_gcc5_clang_ftbfs.patch
Modified:
   packages/trunk/excellent-bifurcation/debian/patches/series
   packages/trunk/excellent-bifurcation/debian/rules
Log:
excellent-bifurcation: build with -std=gnu89 with change to d/rules instead of patch


Deleted: packages/trunk/excellent-bifurcation/debian/patches/fix_gcc5_clang_ftbfs.patch
===================================================================
--- packages/trunk/excellent-bifurcation/debian/patches/fix_gcc5_clang_ftbfs.patch	2015-06-29 06:02:21 UTC (rev 15468)
+++ packages/trunk/excellent-bifurcation/debian/patches/fix_gcc5_clang_ftbfs.patch	2015-06-29 06:03:52 UTC (rev 15469)
@@ -1,17 +0,0 @@
-Description: Build with -std=gnu89 to force gnu89 inline semantics, fixing
- FTBFS with both clang and gcc 5.
-Forwarded: no
-Author: Vincent Cheng <vcheng at debian.org>
-Bug-Debian: https://bugs.debian.org/757406
-Bug-Debian: https://bugs.debian.org/777846
-Last-Update: 2015-06-28
-
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,5 +1,5 @@
- CC=gcc
--CFLAGS=-Wall -O2
-+CFLAGS=-Wall -O2 -std=gnu89
- PKGCONFIG_FILES=libxdg-basedir
- PKGCONFIG_CFLAGS= `pkg-config $(PKGCONFIG_FILES) --cflags`
- PKGCONFIG_LDFLAGS= `pkg-config $(PKGCONFIG_FILES) --libs`

Modified: packages/trunk/excellent-bifurcation/debian/patches/series
===================================================================
--- packages/trunk/excellent-bifurcation/debian/patches/series	2015-06-29 06:02:21 UTC (rev 15468)
+++ packages/trunk/excellent-bifurcation/debian/patches/series	2015-06-29 06:03:52 UTC (rev 15469)
@@ -4,4 +4,3 @@
 link-with-libm.patch
 fix_allegro_linker_flag.patch
 fix_hurd_ftbfs.patch
-fix_gcc5_clang_ftbfs.patch

Modified: packages/trunk/excellent-bifurcation/debian/rules
===================================================================
--- packages/trunk/excellent-bifurcation/debian/rules	2015-06-29 06:02:21 UTC (rev 15468)
+++ packages/trunk/excellent-bifurcation/debian/rules	2015-06-29 06:03:52 UTC (rev 15469)
@@ -8,4 +8,4 @@
 	dh_clean
 
 override_dh_auto_build:
-	$(MAKE) -C src CFLAGS="$(CFLAGS) -DDATA_DIR=\\\"/usr/share/games/excellent-bifurcation\\\""
+	$(MAKE) -C src CFLAGS="$(CFLAGS) -std=gnu89 -DDATA_DIR=\\\"/usr/share/games/excellent-bifurcation\\\""