[Pkg-ocaml-maint-commits] [alt-ergo] 01/06: patch for compilation with ocplib 0.4

[Ralf Treinen]

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

treinen pushed a commit to branch master
in repository alt-ergo.

commit ad6cbd0776ef0918f0b98a602a38a9e088a43881
Author: Ralf Treinen <treinen at free.fr>
Date:   Wed Dec 20 20:51:16 2017 +0100

    patch for compilation with ocplib 0.4
---
 debian/changelog                  |  7 +++++++
 debian/patches/ocplib-simplex-0.4 | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1c0789c..a58815d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+alt-ergo (1.30-2) unstable; urgency=medium
+
+  * Patch ocplib-simplex-0.4: patch to compile with version 0.4 of
+    ocplib-simplex-ocaml-dev (closes: #882162).
+
+ -- Ralf Treinen <treinen at debian.org>  Wed, 20 Dec 2017 21:09:37 +0100
+
 alt-ergo (1.30-1) unstable; urgency=medium
 
   * new upstream version:
diff --git a/debian/patches/ocplib-simplex-0.4 b/debian/patches/ocplib-simplex-0.4
new file mode 100644
index 0000000..7e0571f
--- /dev/null
+++ b/debian/patches/ocplib-simplex-0.4
@@ -0,0 +1,34 @@
+Description: compile with version 0.4 of ocplib-simplex-ocaml-dev
+Author: Ralf Treinen <treinen at debian.org>
+
+Index: alt-ergo/src/theories/intervalCalculus.ml
+===================================================================
+--- alt-ergo.orig/src/theories/intervalCalculus.ml	2017-12-20 21:01:56.545229468 +0100
++++ alt-ergo/src/theories/intervalCalculus.ml	2017-12-20 21:02:29.533412678 +0100
+@@ -163,7 +163,7 @@
+                 new_mn new_mn_ex new_mx new_mx_ex
+           in
+           (* we don't solve immediately. It may be expensive *)
+-          simplex
++          fst simplex
+ 
+ 
+       let finite_non_point_dom info =
+@@ -1689,7 +1689,7 @@
+             | [] -> assert false
+             | [x, c] ->
+               assert (Q.is_one c);
+-              Sim.Assert.var simplex x mn ex_mn mx ex_mx
++              fst (Sim.Assert.var simplex x mn ex_mn mx ex_mx)
+             | _ ->
+               let xp = alien_of p in
+               let sim_p =
+@@ -1697,7 +1697,7 @@
+                 | Some res -> res
+                 | None -> Sim.Core.P.from_list l
+               in
+-              Sim.Assert.poly simplex sim_p xp mn ex_mn mx ex_mx
++              fst (Sim.Assert.poly simplex sim_p xp mn ex_mn mx ex_mx)
+ 
+         ) simplex int_ctx
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 870cd06..5e7fcff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+ocplib-simplex-0.4
 0001-dont-activate-debug-flag
 0002-non-free-dropped
 0003-allow-set-build-date

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/alt-ergo.git