This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository why.
commit 773e2998237026472a455b091e330dd59727d954 Author: Mehdi Dogguy <me...@debian.org> Date: Sat Oct 17 00:23:30 2015 +0200 Fix FTBFS with OCaml 4.02.3 --- debian/changelog | 11 +++++++++-- debian/patches/bprintf | 17 +++++++++++++++++ debian/patches/edge | 13 +++++++++++++ debian/patches/makefile | 13 +++++++++++++ debian/patches/series | 3 +++ 5 files changed, 55 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3dbd078..5f9636e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,15 @@ -why (2.34-3) UNRELEASED; urgency=medium +why (2.34-4) UNRELEASED; urgency=medium + [ Ralf Treinen ] * improve as-installed package tests - -- Ralf Treinen <trei...@debian.org> Thu, 16 Oct 2014 22:08:01 +0200 + [ Mehdi Dogguy ] + * Fix FTBFS with OCaml 4.02.3 by: + - not using Format.bprintf anymore + - not turning warning 3 into an error + * Port Why to ocamlgraph 1.8.6 + + -- Mehdi Dogguy <me...@debian.org> Sat, 17 Oct 2015 00:22:35 +0200 why (2.34-2) unstable; urgency=medium diff --git a/debian/patches/bprintf b/debian/patches/bprintf new file mode 100644 index 0000000..8d813b6 --- /dev/null +++ b/debian/patches/bprintf @@ -0,0 +1,17 @@ +Author: Mehdi Dogguy <me...@debian.org> +Description: Stop using deprecated function Format.bprintf + +Index: src/encoding_mono_inst.ml +=================================================================== +--- a/src/encoding_mono_inst.ml ++++ b/src/encoding_mono_inst.ml +@@ -126,7 +126,8 @@ + | PTexternal (l,id) -> fprintf fmt "%aI%a" + (Pp.print_list (Pp.constant_string "I") aux) l Ident.print id in + let b = Buffer.create 10 in +- Format.bprintf b "%a@?" aux t; ++ let to_b = Format.formatter_of_buffer b in ++ Format.fprintf to_b "%a@?" aux t; + let from = match from,t with + | true,PTexternal (l,id) -> Some (create_ident_id,id::(List.map (ident_of_close_type ~from:false) l)) + | _ -> None in diff --git a/debian/patches/edge b/debian/patches/edge new file mode 100644 index 0000000..449fc6d --- /dev/null +++ b/debian/patches/edge @@ -0,0 +1,13 @@ +--- a/src/hypotheses_filtering.ml ++++ b/src/hypotheses_filtering.ml +@@ -1687,8 +1687,9 @@ + + module W = struct + type label = PdlGraph.E.label ++ type edge = PdlGraph.E.t + type t = int +- let weight x = x ++ let weight x = PdlGraph.E. label x + let zero = 0 + let add = (+) + let compare = compare diff --git a/debian/patches/makefile b/debian/patches/makefile new file mode 100644 index 0000000..5469d22 --- /dev/null +++ b/debian/patches/makefile @@ -0,0 +1,13 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -64,8 +64,8 @@ + CAMLP4 = @CAMLP4O@ + + INCLUDES = -I src -I jc -I c -I java -I intf -I tools -I mix -I ml +-BFLAGS = -w Z -warn-error A -dtypes -g $(INCLUDES) @INCLUDEGTK2@ -I +threads @OCAMLGRAPHLIB@ +-OFLAGS = -w Z -warn-error A -dtypes $(INCLUDES) @INCLUDEGTK2@ -I +threads @OCAMLGRAPHLIB@ ++BFLAGS = -w Z -warn-error +a-3 -dtypes -g $(INCLUDES) @INCLUDEGTK2@ -I +threads @OCAMLGRAPHLIB@ ++OFLAGS = -w Z -warn-error +a-3 -dtypes $(INCLUDES) @INCLUDEGTK2@ -I +threads @OCAMLGRAPHLIB@ + + LCFLAGS = -L/usr/lib -L/usr/local/lib/ocaml + diff --git a/debian/patches/series b/debian/patches/series index 72f8956..cc1e7af 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,4 @@ atp-versions +bprintf +makefile +edge -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/why.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