[med-svn] r21685 - in trunk/packages/proda/trunk/debian: . patches

[Sascha Steinbiss]

Author: sascha-guest
Date: 2016-04-11 19:22:29 +0000 (Mon, 11 Apr 2016)
New Revision: 21685

Added:
   trunk/packages/proda/trunk/debian/patches/04-honour_CXX.patch
   trunk/packages/proda/trunk/debian/patches/05-fix_FTBFS_with_GCC6.patch
Modified:
   trunk/packages/proda/trunk/debian/changelog
   trunk/packages/proda/trunk/debian/patches/series
Log:
fix FTBFS


Modified: trunk/packages/proda/trunk/debian/changelog
===================================================================
--- trunk/packages/proda/trunk/debian/changelog	2016-04-11 18:55:13 UTC (rev 21684)
+++ trunk/packages/proda/trunk/debian/changelog	2016-04-11 19:22:29 UTC (rev 21685)
@@ -1,3 +1,10 @@
+proda (1.0-9.1) unstable; urgency=medium
+
+  * Team upload.
+  * Fix FTBFS with GCC-6. Closes #812039
+
+ -- Sascha Steinbiss <sascha at steinbiss.name>  Mon, 11 Apr 2016 19:22:08 +0000
+
 proda (1.0-9) unstable; urgency=low
 
   * debian/control: re-added David to uploaders, because he really

Added: trunk/packages/proda/trunk/debian/patches/04-honour_CXX.patch
===================================================================
--- trunk/packages/proda/trunk/debian/patches/04-honour_CXX.patch	                        (rev 0)
+++ trunk/packages/proda/trunk/debian/patches/04-honour_CXX.patch	2016-04-11 19:22:29 UTC (rev 21685)
@@ -0,0 +1,24 @@
+--- a/Makefile
++++ b/Makefile
+@@ -6,7 +6,7 @@
+ # 1) Choose C++ compiler.
+ ################################################################################
+ 
+-CXX = g++
++#CXX = g++
+ 
+ ################################################################################
+ # 2) Set C++ flags.
+@@ -15,10 +15,10 @@
+ #    c) RELEASE mode
+ ################################################################################
+ 
+-CPPFLAGS = -DVERSION="\"1.00\""
++CPPFLAGS+=-DVERSION="\"1.00\""
+ 
+ # debug mode    
+-CXXFLAGS = -g -W -Wall -pedantic
++CXXFLAGS+=-g -W -Wall -pedantic
+ 
+ # profile mode
+ #CXXFLAGS = -pg -W -Wall -pedantic

Added: trunk/packages/proda/trunk/debian/patches/05-fix_FTBFS_with_GCC6.patch
===================================================================
--- trunk/packages/proda/trunk/debian/patches/05-fix_FTBFS_with_GCC6.patch	                        (rev 0)
+++ trunk/packages/proda/trunk/debian/patches/05-fix_FTBFS_with_GCC6.patch	2016-04-11 19:22:29 UTC (rev 21685)
@@ -0,0 +1,11 @@
+--- a/Main.cc
++++ b/Main.cc
+@@ -117,7 +117,7 @@
+   char *endPtr;
+   long int retVal;
+ 
+-  int errno = 0;
++  extern int errno;
+   retVal = strtol (data, &endPtr, 0);
+   if (retVal == 0 && (errno != 0 || data == endPtr)) return false;
+   if (errno != 0 && (retVal == LONG_MAX || retVal == LONG_MIN)) return false;

Modified: trunk/packages/proda/trunk/debian/patches/series
===================================================================
--- trunk/packages/proda/trunk/debian/patches/series	2016-04-11 18:55:13 UTC (rev 21684)
+++ trunk/packages/proda/trunk/debian/patches/series	2016-04-11 19:22:29 UTC (rev 21685)
@@ -1,4 +1,6 @@
 01-fix_gcc4.3_warnings.patch
 02-fix_CXXFLAGS.patch
 03-fix_FTBFS_gcc4.3_missing_includes.patch
+04-honour_CXX.patch
+05-fix_FTBFS_with_GCC6.patch
 hardening.patch