Remove mirage conflicts in conduit metadata (this shoud be in mirage …

…opams)
zoggy · Jun 11, 2015 · e50357a · e50357a
1 parent 21dca46
commit e50357a
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 37 deletions.
diff --git a/packages/conduit/conduit.0.5.0/opam b/packages/conduit/conduit.0.5.0/opam
@@ -16,7 +16,7 @@ depends: [
 depopts: [
   "async"
   "lwt"
-  ("lwt" & "ssl")
+  "ssl"
   "async_ssl"
 ]
 conflicts: [

diff --git a/packages/conduit/conduit.0.5.1/opam b/packages/conduit/conduit.0.5.1/opam
@@ -16,13 +16,12 @@ depends: [
 depopts: [
   "async"
   "lwt"
-  ("lwt" & "ssl")
+  "ssl"
   "async_ssl"
 ]
 conflicts: [
   "async" {<"109.15.00"}
   "lwt" {<"2.4.3"}
-  "async_ssl" {<"111.21.00"}
-  "async_ssl" {>="112.24.00"}
+  "async_ssl" {<"111.21.00" & >="112.24.00"}
 ]
 ocaml-version: [>="4.00.0"]
diff --git a/packages/conduit/conduit.0.6.0/opam b/packages/conduit/conduit.0.6.0/opam
@@ -21,15 +21,17 @@ depends: [
 depopts: [
   "async"
   "lwt"
-  ("lwt" & "ssl")
+  "ssl"
   "async_ssl"
-  ("mirage-types" & "dns" & "tcpip" & "vchan")
+  "mirage-types"
+  "dns"
+  "tcpip"
+  "vchan"
 ]
 conflicts: [
   "async" {<"109.15.00"}
   "lwt" {<"2.4.4"}
-  "async_ssl" {<"111.21.00"}
-  "async_ssl" {>="112.24.00"}
+  "async_ssl" {<"111.21.00" & >="112.24.00"}
   "mirage-types" {<"2.0.0"}
   "dns" {<"0.10.0"}
 ]

diff --git a/packages/conduit/conduit.0.6.1/opam b/packages/conduit/conduit.0.6.1/opam
@@ -21,17 +21,18 @@ depends: [
 depopts: [
   "async"
   "lwt"
-  ("lwt" & "ssl")
+  "ssl"
   "async_ssl"
-  ("mirage-types" & "dns" & "tcpip" & "vchan")
+  "mirage-types"
+  "dns"
+  "tcpip"
+  "vchan"
 ]
 conflicts: [
   "async" {<"109.15.00"}
   "lwt" {<"2.4.4"}
-  "async_ssl" {<"111.21.00"}
-  "async_ssl" {>="112.24.00"}
-  "mirage-types" {<"2.0.0"}
-  "mirage-types" {>="2.3.0"}
+  "async_ssl" {<"111.21.00" & >="112.24.00"}
+  "mirage-types" {<"2.0.0" & >="2.3.0"}
   "dns" {<"0.10.0"}
 ]
 ocaml-version: [>="4.01.0"]
diff --git a/packages/conduit/conduit.0.7.0/opam b/packages/conduit/conduit.0.7.0/opam
@@ -29,12 +29,10 @@ depopts: [
 conflicts: [
   "async" {<"109.15.00"}
   "lwt" {<"2.4.4"}
-  "async_ssl" {<"111.21.00"}
-  "async_ssl" {>="112.24.00"}
+  "async_ssl" {<"111.21.00" & >="112.24.00"}
   "mirage-types" {<"2.0.0"}
   "dns" {<"0.10.0"}
-  "tls" {<"0.2.0"}
-  "tls" {>="0.4.0"}
+  "tls" {<"0.2.0" & >="0.4.0"}
   "vchan" {<"2.0.0"}
 ]
 available: [ocaml-version >= "4.01.0"]
diff --git a/packages/conduit/conduit.0.7.1/opam b/packages/conduit/conduit.0.7.1/opam
@@ -29,12 +29,10 @@ depopts: [
 conflicts: [
   "async" {<"109.15.00"}
   "lwt" {<"2.4.4"}
-  "async_ssl" {<"111.21.00"}
-  "async_ssl" {>="112.24.00"}
+  "async_ssl" {<"111.21.00" & >="112.24.00"}
   "mirage-types" {<"2.0.0"}
   "dns" {<"0.10.0"}
-  "tls" {<"0.2.0"}
-  "tls" {>="0.4.0"}
+  "tls" {<"0.2.0" & >="0.4.0"}
   "vchan" {<"2.0.0"}
 ]
 available: [ocaml-version >= "4.01.0"]
diff --git a/packages/conduit/conduit.0.7.2/opam b/packages/conduit/conduit.0.7.2/opam
@@ -29,13 +29,10 @@ depopts: [
 conflicts: [
   "async" {<"109.15.00"}
   "lwt" {<"2.4.4"}
-  "async_ssl" {<"111.21.00"}
-  "async_ssl" {>="112.24.00"}
+  "async_ssl" {<"111.21.00" & >="112.24.00"}
   "mirage-types" {<"2.0.0"}
-  "mirage" {>="2.4.0"}
   "dns" {<"0.10.0"}
-  "tls" {<"0.2.0"}
-  "tls" {>="0.4.0"}
+  "tls" {<"0.2.0" & >="0.4.0"}
   "vchan" {<"2.0.0"}
 ]
 available: [ocaml-version >= "4.01.0"]
diff --git a/packages/conduit/conduit.0.8.0/opam b/packages/conduit/conduit.0.8.0/opam
@@ -32,11 +32,8 @@ conflicts: [
   "lwt" {<"2.4.4"}
   "async_ssl" {>= "112.24.00"}
   "mirage-types" {<"2.0.0"}
-  "mirage" {<"2.4.0"}
-  "mirage" {>"2.4.0"}
   "dns" {<"0.10.0"}
-  "tls" {<"0.4.0"}
-  "tls" {>="0.5.0"}
+  "tls" {<"0.4.0" & >="0.5.0"}
   "vchan" {<"2.0.0"}
 ]
 available: [ocaml-version >= "4.01.0"]
diff --git a/packages/conduit/conduit.0.8.1/opam b/packages/conduit/conduit.0.8.1/opam
@@ -32,8 +32,7 @@ conflicts: [
   "async_ssl" {<"112.24.00"}
   "mirage-types" {<"2.0.0"}
   "dns" {<"0.10.0"}
-  "tls" {<"0.4.0"}
-  "tls" {>="0.5.0"}
+  "tls" {<"0.4.0" & >="0.5.0"}
   "vchan" {<"2.0.0"}
 ]
 available: [ocaml-version >= "4.01.0"]
diff --git a/packages/conduit/conduit.0.8.2/opam b/packages/conduit/conduit.0.8.2/opam
@@ -31,11 +31,8 @@ conflicts: [
   "lwt" {<"2.4.4"}
   "async_ssl" {<"112.24.00"}
   "mirage-types" {<"2.0.0"}
-  "mirage" {<"2.4.0"}
-  "mirage" {>"2.4.0"}
   "dns" {<"0.10.0"}
-  "tls" {<"0.4.0"}
-  "tls" {>="0.5.0"}
+  "tls" {<"0.4.0" & >="0.5.0"}
   "vchan" {<"2.0.0"}
 ]
 available: [ocaml-version >= "4.01.0"]