This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository coinst.
commit 310bdadd593db063e5939ed409995ede74214273 Author: Mehdi Dogguy <me...@debian.org> Date: Thu Jan 16 23:36:21 2014 +0100 Add Fixed-to-compile-with-OCaml-4.01.patch --- debian/changelog | 1 + .../0001-Fixed-to-compile-with-OCaml-4.01.patch | 54 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 56 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7ae2626..133a1fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ coinst (1.9.0-1) UNRELEASED; urgency=low - Update debian/patches/make_viewer_byte in order to build coinst_converter.byte as well on bytecode architectures. - Add debian/patches/make_byte + - Add debian/patches/Fixed-to-compile-with-OCaml-4.01.patch (from upstream) * Install comigrate and coinst-upgrades utilities. * Install coinst_converter and jsviewer.js in the coinst-viewer package (Closes: #665447). diff --git a/debian/patches/0001-Fixed-to-compile-with-OCaml-4.01.patch b/debian/patches/0001-Fixed-to-compile-with-OCaml-4.01.patch new file mode 100644 index 0000000..731af93 --- /dev/null +++ b/debian/patches/0001-Fixed-to-compile-with-OCaml-4.01.patch @@ -0,0 +1,54 @@ +From b5861ccb7536abf0a0528c9a16aa2a492592bc6c Mon Sep 17 00:00:00 2001 +From: Jerome Vouillon <jerome.vouil...@pps.univ-paris-diderot.fr> +Date: Tue, 14 Jan 2014 10:03:53 +0100 +Subject: [PATCH] Fixed to compile with OCaml 4.01 + +--- + ptset.ml | 10 ++++++++++ + ptset.mli | 2 ++ + 2 files changed, 12 insertions(+) + +diff --git a/ptset.ml b/ptset.ml +index 59fcbb7..0202740 100644 +--- a/ptset.ml ++++ b/ptset.ml +@@ -71,6 +71,11 @@ let rec mem k = function + | Leaf j -> k == j + | Branch (_, m, l, r) -> mem k (if zero_bit k m then l else r) + ++let rec find k = function ++ | Empty -> raise Not_found ++ | Leaf j -> if k == j then j else raise Not_found ++ | Branch (_, m, l, r) -> find k (if zero_bit k m then l else r) ++ + (*s The following operation [join] will be used in both insertion and + union. Given two non-empty trees [t0] and [t1] with longest common + prefixes [p0] and [p1] respectively, which are supposed to +@@ -374,6 +379,11 @@ module Big = struct + | Leaf j -> k == j + | Branch (_, m, l, r) -> mem k (if zero_bit k m then l else r) + ++ let rec find k = function ++ | Empty -> raise Not_found ++ | Leaf j -> if k == j then j else raise Not_found ++ | Branch (_, m, l, r) -> find k (if zero_bit k m then l else r) ++ + let mask k m = (k lor (m-1)) land (lnot m) + + (* we first write a naive implementation of [highest_bit] +diff --git a/ptset.mli b/ptset.mli +index 9899140..dc3e5f5 100644 +--- a/ptset.mli ++++ b/ptset.mli +@@ -32,6 +32,8 @@ val is_empty : t -> bool + + val mem : int -> t -> bool + ++val find : int -> t -> int ++ + val add : int -> t -> t + + val singleton : int -> t +-- +1.7.10.4 + diff --git a/debian/patches/series b/debian/patches/series index 8cea07c..fadf984 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ make_clean make_viewer_byte make_byte +0001-Fixed-to-compile-with-OCaml-4.01.patch -- 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