[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. debian/1.1.0-2-3-g4a877df

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 4a877df96fb54e9b4d38b16db3775ccad4c12abf
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jun 19 20:27:10 2010 -0700

    Add 0002-Fix-build-with-OCaml-3.12.0.patch (Closes: #586493)

diff --git a/debian/changelog b/debian/changelog
index 9b0851f..e9ed57d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 ocaml-batteries (1.1.0-3) UNRELEASED; urgency=low
 
-  * Not released yet!
+  * Add 0002-Fix-build-with-OCaml-3.12.0.patch (Closes: #586493)
 
- -- Mehdi Dogguy <mehdi at debian.org>  Thu, 03 Jun 2010 15:30:41 +0200
+ -- Stéphane Glondu <glondu at debian.org>  Sat, 19 Jun 2010 20:40:57 -0700
 
 ocaml-batteries (1.1.0-2) unstable; urgency=low
 
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
new file mode 100644
index 0000000..a90b512
--- /dev/null
+++ b/debian/patches/0002-Fix-build-with-OCaml-3.12.0.patch
@@ -0,0 +1,28 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Sat, 19 Jun 2010 20:03:48 -0700
+Subject: [PATCH] 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 <steph at 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 58396ff..f71a150 100644
+--- a/src/syntax/pa_strings/pa_format.ml
++++ b/src/syntax/pa_strings/pa_format.ml
+@@ -244,7 +244,7 @@ struct
+         <:expr< fun paren out x -> BatIO.nwrite out "<abstract>" >>
+     | <:ctyp at _loc< $id:id$ >> ->
+         <:expr< $id:map_id id$ >>
+-    | <:ctyp at _loc< $a$ $b$ >> ->
++    | Ast.TyApp (_loc, b, a) ->
+         <:expr< $vprinter_of_ctyp b$ $vprinter_of_ctyp a$ >>
+     | <:ctyp at _loc< $tup:t$ >> ->
+         let l = Ast.list_of_ctyp t [] in
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 19547b0..906fb5c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-install-fix-for-bytecode-only-build.patch
+0002-Fix-build-with-OCaml-3.12.0.patch

-- 
ocaml-batteries packaging