[Pkg-ocaml-maint-commits] [SCM] ocaml-data-notation packaging branch, master, updated. debian/0.0.6-2-8-g41e7a39

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 41e7a39d1448f5ff805cf725ad956e9a62032cd4
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Jan 3 17:42:55 2012 +0100

    Remove 0001-Use-lid-in-quotations-instead-of-Gen.id-pe.patch

diff --git a/debian/changelog b/debian/changelog
index f365771..cb88041 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ocaml-data-notation (0.0.7-1) unstable; urgency=low
 
   * Team upload
   * New upstream release
+    - remove 0001-Use-lid-in-quotations-instead-of-Gen.id-pe.patch which
+      is no longer needed since integrated into upstream's sources.
 
  -- Mehdi Dogguy <mehdi at debian.org>  Tue, 03 Jan 2012 17:33:32 +0100
 
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
deleted file mode 100644
index e13659d..0000000
--- a/debian/patches/0001-Use-lid-in-quotations-instead-of-Gen.id-pe.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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
index 882059b..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-0001-Use-lid-in-quotations-instead-of-Gen.id-pe.patch

-- 
ocaml-data-notation packaging