Control: tags 778025 + pending

Dear maintainer,

I've prepared an NMU for netrek-client-cow (versioned as 3.3.0-3.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer -  https://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Eric Clapton: Nobody Knows You When You're Down & Out
diff -Nru netrek-client-cow-3.3.0/debian/changelog netrek-client-cow-3.3.0/debian/changelog
--- netrek-client-cow-3.3.0/debian/changelog	2011-06-23 12:43:42.000000000 +0200
+++ netrek-client-cow-3.3.0/debian/changelog	2015-08-04 16:56:50.000000000 +0200
@@ -1,3 +1,17 @@
+netrek-client-cow (3.3.0-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "ftbfs with GCC-5": add patches provided by Thavatchai
+    Makphaibulchoke:
+    - add -std=gn89 to CFLAGS in debian/rules, a work around to instruct gcc-5
+      to use gnu-89 semantics for inline function declarations
+    - 006-gcc5.patch: add -P to CPPFLAGS when checking for GMP 2, a work
+      around for gcc-5 preprocessor started to emit line markers to properly
+      distinguish whether a macro token comes from a system header
+    (Closes: #778025)
+
+ -- gregor herrmann <gre...@debian.org>  Tue, 04 Aug 2015 16:54:47 +0200
+
 netrek-client-cow (3.3.0-3) unstable; urgency=low
 
   * Team upload.
diff -Nru netrek-client-cow-3.3.0/debian/patches/006-gcc5.patch netrek-client-cow-3.3.0/debian/patches/006-gcc5.patch
--- netrek-client-cow-3.3.0/debian/patches/006-gcc5.patch	1970-01-01 01:00:00.000000000 +0100
+++ netrek-client-cow-3.3.0/debian/patches/006-gcc5.patch	2015-08-04 16:54:43.000000000 +0200
@@ -0,0 +1,29 @@
+Description: Fix gcc-5 build issue.
+ Add -P to CPPFLAGS when checking for GMP 2, a work around for gcc-5
+ preprocessor started to emit line markers to properly distinguish whether a
+ macro token comes from a system header.
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/778025
+Author: Thavatchai Makphaibulchoke <thavatchai.makpahibulch...@hp.com>
+Reviewed-by: gregor herrmann <gre...@debian.org>
+Last-Update: 2015-08-04
+
+--- a/configure
++++ b/configure
+@@ -7182,6 +7182,8 @@
+ # Checking for GMP 2
+ SAVEINCS="$INCS"
+ INCS="$INCS $XINCLUDES"
++SAVECPPFLAGS="$CPPFLAGS"
++CPPFLAGS="$CPPFLAGS -P"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -7202,6 +7204,7 @@
+ fi
+ rm -f conftest*
+ 
++CPPFLAGS="$SAVECPPFLAGS"
+ INCS="$SAVEINCS"
+ 
+ if test "$MPLIB" = nope; then
diff -Nru netrek-client-cow-3.3.0/debian/patches/series netrek-client-cow-3.3.0/debian/patches/series
--- netrek-client-cow-3.3.0/debian/patches/series	2011-05-11 13:45:57.000000000 +0200
+++ netrek-client-cow-3.3.0/debian/patches/series	2015-08-04 16:49:10.000000000 +0200
@@ -3,3 +3,4 @@
 003-typos.patch
 004-honor-flags.patch
 005-hardening.patch
+006-gcc5.patch
diff -Nru netrek-client-cow-3.3.0/debian/rules netrek-client-cow-3.3.0/debian/rules
--- netrek-client-cow-3.3.0/debian/rules	2011-06-23 12:42:06.000000000 +0200
+++ netrek-client-cow-3.3.0/debian/rules	2015-08-04 16:51:05.000000000 +0200
@@ -4,7 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS:=	$(shell dpkg-buildflags --get CFLAGS)
+CFLAGS:=	$(shell dpkg-buildflags --get CFLAGS) -std=gnu89
 CPPFLAGS:=	$(shell dpkg-buildflags --get CPPFLAGS)
 LDFLAGS:=	$(shell dpkg-buildflags --get LDFLAGS)
 

Attachment: signature.asc
Description: Digital Signature

Reply via email to