[Pkg-ocaml-maint-commits] [SCM] ocaml-data-notation packaging branch, master, updated. debian/0.0.6-1-4-g7d067bf
The following commit has been merged in the master branch: commit 56f09a365c62fb0f68ad623c8d0adb94a1c834d2 Author: Stephane Glondu st...@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 000..e13659d --- /dev/null +++ b/debian/patches/0001-Use-lid-in-quotations-instead-of-Gen.id-pe.patch @@ -0,0 +1,59 @@ +From: Stephane Glondu st...@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=detailaid=1033group_id=148atid=674 +Signed-off-by: Stephane Glondu st...@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 000..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 ___ 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
[Pkg-ocaml-maint-commits] [SCM] ocaml-data-notation packaging branch, master, updated. debian/0.0.6-1-4-g7d067bf
The following commit has been merged in the master branch: commit 3cfbab6a397afa9940e356690ebcb743d815ddbf Author: Stephane Glondu st...@glondu.net Date: Fri Nov 11 10:39:06 2011 +0100 Bump bdep to type-conv diff --git a/debian/control b/debian/control index 2629117..5474b87 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: ocaml-nox (= 3.11.1-3~), ocaml-findlib, ocaml-base-nox, - libtype-conv-camlp4-dev, + libtype-conv-camlp4-dev (= 2.3.0), libounit-ocaml-dev, libfileutils-ocaml-dev (= 0.4.0), dh-ocaml (= 0.9~), -- ocaml-data-notation 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
[Pkg-ocaml-maint-commits] [SCM] ocaml-data-notation packaging branch, master, updated. debian/0.0.6-1-4-g7d067bf
The following commit has been merged in the master branch: commit 830efcd61bb6e52021f3957ad6ced5962c8210c5 Author: Stephane Glondu st...@glondu.net Date: Fri Nov 11 10:40:28 2011 +0100 Bump Standards-Version to 3.9.2 (no changes) diff --git a/debian/control b/debian/control index 5474b87..8b37da8 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: dh-ocaml (= 0.9~), debhelper (= 7.0.50~), camlp4 -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://forge.ocamlcore.org/projects/odn Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-data-notation.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-data-notation.git -- ocaml-data-notation 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
[Pkg-ocaml-maint-commits] [SCM] ocaml-data-notation packaging branch, master, updated. debian/0.0.6-1-4-g7d067bf
The following commit has been merged in the master branch: commit 7d067bfdcfad56989b3a781384be21b93f36028b Author: Stephane Glondu st...@glondu.net Date: Fri Nov 11 10:41:39 2011 +0100 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index fe97d5e..c927a68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +ocaml-data-notation (0.0.6-2) unstable; urgency=low + + * Team upload + * Fix FTBFS with type-conv = 3.0.1 +- add version in (build-)dependency to type-conv + * Bump Standards-Version to 3.9.2 (no changes) + + -- Stéphane Glondu glo...@debian.org Fri, 11 Nov 2011 10:41:33 +0100 + ocaml-data-notation (0.0.6-1) unstable; urgency=low * Team upload -- ocaml-data-notation 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