[scilab] 14/16: Import Debian changes 5.5.2-6

[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 9aa7bb5a26d6123e3a645726ecade3503fa0fd24
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Mon Sep 25 12:11:58 2017 +0200

    Import Debian changes 5.5.2-6
    
    scilab (5.5.2-6) unstable; urgency=medium
    
      * Team upload.
      * New patch fix-ocaml-4.05.patch, fixes FTBFS. Thanks to Stéphane Glondu.
        (Closes: #868960)
---
 debian/changelog                    |  8 ++++++
 debian/patches/fix-ocaml-4.05.patch | 55 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 64 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ed58640..5caa91f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+scilab (5.5.2-6) unstable; urgency=medium
+
+  * Team upload.
+  * New patch fix-ocaml-4.05.patch, fixes FTBFS. Thanks to Stéphane Glondu.
+    (Closes: #868960)
+
+ -- Sébastien Villemot <sebastien at debian.org>  Mon, 25 Sep 2017 12:11:58 +0200
+
 scilab (5.5.2-5) unstable; urgency=medium
 
   * New patch gcc-7.patch to fix FTBFS with GCC-7 (closes: #853653)
diff --git a/debian/patches/fix-ocaml-4.05.patch b/debian/patches/fix-ocaml-4.05.patch
new file mode 100644
index 0000000..a9f8a5b
--- /dev/null
+++ b/debian/patches/fix-ocaml-4.05.patch
@@ -0,0 +1,55 @@
+Description: Fix FTBFS with OCaml 4.05.0
+Author: Stéphane Glondu <glondu at debian.org>
+Bug-Debian: https://bugs.debian.org/868960
+Last-Update: 2017-07-19
+
+--- scilab-5.5.2.orig/modules/scicos/Makefile.modelica.am
++++ scilab-5.5.2/modules/scicos/Makefile.modelica.am
+@@ -98,6 +98,7 @@ MLIS_modelicac = $(MLS:.ml=.mli)
+ BASE_PATH_MODELICAC = $(srcdir)/src/modelica_compiler
+ 
+ INCLUDE = -I $(BASE_PATH_MODELICAC) -I $(BASE_PATH_XML2Modelica)
++INCLUDE_xml2modelica = -I $(BASE_PATH_XML2Modelica)
+ 
+ ########## COMMON
+ SUFFIXES += .ml .mli .mll .mly .cmo .cmi .cmx
+@@ -108,6 +109,9 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi
+ 	@if echo "$<"|grep src/translator; then \
+ 		echo $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $*.ml; \
+ 		$(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $*.ml; \
++	elif echo "$<"|grep src/xml2modelica; then \
++		echo $(OCAMLC) $(INCLUDE_xml2modelica) $(OCAMLCFLAGS) -c $*.ml; \
++		$(OCAMLC) $(INCLUDE_xml2modelica) $(OCAMLCFLAGS) -c $*.ml; \
+ 	else \
+ 		echo $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $*.ml; \
+ 		$(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $*.ml; \
+@@ -117,6 +121,9 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi
+ 	@if echo "$<"|grep src/translator; then \
+ 		echo $(OCAMLOPT) $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) -c $*.ml; \
+ 		$(OCAMLOPT) $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) -c $*.ml; \
++	elif echo "$<"|grep src/xml2modelica; then \
++		echo $(OCAMLOPT) $(INCLUDE_xml2modelica) $(OCAMLOPTFLAGS) -c $*.ml; \
++		$(OCAMLOPT) $(INCLUDE_xml2modelica) $(OCAMLOPTFLAGS) -c $*.ml; \
+ 	else \
+ 		echo $(OCAMLOPT) $(INCLUDE) $(OCAMLOPTFLAGS) -c $*.ml; \
+ 		$(OCAMLOPT) $(INCLUDE) $(OCAMLOPTFLAGS) -c $*.ml; \
+@@ -126,6 +133,9 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi
+ 	@if echo "$<"|grep src/translator; then \
+ 		echo $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $<; \
+ 		$(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $<; \
++	elif echo "$<"|grep src/xml2modelica; then \
++		echo $(OCAMLC) $(INCLUDE_xml2modelica) $(OCAMLCFLAGS) -c $<; \
++		$(OCAMLC) $(INCLUDE_xml2modelica) $(OCAMLCFLAGS) -c $<; \
+ 	else \
+ 		echo $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $<; \
+ 		$(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $<; \
+@@ -135,6 +145,9 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi
+ 	@if echo "$<"|grep src/translator; then \
+ 		echo $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -i $< > $@; \
+ 		$(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -i $< > $@; \
++	elif echo "$<"|grep src/xml2modelica; then \
++		echo $(OCAMLC) $(INCLUDE_xml2modelica) $(OCAMLCFLAGS) -i $< > $@; \
++		$(OCAMLC) $(INCLUDE_xml2modelica) $(OCAMLCFLAGS) -i $< > $@; \
+ 	else \
+ 		echo $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -i $< > $@; \
+ 		$(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -i $< > $@; \
diff --git a/debian/patches/series b/debian/patches/series
index a767a5c..83f9f57 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ libjogl2-java-2.3.2.diff
 hdf5-1.10-api.patch
 scilab.git-f1d7f06.patch
 gcc-7.patch
+fix-ocaml-4.05.patch

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