The following commit has been merged in the master branch:
commit 6f7d917651e619c314d0cf15f6be6d428c33c5af
Author: Mehdi Dogguy <me...@debian.org>
Date: Fri Nov 4 09:24:47 2011 +0100
Remove 0002-Fix-build-with-OCaml-3.12.0.patch, fixed upstream
diff --git a/debian/patches/0002-Fix-build-with-OCaml-3.12.0.patch
b/debian/patches/0002-Fix-build-with-OCaml-3.12.0.patch
deleted file mode 100644
index d3297e1..0000000
--- a/debian/patches/0002-Fix-build-with-OCaml-3.12.0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Sat, 19 Jun 2010 20:03:48 -0700
-Subject: Fix build with OCaml 3.12.0
-
-The quotation <:ctyp< $a$ $b$ >> doesn't work any more with OCaml
-3.12.0+beta1; we manually expand it.
-
-Bug-OCaml: http://caml.inria.fr/mantis/view.php?id=5080
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586493
-Signed-off-by: Stephane Glondu <st...@glondu.net>
----
- src/syntax/pa_strings/pa_format.ml | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/syntax/pa_strings/pa_format.ml
b/src/syntax/pa_strings/pa_format.ml
-index 0b40904..e3059b2 100644
---- a/src/syntax/pa_strings/pa_format.ml
-+++ b/src/syntax/pa_strings/pa_format.ml
-@@ -246,7 +246,7 @@ struct
- <:expr< fun paren out x -> BatIO.nwrite out "<abstract>" >>
- | <:ctyp@_loc< $id:id$ >> ->
- <:expr< $id:map_id id$ >>
-- | <:ctyp@_loc< $a$ $b$ >> ->
-+ | <:ctyp@_loc< ($a$ $b$) >> ->
- <:expr< $vprinter_of_ctyp b$ $vprinter_of_ctyp a$ >>
- | <:ctyp@_loc< $tup:t$ >> ->
- let l = Ast.list_of_ctyp t [] in
---
diff --git a/debian/patches/series b/debian/patches/series
index a4086ac..cd3636d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-0002-Fix-build-with-OCaml-3.12.0.patch
0003-Do-not-enforce-sanity-check-rules.patch
0004-Fix-build-with-camomile-0.8.3.patch
--
ocaml-batteries packaging
_______________________________________________
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
