[scilab] 20/29: Refresh patch to fix compilation with OCaml 4.05

[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 216140dc262add0b1dea44dee960b67d0e78f626
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Wed Nov 15 21:06:35 2017 +0100

    Refresh patch to fix compilation with OCaml 4.05
---
 debian/changelog                    |  1 +
 debian/patches/fix-ocaml-4.05.patch | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bca2d8e..99038ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ scilab (6.0.0-1) UNRELEASED; urgency=medium
     - Refresh patch for the hdf5 1.10 api. 
     - Drop patch to remove non-free code : it came from upstream. 
     - Refresh patch for gcc 7.
+    - Refresh patch to fix the build with OCaml 4.05.
 
  -- Julien Puydt <julien.puydt at laposte.net>  Tue, 14 Nov 2017 16:46:25 +0100
 
diff --git a/debian/patches/fix-ocaml-4.05.patch b/debian/patches/fix-ocaml-4.05.patch
index a9f8a5b..7cc8ed8 100644
--- a/debian/patches/fix-ocaml-4.05.patch
+++ b/debian/patches/fix-ocaml-4.05.patch
@@ -3,9 +3,9 @@ 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)
+--- a/modules/scicos/Makefile.modelica.am
++++ b/modules/scicos/Makefile.modelica.am
+@@ -101,6 +101,7 @@
  BASE_PATH_MODELICAC = $(srcdir)/src/modelica_compiler
  
  INCLUDE = -I $(BASE_PATH_MODELICAC) -I $(BASE_PATH_XML2Modelica)
@@ -13,7 +13,7 @@ Last-Update: 2017-07-19
  
  ########## COMMON
  SUFFIXES += .ml .mli .mll .mly .cmo .cmi .cmx
-@@ -108,6 +109,9 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi
+@@ -111,6 +112,9 @@
  	@if echo "$<"|grep src/translator; then \
  		echo $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $*.ml; \
  		$(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $*.ml; \
@@ -23,7 +23,7 @@ Last-Update: 2017-07-19
  	else \
  		echo $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $*.ml; \
  		$(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $*.ml; \
-@@ -117,6 +121,9 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi
+@@ -120,6 +124,9 @@
  	@if echo "$<"|grep src/translator; then \
  		echo $(OCAMLOPT) $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) -c $*.ml; \
  		$(OCAMLOPT) $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) -c $*.ml; \
@@ -33,7 +33,7 @@ Last-Update: 2017-07-19
  	else \
  		echo $(OCAMLOPT) $(INCLUDE) $(OCAMLOPTFLAGS) -c $*.ml; \
  		$(OCAMLOPT) $(INCLUDE) $(OCAMLOPTFLAGS) -c $*.ml; \
-@@ -126,6 +133,9 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi
+@@ -129,6 +136,9 @@
  	@if echo "$<"|grep src/translator; then \
  		echo $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $<; \
  		$(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $<; \
@@ -43,7 +43,7 @@ Last-Update: 2017-07-19
  	else \
  		echo $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $<; \
  		$(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $<; \
-@@ -135,6 +145,9 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi
+@@ -138,6 +148,9 @@
  	@if echo "$<"|grep src/translator; then \
  		echo $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -i $< > $@; \
  		$(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -i $< > $@; \

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