Upstream opam files changes made for 0.19.0 (#1725)

* Fix constraints (uses menhir --strategy)
* Add missing constraint (uses Re.Glob)
* Make the license name SPDX-compatible

Author: gpetiot

dune-project

@@ -23,9 +23,6 @@
 
 (maintainers "OCamlFormat Team <[email protected]>")
 
-(license
- "OCamlFormat is distributed under the MIT license. Parts of the OCaml library are vendored for OCamlFormat and distributed under their original LGPL 2.1 license.")
-
 (source
  (github ocaml-ppx/ocamlformat))
 
@@ -50,19 +47,20 @@
   fix
   fpath
   (menhir
-   (>= 20180528))
+   (>= 20201216))
   (menhirLib
-   (>= 20200624))
+   (>= 20201216))
   (menhirSdk
-   (>= 20200624))
+   (>= 20201216))
   ocp-indent
   (bisect_ppx
    (and
     :with-test
     (>= 2.5.0)))
   (odoc-parser
    (>= 0.9.0))
-  re
+  (re
+   (>= 1.7.2))
   (stdio
    (< v0.15))
   (uuseg
@@ -92,19 +90,20 @@
   fix
   fpath
   (menhir
-   (>= 20180528))
+   (>= 20201216))
   (menhirLib
-   (>= 20200624))
+   (>= 20201216))
   (menhirSdk
-   (>= 20200624))
+   (>= 20201216))
   ocp-indent
   (bisect_ppx
    (and
     :with-test
     (>= 2.5.0)))
   (odoc-parser
    (>= 0.9.0))
-  re
+  (re
+   (>= 1.7.2))
   (stdio
    (< v0.15))
   (uuseg

ocamlformat-rpc.opam

@@ -5,8 +5,6 @@ description:
   "OCamlFormat is a tool to automatically format OCaml code in a uniform style. This package defines a RPC interface to OCamlFormat"
 maintainer: ["OCamlFormat Team <[email protected]>"]
 authors: ["Josh Berdine <[email protected]>"]
-license:
-  "OCamlFormat is distributed under the MIT license. Parts of the OCaml library are vendored for OCamlFormat and distributed under their original LGPL 2.1 license."
 homepage: "https://github.com/ocaml-ppx/ocamlformat"
 bug-reports: "https://github.com/ocaml-ppx/ocamlformat/issues"
 depends: [
@@ -20,13 +18,13 @@ depends: [
   "dune-build-info"
   "fix"
   "fpath"
-  "menhir" {>= "20180528"}
-  "menhirLib" {>= "20200624"}
-  "menhirSdk" {>= "20200624"}
+  "menhir" {>= "20201216"}
+  "menhirLib" {>= "20201216"}
+  "menhirSdk" {>= "20201216"}
   "ocp-indent"
   "bisect_ppx" {with-test & >= "2.5.0"}
   "odoc-parser" {>= "0.9.0"}
-  "re"
+  "re" {>= "1.7.2"}
   "stdio" {< "v0.15"}
   "uuseg" {>= "10.0.0"}
   "uutf" {>= "1.0.1"}
@@ -47,3 +45,4 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/ocaml-ppx/ocamlformat.git"
+license: ["MIT" "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"] # OCamlFormat is distributed under the MIT license. Parts of the OCaml library are vendored for OCamlFormat and distributed under their original LGPL 2.1 license

ocamlformat-rpc.opam.template

@@ -0,0 +1 @@
+license: ["MIT" "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"] # OCamlFormat is distributed under the MIT license. Parts of the OCaml library are vendored for OCamlFormat and distributed under their original LGPL 2.1 license

ocamlformat.opam

@@ -5,8 +5,6 @@ description:
   "OCamlFormat is a tool to automatically format OCaml code in a uniform style."
 maintainer: ["OCamlFormat Team <[email protected]>"]
 authors: ["Josh Berdine <[email protected]>"]
-license:
-  "OCamlFormat is distributed under the MIT license. Parts of the OCaml library are vendored for OCamlFormat and distributed under their original LGPL 2.1 license."
 homepage: "https://github.com/ocaml-ppx/ocamlformat"
 bug-reports: "https://github.com/ocaml-ppx/ocamlformat/issues"
 depends: [
@@ -19,13 +17,13 @@ depends: [
   "dune-build-info"
   "fix"
   "fpath"
-  "menhir" {>= "20180528"}
-  "menhirLib" {>= "20200624"}
-  "menhirSdk" {>= "20200624"}
+  "menhir" {>= "20201216"}
+  "menhirLib" {>= "20201216"}
+  "menhirSdk" {>= "20201216"}
   "ocp-indent"
   "bisect_ppx" {with-test & >= "2.5.0"}
   "odoc-parser" {>= "0.9.0"}
-  "re"
+  "re" {>= "1.7.2"}
   "stdio" {< "v0.15"}
   "uuseg" {>= "10.0.0"}
   "uutf" {>= "1.0.1"}
@@ -46,3 +44,4 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/ocaml-ppx/ocamlformat.git"
+license: ["MIT" "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"] # OCamlFormat is distributed under the MIT license. Parts of the OCaml library are vendored for OCamlFormat and distributed under their original LGPL 2.1 license

ocamlformat.opam.template

@@ -0,0 +1 @@
+license: ["MIT" "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"] # OCamlFormat is distributed under the MIT license. Parts of the OCaml library are vendored for OCamlFormat and distributed under their original LGPL 2.1 license