[gle-graphics] 23/23: Import Debian changes 4.2.5-7

[Christian T. Steigies]

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

cts pushed a commit to branch master
in repository gle-graphics.

commit ecdb63d3b12780a2fee18155e5c052f3f7298836
Author: Christian T. Steigies <cts at debian.org>
Date:   Sun Oct 29 20:57:49 2017 +0100

    Import Debian changes 4.2.5-7
    
    gle-graphics (4.2.5-7) UNRELEASED; urgency=medium
    
      * fix FTBS using patch from Slávek Banko (closes: #853420)
      * update Standards-Version to 4.1.1 (no changes)
---
 debian/changelog                   |  7 +++++++
 debian/control                     |  2 +-
 debian/patches/fix-ftbfs-with-gcc7 | 25 +++++++++++++++++++++++++
 debian/patches/series              |  1 +
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a4375d9..eb0970d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gle-graphics (4.2.5-7) UNRELEASED; urgency=medium
+
+  * fix FTBS using patch from Slávek Banko (closes: #853420)
+  * update Standards-Version to 4.1.1 (no changes)
+
+ -- Christian T. Steigies <cts at debian.org>  Sun, 29 Oct 2017 20:57:49 +0100
+
 gle-graphics (4.2.5-6) unstable; urgency=medium
 
   * add patch from Reiner Herrmann to initialize font table
diff --git a/debian/control b/debian/control
index abd1e81..8f4a374 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends: automake,
                pkg-config,
                texlive,
                texlive-latex-extra
-Standards-Version: 3.9.8
+Standards-Version: 4.1.1
 Homepage: http://glx.sf.net
 Vcs-Browser: https://anonscm.debian.org/git/debian-science/packages/gle-graphics.git
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/gle-graphics.git
diff --git a/debian/patches/fix-ftbfs-with-gcc7 b/debian/patches/fix-ftbfs-with-gcc7
new file mode 100644
index 0000000..6b46a70
--- /dev/null
+++ b/debian/patches/fix-ftbfs-with-gcc7
@@ -0,0 +1,25 @@
+Description: fix ftbfs with GCC-7
+ change order of includes to fix abs() definition conflict
+Author: Slávek Banko <slavek.banko at axis.cz>
+Tested-By: Christian T. Steigies <cts at debian.org>
+Last-Update: 2017-10-22
+Index: b/src/gle/surface/ffitcontour.cpp
+===================================================================
+--- a/src/gle/surface/ffitcontour.cpp
++++ b/src/gle/surface/ffitcontour.cpp
+@@ -43,15 +43,9 @@
+ 
+ /* "f2c.h" defines abs() -- conflict with the definition in <math.h> */
+ /* changing the order solves the problem */
+-#if ( defined(__OS2__) && defined(__EMX__) ) || defined(__WIN32__)
+ #include <stdio.h>
+ #include <math.h>
+ #include "f2c.h"
+-#else
+-#include "f2c.h"
+-#include <stdio.h>
+-#include <math.h>
+-#endif
+ 
+ doublereal gutre2_(real* a, real* b);
+ void gd_message__(const char *s, int l);
diff --git a/debian/patches/series b/debian/patches/series
index 1dc775b..a4eda91 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ replace-today-in-manual
 static-time
 initialize_font_table 
 configure.ac
+fix-ftbfs-with-gcc7

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gle-graphics.git