[scilab] 13/16: Import Debian changes 5.5.2-5

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository scilab.

commit 347f18491c523d20b58df3789e707e25ddbe316d
Author: Gilles Filippini <pini at debian.org>
Date:   Tue Aug 15 20:18:06 2017 +0200

    Import Debian changes 5.5.2-5
    
    scilab (5.5.2-5) unstable; urgency=medium
    
      * New patch gcc-7.patch to fix FTBFS with GCC-7 (closes: #853653)
---
 debian/changelog           |  6 ++++++
 debian/patches/gcc-7.patch | 13 +++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6e94797..ed58640 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+scilab (5.5.2-5) unstable; urgency=medium
+
+  * New patch gcc-7.patch to fix FTBFS with GCC-7 (closes: #853653)
+
+ -- Gilles Filippini <pini at debian.org>  Tue, 15 Aug 2017 20:18:06 +0200
+
 scilab (5.5.2-4) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/patches/gcc-7.patch b/debian/patches/gcc-7.patch
new file mode 100644
index 0000000..8fb3fe3
--- /dev/null
+++ b/debian/patches/gcc-7.patch
@@ -0,0 +1,13 @@
+Index: scilab-5.5.2/modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp
+===================================================================
+--- scilab-5.5.2.orig/modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp
++++ scilab-5.5.2/modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp
+@@ -54,7 +54,7 @@ int sci_xcosPalLoad(char *fname, unsigne
+     {
+         // FIXME #7266 workaround
+         // check category emptyness
+-        if (category == NULL || (lenCategory == 1 && *category == '\0'))
++        if (category == NULL || (lenCategory == 1 && *category == NULL))
+         {
+             Palette::loadPal(getScilabJavaVM(), name);
+         }
diff --git a/debian/patches/series b/debian/patches/series
index f1ac7d4..a767a5c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ aarch64-detection.patch
 libjogl2-java-2.3.2.diff
 hdf5-1.10-api.patch
 scilab.git-f1d7f06.patch
+gcc-7.patch

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