Tweak OPAM-related files

Related #301.
ocsigen · Dec 20, 2016 · dfdbb5b · dfdbb5b
1 parent 9125e62
commit dfdbb5b
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 8 deletions.
diff --git a/_oasis b/_oasis
@@ -70,7 +70,7 @@ Flag react
   Default$: flag(all)
 
 Flag glib
-  Description: Glib integration
+  Description: GLib integration
   Default$: flag(all)
 
 Flag ssl
@@ -221,7 +221,7 @@ Library "lwt-glib"
   Modules: Lwt_glib
   CSources: lwt_glib_stubs.c
   BuildDepends: lwt, lwt.unix
-  XMETADescription: Glib integration for Lwt (deprecated; use package lwt_glib)
+  XMETADescription: GLib integration for Lwt (deprecated; use package lwt_glib)
 
 Library "lwt-ssl"
   Build$: flag(ssl) || flag(all)

diff --git a/doc/descr → doc/lwt.descr b/doc/descr → doc/lwt.descr
diff --git a/doc/lwt_glib.descr b/doc/lwt_glib.descr
@@ -0,0 +1 @@
+GLib integration for Lwt
diff --git a/doc/lwt_react.descr b/doc/lwt_react.descr
@@ -0,0 +1 @@
+Helpers for using React with Lwt
diff --git a/doc/lwt_ssl.descr b/doc/lwt_ssl.descr
@@ -0,0 +1 @@
+Lwt-friendly OpenSSL bindings
diff --git a/lwt.opam b/lwt.opam
@@ -8,9 +8,9 @@ authors: [
 ]
 homepage: "https://github.com/ocsigen/lwt"
 doc: "https://ocsigen.org/lwt/manual/"
-dev-repo: "https://github.com/ocsigen/lwt.git"
 bug-reports: "https://github.com/ocsigen/lwt/issues"
 license: "LGPL with OpenSSL linking exception"
+dev-repo: "https://github.com/ocsigen/lwt.git"
 build: [
   [make "setup"]
   ["ocaml" "setup.ml" "-configure"
@@ -36,7 +36,7 @@ depends: [
   "ocamlbuild" {build}
   "result"
   # See https://github.com/ocsigen/lwt/issues/266
-  ( "base-no-ppx" | "ppx_tools" )
+  ( "base-no-ppx" | "ppx_tools" {build} )
   ## OASIS is not required in released version
   "oasis" {build & >= "0.4.7"}
 ]

diff --git a/lwt_glib.opam b/lwt_glib.opam
@@ -17,6 +17,6 @@ remove: [
     ["ocamlfind" "remove" "lwt_glib"]
 ]
 depends: [
-  "lwt" {>= "2.7.0"}
+  "lwt" {(>= "2.7.0" & < "3.0.0") | "dev"}
   "lablgtk"
 ]
diff --git a/lwt_react.opam b/lwt_react.opam
@@ -17,6 +17,6 @@ remove: [
     ["ocamlfind" "remove" "lwt_react"]
 ]
 depends: [
-  "lwt" {>= "2.7.0"}
+  "lwt" {(>= "2.7.0" & < "3.0.0") | "dev"}
   "react" {>= "1.0.0"}
 ]
diff --git a/lwt_ssl.opam b/lwt_ssl.opam
@@ -18,6 +18,6 @@ remove: [
     ["ocamlfind" "remove" "lwt_ssl"]
 ]
 depends: [
-  "lwt" {>= "2.7.0"}
+  "lwt" {(>= "2.7.0" & < "3.0.0") | "dev"}
   "ssl" {>= "0.5.0"}
 ]
diff --git a/src/glib/META b/src/glib/META
@@ -1,3 +1,3 @@
 version = "1.0.0"
-description = "Glib integration for Lwt"
+description = "GLib integration for Lwt"
 requires = "lwt.glib"