The following commit has been merged in the master branch: commit 80c0a3216e69d2cd9abe4b681b283bd96e909194 Author: Mehdi Dogguy <me...@debian.org> Date: Thu Apr 21 22:28:06 2011 +0200
Fix FTBFS with OCaml 3.12 diff --git a/debian/changelog b/debian/changelog index 43e4807..130dd78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +janest-core (0.6.0-3) unstable; urgency=low + + * Fix FTBFS with OCaml 3.12 (Closes: #585460) + - 0006-Fix-Gc.stat-definition-in-core_gc.ml.patch + + -- Mehdi Dogguy <me...@debian.org> Thu, 21 Apr 2011 22:26:51 +0200 + janest-core (0.6.0-2) unstable; urgency=low * Fix FTBFS on non-Linux platforms: Do not blindly remove lines starting diff --git a/debian/patches/0006-Fix-Gc.stat-definition-in-core_gc.ml.patch b/debian/patches/0006-Fix-Gc.stat-definition-in-core_gc.ml.patch new file mode 100644 index 0000000..f45f4bb --- /dev/null +++ b/debian/patches/0006-Fix-Gc.stat-definition-in-core_gc.ml.patch @@ -0,0 +1,35 @@ +From: Mehdi Dogguy <me...@debian.org> +Date: Thu, 21 Apr 2011 22:26:30 +0200 +Subject: [PATCH] Fix Gc.stat definition in core_gc.ml + +--- + lib/core_gc.ml | 1 + + lib/core_gc.mli | 2 ++ + 2 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/lib/core_gc.ml b/lib/core_gc.ml +index acee021..5878517 100644 +--- a/lib/core_gc.ml ++++ b/lib/core_gc.ml +@@ -54,6 +54,7 @@ module Stat = struct + fragments : pretty_int; + compactions : pretty_int; + top_heap_words : pretty_int; ++ stack_size : pretty_int; + } with bin_io, sexp + type binable = t + type sexpable = t +diff --git a/lib/core_gc.mli b/lib/core_gc.mli +index 9a2e734..87aa60f 100644 +--- a/lib/core_gc.mli ++++ b/lib/core_gc.mli +@@ -71,6 +71,8 @@ module Stat : sig + + top_heap_words : int; + (** Maximum size reached by the major heap, in words. *) ++ ++ stack_size : int; + } + include Binable.S with type binable = t + include Sexpable.S with type sexpable = t +-- diff --git a/debian/patches/series b/debian/patches/series index 96418b1..25625d6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 0003-add-missing-META-dep-on-unix.patch 0004-fix-build-on-kfreebsd.patch 0005-create-destdir-upon-install.patch +0006-Fix-Gc.stat-definition-in-core_gc.ml.patch -- janest-core packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits