[Pkg-ocaml-maint-commits] [cmdliner] 05/11: Imported Upstream version 0.9.7

Stéphane Glondu glondu at moszumanska.debian.org
Tue Jul 7 09:23:43 UTC 2015


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

glondu pushed a commit to branch master
in repository cmdliner.

commit f035d5a6807abe67ac18260b8415c3bb51959090
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jun 27 19:45:10 2015 +0200

    Imported Upstream version 0.9.7
---
 CHANGES.md            | 7 +++++++
 README.md             | 2 +-
 doc/Cmdliner.Arg.html | 5 ++++-
 doc/Cmdliner.html     | 2 +-
 opam                  | 3 +--
 pkg/META              | 2 +-
 pkg/build.ml          | 3 ++-
 pkg/topkg-ext.ml      | 2 +-
 pkg/topkg.ml          | 2 +-
 src/cmdliner.ml       | 2 +-
 src/cmdliner.mli      | 6 ++++--
 11 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5e12e7c..8dbca09 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,10 @@
+v0.9.7 2015-02-06 La Forclaz (VS)
+---------------------------------
+
+- Build system, don't depend on `ocamlfind`. The package no longer
+  depends on ocamlfind. Thanks to Louis Gesbert for the patch. 
+
+
 v0.9.6 2014-11-18 La Forclaz (VS)
 ---------------------------------
 
diff --git a/README.md b/README.md
index 3d479e5..971340d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 Cmdliner — Declarative definition of command line interfaces for OCaml
 -------------------------------------------------------------------------------
-Release 0.9.6
+Release 0.9.7
 
 Cmdliner is a module for the declarative definition of command line
 interfaces.
diff --git a/doc/Cmdliner.Arg.html b/doc/Cmdliner.Arg.html
index 321340c..32680d2 100644
--- a/doc/Cmdliner.Arg.html
+++ b/doc/Cmdliner.Arg.html
@@ -281,7 +281,10 @@ The type for information about command line arguments.<br>
 
 <pre><span id="VALenum"><span class="keyword">val</span> enum</span> : <code class="type">(string * 'a) list -> 'a <a href="Cmdliner.Arg.html#TYPEconverter">converter</a></code></pre><div class="info ">
 <code class="code">enum l p</code> converts values such that unambiguous prefixes of string names
-      in <code class="code">l</code> map to the corresponding value of type <code class="code"><span class="keywordsign">'</span>a</code>.<br>
+      in <code class="code">l</code> map to the corresponding value of type <code class="code"><span class="keywordsign">'</span>a</code>.
+<p>
+
+      <b>Warning.</b> The type <code class="code"><span class="keywordsign">'</span>a</code> must be comparable with <code class="code"><span class="constructor">Pervasives</span>.compare</code>.<br>
 <b>Raises</b> <code>Invalid_argument</code> if <code class="code">l</code> is empty.<br>
 </div>
 
diff --git a/doc/Cmdliner.html b/doc/Cmdliner.html
index 69ad566..c5a1e3c 100644
--- a/doc/Cmdliner.html
+++ b/doc/Cmdliner.html
@@ -50,7 +50,7 @@ Declarative definition of command line interfaces.
     your scope.
 <p>
 
-    <em>Release 0.9.6 - Daniel Bünzli <daniel.buenzl i at erratique.ch> </em><br>
+    <em>Release 0.9.7 - Daniel Bünzli <daniel.buenzl i at erratique.ch> </em><br>
 </div>
 <hr width="100%">
 <br>
diff --git a/opam b/opam
index 440891a..e4f90d7 100644
--- a/opam
+++ b/opam
@@ -7,8 +7,7 @@ dev-repo: "http://erratique.ch/repos/cmdliner.git"
 bug-reports: "https://github.com/dbuenzli/cmdliner/issues"
 tags: [ "cli" "system" "declarative" "org:erratique" ]
 license: "BSD3"
-depends: ["ocamlfind"]
-available: [ocaml-version >= "3.12.0"]
+available: [ocaml-version >= "4.00.0"]
 build: 
 [
   ["ocaml" "pkg/git.ml" ] 
diff --git a/pkg/META b/pkg/META
index 1ced53d..db91da1 100644
--- a/pkg/META
+++ b/pkg/META
@@ -1,4 +1,4 @@
-version = "0.9.6"
+version = "0.9.7"
 description = "Declarative definition of command line interfaces"
 archive(byte) = "cmdliner.cma"
 archive(byte, plugin) = "cmdliner.cma"
diff --git a/pkg/build.ml b/pkg/build.ml
index 6e3d0c3..28bf52d 100755
--- a/pkg/build.ml
+++ b/pkg/build.ml
@@ -3,7 +3,8 @@
 #use "topkg.ml";;
 
 let () = 
-  Pkg.describe "cmdliner" ~builder:`OCamlbuild [
+  let builder = `Other ("ocamlbuild -classic-display", "_build") in
+  Pkg.describe "cmdliner" ~builder [
     Pkg.lib "pkg/META";
     Pkg.lib ~exts:Exts.module_library "src/cmdliner";
     Pkg.doc "README.md";
diff --git a/pkg/topkg-ext.ml b/pkg/topkg-ext.ml
index 3f5f79c..8c75a2b 100644
--- a/pkg/topkg-ext.ml
+++ b/pkg/topkg-ext.ml
@@ -1,7 +1,7 @@
 (*---------------------------------------------------------------------------
    Copyright (c) 2014 Daniel C. Bünzli. All rights reserved.
    Distributed under the BSD3 license, see license at the end of the file.
-   cmdliner release 0.9.6
+   cmdliner release 0.9.7
   ---------------------------------------------------------------------------*)
 
 let ( >>= ) v f = match v with `Ok v -> f v | `Error _ as e -> e  
diff --git a/pkg/topkg.ml b/pkg/topkg.ml
index 254770f..39c20e8 100644
--- a/pkg/topkg.ml
+++ b/pkg/topkg.ml
@@ -1,7 +1,7 @@
 (*---------------------------------------------------------------------------
    Copyright (c) 2014 Daniel C. Bünzli. All rights reserved.
    Distributed under the BSD3 license, see license at the end of the file.
-   cmdliner release 0.9.6
+   cmdliner release 0.9.7
   ---------------------------------------------------------------------------*)
 
 (* Public api *) 
diff --git a/src/cmdliner.ml b/src/cmdliner.ml
index 90a8ece..e626d7f 100644
--- a/src/cmdliner.ml
+++ b/src/cmdliner.ml
@@ -1,7 +1,7 @@
 (*---------------------------------------------------------------------------
    Copyright (c) 2011 Daniel C. Bünzli. All rights reserved.
    Distributed under a BSD3 license, see license at the end of the file.
-   cmdliner release 0.9.6
+   cmdliner release 0.9.7
   ---------------------------------------------------------------------------*)
 
 (* Invalid_arg strings *)
diff --git a/src/cmdliner.mli b/src/cmdliner.mli
index f4bd1e5..14bbf1a 100644
--- a/src/cmdliner.mli
+++ b/src/cmdliner.mli
@@ -1,7 +1,7 @@
 (*---------------------------------------------------------------------------
    Copyright (c) 2011 Daniel C. Bünzli. All rights reserved.
    Distributed under a BSD3 license, see license at the end of the file.
-   cmdliner release 0.9.6
+   cmdliner release 0.9.7
   ---------------------------------------------------------------------------*)
 
 (** Declarative definition of command line interfaces.
@@ -22,7 +22,7 @@
     use. Open the module to use it, it defines only three modules in
     your scope.
 
-    {e Release 0.9.6 - Daniel Bünzli <daniel.buenzl i\@erratique.ch> } *)
+    {e Release 0.9.7 - Daniel Bünzli <daniel.buenzl i\@erratique.ch> } *)
 
 (** {1:top Interface} *)
 
@@ -425,6 +425,8 @@ module Arg : sig
   (** [enum l p] converts values such that unambiguous prefixes of string names
       in [l] map to the corresponding value of type ['a].
 
+      {b Warning.} The type ['a] must be comparable with {!Pervasives.compare}.
+
       @raise Invalid_argument if [l] is empty. *)
 
   val file : string converter

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



More information about the Pkg-ocaml-maint-commits mailing list