This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository coinst.
commit e31b1464e0ad78f8dc1656d931219cb8b4d957a8 Author: Mehdi Dogguy <me...@debian.org> Date: Sun Oct 18 16:58:59 2015 +0200 Fix FTBFS with OCaml 4.02.3 - Add Ptset.of_list, Ptset.Big.of_list and Ptset.BigPos.of_list - Add camlp4 as a build dependency --- debian/changelog | 8 ++++++++ debian/control | 1 + debian/patches/ocaml_4.02.3 | 45 +++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 55 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9f0759b..60c03e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +coinst (1.9.1-2) UNRELEASED; urgency=medium + + * Fix FTBFS with OCaml 4.02.3 + - Add Ptset.of_list, Ptset.Big.of_list and Ptset.BigPos.of_list + - Add camlp4 as a build dependency + + -- Mehdi Dogguy <me...@debian.org> Sun, 18 Oct 2015 16:57:07 +0200 + coinst (1.9.1-1) unstable; urgency=low * Update debian/gbp.conf to automatically filter out the "Talks" diff --git a/debian/control b/debian/control index e247a1b..af7b65b 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 7.0.50~), dh-ocaml (>= 0.9~), ocaml-findlib, ocaml-nox (>= 3.11.1-3~), libcudf-ocaml-dev, + camlp4, # needed for the viewer: js-of-ocaml, libcairo-ocaml-dev Standards-Version: 3.9.4 diff --git a/debian/patches/ocaml_4.02.3 b/debian/patches/ocaml_4.02.3 new file mode 100644 index 0000000..ba48ad8 --- /dev/null +++ b/debian/patches/ocaml_4.02.3 @@ -0,0 +1,45 @@ +--- a/ptset.ml ++++ b/ptset.ml +@@ -125,6 +125,9 @@ + in + ins t + ++let of_list = ++ List.fold_left (fun t e -> add e t) Empty ++ + (*s The code to remove an element is basically similar to the code of + insertion. But since we have to maintain the invariant that both + subtrees of a [Branch] node are non-empty, we use here the +@@ -441,7 +444,10 @@ + join (k, Leaf k, p, t) + in + ins t +- ++ ++ let of_list = ++ List.fold_left (fun t e -> add e t) Empty ++ + let remove k t = + let rec rmv = function + | Empty -> Empty +@@ -606,6 +612,9 @@ + + let add x s = if x < 0 then invalid_arg "BigPos.add"; add x s + ++ let of_list = ++ List.fold_left (fun t e -> add e t) Empty ++ + (* Patricia trees are now binary search trees! *) + + let rec mem k = function +--- a/ptset.mli ++++ b/ptset.mli +@@ -36,6 +36,8 @@ + + val add : int -> t -> t + ++val of_list : elt list -> t ++ + val singleton : int -> t + + val remove : int -> t -> t diff --git a/debian/patches/series b/debian/patches/series index 8cea07c..be46949 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ make_clean make_viewer_byte make_byte +ocaml_4.02.3 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/coinst.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits