This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository cmigrep.
commit fb7a21b14e0760aa3e9429dece601b00f8c8cb40 Author: Mehdi Dogguy <me...@debian.org> Date: Sat Oct 10 19:33:05 2015 +0200 Port to OCaml >= 4.02.3 --- debian/changelog | 7 +++ ...0004-Adapt-to-Types-types-of-OCaml-4.02.3.patch | 70 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 78 insertions(+) diff --git a/debian/changelog b/debian/changelog index de6b9cd..0a14439 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cmigrep (1.5-13) UNRELEASED; urgency=medium + + * Recompile with OCaml 4.02.3 + - Add 0004-Adapt-to-Types-types-of-OCaml-4.02.3.patch + + -- Mehdi Dogguy <me...@debian.org> Sat, 10 Oct 2015 19:33:05 +0200 + cmigrep (1.5-12) unstable; urgency=medium * Remove broken Homepage diff --git a/debian/patches/0004-Adapt-to-Types-types-of-OCaml-4.02.3.patch b/debian/patches/0004-Adapt-to-Types-types-of-OCaml-4.02.3.patch new file mode 100644 index 0000000..8ef6b12 --- /dev/null +++ b/debian/patches/0004-Adapt-to-Types-types-of-OCaml-4.02.3.patch @@ -0,0 +1,70 @@ +From: Mehdi Dogguy <me...@debian.org> +Date: Fri, 16 Oct 2015 22:10:37 +0200 +Subject: Adapt to Types types of OCaml >= 4.02.3 + +--- + cmigrep.ml | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/cmigrep.ml b/cmigrep.ml +index dd162fa..595369b 100755 +--- a/cmigrep.ml ++++ b/cmigrep.ml +@@ -306,7 +306,7 @@ let print_constructor print_path path s exp = + begin match type_decl.type_kind with + | Type_variant (constructors) -> + List.iter +- (fun (name, type_exprs, _) -> ++ (fun {cd_id=name ; cd_args = type_exprs} -> + let name = Ident.name name in + if Pcre.pmatch ~rex:exp name then begin + Format.print_string name; +@@ -385,7 +385,7 @@ let print_record_label print_path path s exp = + begin match type_decl.type_kind with + | Type_record (labels, _) -> + List.iter +- (fun (name, mutable_flag, type_expr) -> ++ (fun {ld_id = name; ld_mutable = mutable_flag; ld_type = type_expr} -> + let name = Ident.name name in + if Pcre.pmatch ~rex:exp name then begin + begin match mutable_flag with +@@ -448,7 +448,7 @@ let print_all print_path path s exp = + (function + | Sig_value (id, _) + | Sig_type (id, _, _) +- | Sig_exception (id, _) ++ | Sig_typext (id, _, _) + | Sig_module (id, _, _) + | Sig_modtype (id, _) + | Sig_class (id, _, _) +@@ -464,9 +464,9 @@ let print_all print_path path s exp = + let print_exception print_path path s exp = + List.iter + (function +- | Sig_exception (id, exn) -> ++ | Sig_typext (id, ext, Types.Text_exception) -> + if match_ident exp id then begin +- Printtyp.exception_declaration id Format.std_formatter exn; ++ Printtyp.extension_constructor id Format.std_formatter ext; + if print_path then + Format.print_string (Printf.sprintf " (* %s *)" path); + Format.print_newline () +@@ -529,14 +529,14 @@ let cmi_files args mod_expr = + let rec matching_submods mod_expr s = + match s with + | Sig_module (id, mt, _) :: tl when match_mod_expr mod_expr (Ident.name id) -> +- begin match mt with ++ begin match mt.Types.md_type with + | Mty_signature sg -> (Ident.name id, sg) :: matching_submods mod_expr tl + | Mty_functor (_, mt, _) -> + begin match mt with +- | Mty_signature sg -> (Ident.name id, sg) :: matching_submods mod_expr tl ++ | Some (Mty_signature sg) -> (Ident.name id, sg) :: matching_submods mod_expr tl + | _ -> matching_submods mod_expr tl + end +- | Mty_ident _ -> matching_submods mod_expr tl ++ | Mty_ident _ | Mty_alias _ -> matching_submods mod_expr tl + end + | _ :: tl -> matching_submods mod_expr tl + | [] -> [] +-- diff --git a/debian/patches/series b/debian/patches/series index 22ad952..3f53651 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0001-No-private-flag.patch 0002-Adapt-to-Types-types-of-OCaml-4.patch 0003-Adapt-build-system-to-OCaml-4.patch +0004-Adapt-to-Types-types-of-OCaml-4.02.3.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cmigrep.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