[Pkg-ocaml-maint-commits] [SCM] ocaml-data-notation packaging branch, master, updated. debian/0.0.6-1-4-g7d067bf

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 56f09a365c62fb0f68ad623c8d0adb94a1c834d2
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Nov 11 10:37:27 2011 +0100

    Fix FTBFS with type-conv >= 3.0.1

diff --git a/debian/patches/0001-Use-lid-in-quotations-instead-of-Gen.id-pe.patch b/debian/patches/0001-Use-lid-in-quotations-instead-of-Gen.id-pe.patch
new file mode 100644
index 0000000..e13659d
--- /dev/null
+++ b/debian/patches/0001-Use-lid-in-quotations-instead-of-Gen.id-pe.patch
@@ -0,0 +1,59 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Fri, 11 Nov 2011 10:34:48 +0100
+Subject: Use lid in quotations instead of Gen.id[pe]
+
+This fixes compilation with type-conv >= 3.0.1.
+
+Bug: http://forge.ocamlcore.org/tracker/index.php?func=detail&aid=1033&group_id=148&atid=674
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ src/pa_odn.ml |   14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/pa_odn.ml b/src/pa_odn.ml
+index e796005..a3d664d 100644
+--- a/src/pa_odn.ml
++++ b/src/pa_odn.ml
+@@ -44,7 +44,7 @@ let odn_id_name _loc tn rev_path =
+ ;;
+ 
+ let odn_patt_name _loc tn =
+-  Gen.idp _loc (odn_fun_name tn)
++  <:patt< $lid:odn_fun_name tn$ >>
+ ;;
+ 
+ let rec odn_of_tuple _loc tps =
+@@ -54,8 +54,8 @@ let rec odn_of_tuple _loc tps =
+          let vnm =
+            "v"^(string_of_int i)
+          in
+-           (Gen.idp _loc vnm) :: acc_patt, 
+-           <:expr<$odn_of_type _loc tp$ $Gen.ide _loc vnm$>> :: acc_expr, 
++           <:patt< $lid:vnm$ >> :: acc_patt,
++           <:expr< $odn_of_type _loc tp$ $lid:vnm$ >> :: acc_expr,
+            i + 1)
+       ([], [], 0)
+       (List.rev 
+@@ -82,8 +82,8 @@ and odn_of_variants _loc vrts =
+          | <:ctyp<`$cnstr$ of $tps$>> ->
+              begin
+                let vnm = "tpl" in
+-               let var_expr = Gen.ide _loc vnm in
+-               let var_patt = Gen.idp _loc vnm in
++               let var_expr = <:expr< $lid:vnm$ >> in
++               let var_patt = <:patt< $lid:vnm$ >> in
+                let expr = 
+                  <:expr<$odn_of_tuple _loc tps$ $var_expr$>>
+                in
+@@ -149,8 +149,8 @@ let odn_of_sum _loc ctp =
+                  let vnm =
+                    "v"^(string_of_int i)
+                  in
+-                   (Gen.idp _loc vnm) :: acc_patt, 
+-                   <:expr<$odn_of_type _loc tp$ $Gen.ide _loc vnm$>> :: acc_expr, 
++                   <:patt< $lid:vnm$ >> :: acc_patt,
++                   <:expr< $odn_of_type _loc tp$ $lid:vnm$ >> :: acc_expr,
+                    i + 1)
+               ([], [], 0)
+               (List.rev 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..882059b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Use-lid-in-quotations-instead-of-Gen.id-pe.patch

-- 
ocaml-data-notation packaging