This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository camlp5.
commit fdae43725a2426ce422e7e6cc6417709f74bb826 Author: Stephane Glondu <st...@glondu.net> Date: Wed Jun 8 17:34:42 2016 +0200 New upstream release --- debian/changelog | 6 ++ ...x-for-methods-wrongly-interpreted-as-vals.patch | 81 ----------------- .../patches/0002-fixed-bug-on-optional-types.patch | 100 --------------------- debian/patches/series | 2 - 4 files changed, 6 insertions(+), 183 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2b57885..664aaed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +camlp5 (6.16-1) UNRELEASED; urgency=medium + + * New upstream release + + -- Stéphane Glondu <glo...@debian.org> Wed, 08 Jun 2016 17:34:28 +0200 + camlp5 (6.14-2) unstable; urgency=medium * Team upload. diff --git a/debian/patches/0001-fix-for-methods-wrongly-interpreted-as-vals.patch b/debian/patches/0001-fix-for-methods-wrongly-interpreted-as-vals.patch deleted file mode 100644 index a56e810..0000000 --- a/debian/patches/0001-fix-for-methods-wrongly-interpreted-as-vals.patch +++ /dev/null @@ -1,81 +0,0 @@ -From: Mehdi Dogguy <me...@debian.org> -Date: Wed, 20 Jan 2016 19:58:12 +0100 -Subject: fix for methods wrongly interpreted as vals - -See https://scm.gforge.inria.fr/anonscm/gitweb?p=camlp5/camlp5.git;a=commit;h=caca3dd0643ec5aae9df4399fa73eb280808ef18 ---- - lib/versdep.ml | 2 +- - main/ast2pt.ml | 4 ---- - ocaml_src/lib/versdep/4.02.3.ml | 2 +- - ocaml_src/lib/versdep/4.02.4.ml | 2 +- - ocaml_src/main/ast2pt.ml | 3 --- - 5 files changed, 3 insertions(+), 10 deletions(-) - -diff --git a/lib/versdep.ml b/lib/versdep.ml -index 184b988..0cd2233 100644 ---- a/lib/versdep.ml -+++ b/lib/versdep.ml -@@ -1091,7 +1091,7 @@ value ocaml_pcf_valvirt = - value ocaml_pcf_virt (s, pf, t, loc) = - IFDEF OCAML_VERSION < OCAML_4_00 THEN Pcf_virt (s, pf, t, loc) - ELSIFDEF OCAML_VERSION < OCAML_4_02_0 THEN Pcf_virt (mkloc loc s, pf, t) -- ELSE Pcf_val (mkloc loc s, Immutable, Cfk_virtual t) END -+ ELSE Pcf_method (mkloc loc s, pf, Cfk_virtual t) END - ; - - value ocaml_pcl_apply = -diff --git a/main/ast2pt.ml b/main/ast2pt.ml -index d221dff..bd3c321 100644 ---- a/main/ast2pt.ml -+++ b/main/ast2pt.ml -@@ -261,10 +261,6 @@ value rec ctyp = - | TyArr loc (TyLab loc1 lab t1) t2 → - mktyp loc (ocaml_ptyp_arrow (uv lab) (ctyp t1) (ctyp t2)) - | TyArr loc (TyOlb loc1 lab t1) t2 → -- let t1 = -- let loc = loc1 in -- <:ctyp< option $t1$ >> -- in - mktyp loc (ocaml_ptyp_arrow ("?" ^ uv lab) (ctyp t1) (ctyp t2)) - | TyArr loc t1 t2 → mktyp loc (ocaml_ptyp_arrow "" (ctyp t1) (ctyp t2)) - | TyObj loc fl v → mktyp loc (ocaml_ptyp_object (meth_list loc (uv fl) v)) -diff --git a/ocaml_src/lib/versdep/4.02.3.ml b/ocaml_src/lib/versdep/4.02.3.ml -index cbe5f5b..54bfd10 100644 ---- a/ocaml_src/lib/versdep/4.02.3.ml -+++ b/ocaml_src/lib/versdep/4.02.3.ml -@@ -524,7 +524,7 @@ let ocaml_pcf_valvirt = - ;; - - let ocaml_pcf_virt (s, pf, t, loc) = -- Pcf_val (mkloc loc s, Immutable, Cfk_virtual t) -+ Pcf_method (mkloc loc s, pf, Cfk_virtual t) - ;; - - let ocaml_pcl_apply = Some (fun ce lel -> Pcl_apply (ce, lel));; -diff --git a/ocaml_src/lib/versdep/4.02.4.ml b/ocaml_src/lib/versdep/4.02.4.ml -index cbe5f5b..54bfd10 100644 ---- a/ocaml_src/lib/versdep/4.02.4.ml -+++ b/ocaml_src/lib/versdep/4.02.4.ml -@@ -524,7 +524,7 @@ let ocaml_pcf_valvirt = - ;; - - let ocaml_pcf_virt (s, pf, t, loc) = -- Pcf_val (mkloc loc s, Immutable, Cfk_virtual t) -+ Pcf_method (mkloc loc s, pf, Cfk_virtual t) - ;; - - let ocaml_pcl_apply = Some (fun ce lel -> Pcl_apply (ce, lel));; -diff --git a/ocaml_src/main/ast2pt.ml b/ocaml_src/main/ast2pt.ml -index 776c2a1..a534dd0 100644 ---- a/ocaml_src/main/ast2pt.ml -+++ b/ocaml_src/main/ast2pt.ml -@@ -276,9 +276,6 @@ let rec ctyp = - | TyArr (loc, TyLab (loc1, lab, t1), t2) -> - mktyp loc (ocaml_ptyp_arrow (uv lab) (ctyp t1) (ctyp t2)) - | TyArr (loc, TyOlb (loc1, lab, t1), t2) -> -- let t1 = -- let loc = loc1 in MLast.TyApp (loc, MLast.TyLid (loc, "option"), t1) -- in - mktyp loc (ocaml_ptyp_arrow ("?" ^ uv lab) (ctyp t1) (ctyp t2)) - | TyArr (loc, t1, t2) -> mktyp loc (ocaml_ptyp_arrow "" (ctyp t1) (ctyp t2)) - | TyObj (loc, fl, v) -> diff --git a/debian/patches/0002-fixed-bug-on-optional-types.patch b/debian/patches/0002-fixed-bug-on-optional-types.patch deleted file mode 100644 index 0533365..0000000 --- a/debian/patches/0002-fixed-bug-on-optional-types.patch +++ /dev/null @@ -1,100 +0,0 @@ -From: Mehdi Dogguy <me...@debian.org> -Date: Mon, 25 Jan 2016 21:52:09 +0100 -Subject: fixed bug on optional types - -See https://scm.gforge.inria.fr/anonscm/gitweb?p=camlp5/camlp5.git;a=commit;h=bdb6420a699595cb2bce27063ad4dd421b3f312c ---- - lib/versdep.ml | 13 +++++++++++++ - ocaml_src/lib/versdep/4.02.3.ml | 11 ++++++++++- - ocaml_src/lib/versdep/4.02.4.ml | 11 ++++++++++- - 3 files changed, 33 insertions(+), 2 deletions(-) - -diff --git a/lib/versdep.ml b/lib/versdep.ml -index 0cd2233..7a1cf4b 100644 ---- a/lib/versdep.ml -+++ b/lib/versdep.ml -@@ -94,6 +94,18 @@ value list_map_check f l = - | [] -> Some (List.rev rev_l) ] - ; - -+IFDEF OCAML_VERSION > OCAML_2_04 AND OCAML_VERSION < OCAML_4_03_0 THEN -+ value mkopt t lab = -+ if lab = "" then t -+ else if lab.[0] = '?' then -+ {ptyp_desc = -+ Ptyp_constr (mknoloc (Ldot (Lident "*predef*") "option")) [t]; -+ ptyp_loc = loc_none; -+ ptyp_attributes = []} -+ else t -+ ; -+END; -+ - value ocaml_value_description vn t p = - IFDEF OCAML_VERSION < OCAML_4_00 THEN {pval_type = t; pval_prim = p} - ELSIFDEF OCAML_VERSION < OCAML_4_02_0 THEN -@@ -367,6 +379,7 @@ value ocaml_ptype_variant ctl priv = - - value ocaml_ptyp_arrow lab t1 t2 = - IFDEF OCAML_VERSION <= OCAML_2_04 THEN Ptyp_arrow t1 t2 -+ ELSIFDEF OCAML_VERSION < OCAML_4_03_0 THEN Ptyp_arrow lab (mkopt t1 lab) t2 - ELSE Ptyp_arrow lab t1 t2 END - ; - -diff --git a/ocaml_src/lib/versdep/4.02.3.ml b/ocaml_src/lib/versdep/4.02.3.ml -index 54bfd10..9f027e7 100644 ---- a/ocaml_src/lib/versdep/4.02.3.ml -+++ b/ocaml_src/lib/versdep/4.02.3.ml -@@ -62,6 +62,15 @@ let list_map_check f l = - loop [] l - ;; - -+let mkopt t lab = -+ if lab = "" then t -+ else if lab.[0] = '?' then -+ {ptyp_desc = -+ Ptyp_constr (mknoloc (Ldot (Lident "*predef*", "option")), [t]); -+ ptyp_loc = loc_none; ptyp_attributes = []} -+ else t -+;; -+ - let ocaml_value_description vn t p = - {pval_type = t; pval_prim = p; pval_loc = t.ptyp_loc; - pval_name = mkloc t.ptyp_loc vn; pval_attributes = []} -@@ -168,7 +177,7 @@ let ocaml_ptype_variant ctl priv = - with Exit -> None - ;; - --let ocaml_ptyp_arrow lab t1 t2 = Ptyp_arrow (lab, t1, t2);; -+let ocaml_ptyp_arrow lab t1 t2 = Ptyp_arrow (lab, mkopt t1 lab, t2);; - - let ocaml_ptyp_class li tl ll = Ptyp_class (mknoloc li, tl);; - -diff --git a/ocaml_src/lib/versdep/4.02.4.ml b/ocaml_src/lib/versdep/4.02.4.ml -index 54bfd10..9f027e7 100644 ---- a/ocaml_src/lib/versdep/4.02.4.ml -+++ b/ocaml_src/lib/versdep/4.02.4.ml -@@ -62,6 +62,15 @@ let list_map_check f l = - loop [] l - ;; - -+let mkopt t lab = -+ if lab = "" then t -+ else if lab.[0] = '?' then -+ {ptyp_desc = -+ Ptyp_constr (mknoloc (Ldot (Lident "*predef*", "option")), [t]); -+ ptyp_loc = loc_none; ptyp_attributes = []} -+ else t -+;; -+ - let ocaml_value_description vn t p = - {pval_type = t; pval_prim = p; pval_loc = t.ptyp_loc; - pval_name = mkloc t.ptyp_loc vn; pval_attributes = []} -@@ -168,7 +177,7 @@ let ocaml_ptype_variant ctl priv = - with Exit -> None - ;; - --let ocaml_ptyp_arrow lab t1 t2 = Ptyp_arrow (lab, t1, t2);; -+let ocaml_ptyp_arrow lab t1 t2 = Ptyp_arrow (lab, mkopt t1 lab, t2);; - - let ocaml_ptyp_class li tl ll = Ptyp_class (mknoloc li, tl);; - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 82a6222..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -0001-fix-for-methods-wrongly-interpreted-as-vals.patch -0002-fixed-bug-on-optional-types.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/camlp5.git _______________________________________________ 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