[Pkg-ocaml-maint-commits] [utop] 01/03: Imported Upstream version 1.18.2

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository utop.

commit 53fa4a03ae78e326810a91044b66057858e0481f
Author: Hilko Bengen <bengen at debian.org>
Date:   Mon Mar 21 18:45:40 2016 +0100

    Imported Upstream version 1.18.2
---
 CHANGES.md                | 10 ++++++++++
 Makefile                  |  2 +-
 _oasis                    |  2 +-
 setup.ml                  |  9 ++++-----
 src/lib/META              |  6 +++---
 src/lib/uTop_main.cppo.ml |  5 ++++-
 6 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index d9e7c24..4e3fb10 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,13 @@
+1.18.2 (2016-03-02)
+-------------------
+
+* fix compatibility with OCaml 4.03
+
+1.18.1 (2015-11-03)
+-------------------
+
+* fix compatibility with findlib 1.5.6
+
 1.18 (2015-06-23)
 -----------------
 
diff --git a/Makefile b/Makefile
index 1803495..df0146f 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ setup-dev.exe: _oasis setup.ml
 
 # Setup for the release
 setup.exe: setup.ml
-	ocamlopt.opt -o $@ $< || ocamlopt -o $@ $< || ocamlc -o $@ $<
+	ocamlopt.opt -w -3 -o $@ $< || ocamlopt -w -3 -o $@ $< || ocamlc -w -3 -o $@ $<
 	rm -f setup.cmx setup.cmi setup.o setup.obj setup.cmo
 
 build: $(SETUP) setup.data
diff --git a/_oasis b/_oasis
index 0e6f2ce..cd60120 100644
--- a/_oasis
+++ b/_oasis
@@ -5,7 +5,7 @@
 OASISFormat: 0.4
 OCamlVersion: >= 4.01
 Name: utop
-Version: 1.18.1
+Version: 1.18.2
 LicenseFile: LICENSE
 License: BSD-3-clause
 Authors: Jeremie Dimino
diff --git a/setup.ml b/setup.ml
index b0c664a..6fd47ad 100644
--- a/setup.ml
+++ b/setup.ml
@@ -8,7 +8,7 @@
  *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: b63cfcda8a9eb05c8cac6f914b9e015b) *)
+(* DO NOT EDIT (digest: f6a3a4acb1dc5b9868c84dc2e278b75a) *)
 (*
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -7018,7 +7018,7 @@ let setup_t =
           alpha_features = ["ocamlbuild_more_args"];
           beta_features = [];
           name = "utop";
-          version = "1.18.1";
+          version = "1.18.2";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -7399,8 +7399,7 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
-     oasis_digest =
-       Some "\024\139\006\185$\154\015K\178\015\237\"\149\162s\031";
+     oasis_digest = Some "=\004\228\188\215B\164!\134VF\135\019\176\007\\";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
@@ -7408,7 +7407,7 @@ let setup_t =
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 7405 "setup.ml"
+# 7404 "setup.ml"
 (* OASIS_STOP *)
 
 let search_compiler_libs () =
diff --git a/src/lib/META b/src/lib/META
index 733f208..2119447 100644
--- a/src/lib/META
+++ b/src/lib/META
@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: d5407b28da284a1a240556b9815af7f0)
-version = "1.18.1"
+# DO NOT EDIT (digest: 540f483cd99856ec4b99dfb59598c6c8)
+version = "1.18.2"
 description = "utop configuration"
 requires = "findlib lambda-term"
 archive(byte) = "utop.cma"
@@ -9,7 +9,7 @@ archive(native) = "utop.cmxa"
 archive(native, plugin) = "utop.cmxs"
 exists_if = "utop.cma"
 package "camlp4" (
- version = "1.18.1"
+ version = "1.18.2"
  description = "Camlp4 integration"
  requires = "utop camlp4"
  archive(syntax, preprocessor) = "utop-camlp4.cma"
diff --git a/src/lib/uTop_main.cppo.ml b/src/lib/uTop_main.cppo.ml
index c01cdb0..7baf44c 100644
--- a/src/lib/uTop_main.cppo.ml
+++ b/src/lib/uTop_main.cppo.ml
@@ -298,9 +298,12 @@ let rec map_items unwrap wrap items =
       | Outcometree.Osig_exception (name, _)
 #endif
       | Outcometree.Osig_modtype (name, _)
+#if OCAML_VERSION < (4, 03, 0)
       | Outcometree.Osig_value (name, _, _) ->
         (name, Outcometree.Orec_not)
-#if OCAML_VERSION >= (4, 03, 0)
+#else
+      | Outcometree.Osig_value { oval_name = name; _ } ->
+        (name, Outcometree.Orec_not)
       | Outcometree.Osig_ellipsis -> ("", Outcometree.Orec_not)
 #endif
     in

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/utop.git