From 4c32305f246d63d2b0568225690311f68bcd8e43 Mon Sep 17 00:00:00 2001 From: Spiros Eliopoulos Date: Mon, 27 Jun 2016 15:05:11 -0400 Subject: [PATCH] release: backport cohttp version constraint to 0.3 --- _oasis | 4 ++-- lib/META | 4 ++-- opam/opam | 4 ++-- setup.ml | 14 +++++++++----- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/_oasis b/_oasis index 38e32df..ab69072 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.4 Name: webmachine -Version: 0.3.1 +Version: 0.3.2 Synopsis: A REST toolkit for OCaml Description: OCaml webmachine is a layer on top of cohttp that implements a state-machine-based HTTP request processor. It's particularly well-suited for @@ -23,7 +23,7 @@ Library webmachine Path: lib InternalModules: Wm_util Modules: Webmachine - BuildDepends: cohttp (>= 0.12.0), dispatch (>= 0.3.0), re (>= 1.3.0), re.str + BuildDepends: cohttp (>= 0.12.0 && < 0.21.0), dispatch (>= 0.3.0), re (>= 1.3.0), re.str Document webmachine Title: webmachine docs diff --git a/lib/META b/lib/META index 66813a6..687bfbe 100644 --- a/lib/META +++ b/lib/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: f84d298794c839217704aa7fae6c5950) -version = "0.3.1" +# DO NOT EDIT (digest: c4e0a609f3439c4859658a2d9b47d954) +version = "0.3.2" description = "A REST toolkit for OCaml" requires = "cohttp dispatch re re.str" archive(byte) = "webmachine.cma" diff --git a/opam/opam b/opam/opam index b38a585..4fce016 100644 --- a/opam/opam +++ b/opam/opam @@ -1,6 +1,6 @@ opam-version: "1.2" name: "webmachine" -version: "0.3.1" +version: "0.3.2" maintainer: "Spiros Eliopoulos " authors: [ "Spiros Eliopoulos " ] license: "BSD-3-clause" @@ -22,7 +22,7 @@ build-test: [ ] build-doc: [ "ocaml" "setup.ml" "-doc" ] depends: [ - "cohttp" {>= "0.12.0"} + "cohttp" {>= "0.12.0" & < "0.21.0"} "dispatch" {>= "0.3.0"} "ocamlfind" {build} "ounit" {test & >= "1.0.2"} diff --git a/setup.ml b/setup.ml index d9edf43..2e6a1a1 100644 --- a/setup.ml +++ b/setup.ml @@ -1,7 +1,7 @@ (* setup.ml generated for the first time by OASIS v0.4.5 *) (* OASIS_START *) -(* DO NOT EDIT (digest: 9df34bc7cffb681af6f107a41edb845f) *) +(* DO NOT EDIT (digest: ea1890c43fabbffc3b9a9a89907f17c5) *) (* Regenerated by OASIS v0.4.5 Visit http://oasis.forge.ocamlcore.org for more information and @@ -6891,7 +6891,7 @@ let setup_t = alpha_features = []; beta_features = []; name = "webmachine"; - version = "0.3.1"; + version = "0.3.2"; license = OASISLicense.DEP5License (OASISLicense.DEP5Unit @@ -6974,7 +6974,10 @@ let setup_t = [ FindlibPackage ("cohttp", - Some (OASISVersion.VGreaterEqual "0.12.0")); + Some + (OASISVersion.VAnd + (OASISVersion.VGreaterEqual "0.12.0", + OASISVersion.VLesser "0.21.0"))); FindlibPackage ("dispatch", Some (OASISVersion.VGreaterEqual "0.3.0")); @@ -7278,7 +7281,8 @@ let setup_t = }; oasis_fn = Some "_oasis"; oasis_version = "0.4.5"; - oasis_digest = Some "\011I\224 \2359|x[M\211a\207\022e\002"; + oasis_digest = + Some "\251\188\133\133\002T\019\253\b\241\204\n\225P\255\023"; oasis_exec = None; oasis_setup_args = []; setup_update = false @@ -7286,6 +7290,6 @@ let setup_t = let setup () = BaseSetup.setup setup_t;; -# 7290 "setup.ml" +# 7294 "setup.ml" (* OASIS_STOP *) let () = setup ();;