Merge pull request #28601 from kit-ty-kate/opam-cmdliner-2

mseri · web-flow · commit ec0dc125adb3 · 2025-09-26T23:45:21.000+02:00
opam-*: Add missing upper-bound constraints on cmdliner 2.0.0
diff --git a/packages/opam-client/opam-client.2.4.0/opam b/packages/opam-client/opam-client.2.4.0/opam
@@ -27,7 +27,7 @@ depends: [
   "base64" {>= "3.1.0"}
   "opam-repository" {= version}
   "re" {>= "1.10.0"}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "1.1.0" & < "2.0.0"}
   "dune" {>= "2.8.0"}
 ]
 conflicts: [
diff --git a/packages/opam-client/opam-client.2.4.0~alpha1/opam b/packages/opam-client/opam-client.2.4.0~alpha1/opam
@@ -27,7 +27,7 @@ depends: [
   "base64" {>= "3.1.0"}
   "opam-repository" {= version}
   "re" {>= "1.10.0"}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "1.1.0" & < "2.0.0"}
   "dune" {>= "2.8.0"}
 ]
 conflicts: [
diff --git a/packages/opam-client/opam-client.2.4.0~alpha2/opam b/packages/opam-client/opam-client.2.4.0~alpha2/opam
@@ -27,7 +27,7 @@ depends: [
   "base64" {>= "3.1.0"}
   "opam-repository" {= version}
   "re" {>= "1.10.0"}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "1.1.0" & < "2.0.0"}
   "dune" {>= "2.8.0"}
 ]
 conflicts: [
diff --git a/packages/opam-client/opam-client.2.4.0~beta1/opam b/packages/opam-client/opam-client.2.4.0~beta1/opam
@@ -27,7 +27,7 @@ depends: [
   "base64" {>= "3.1.0"}
   "opam-repository" {= version}
   "re" {>= "1.10.0"}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "1.1.0" & < "2.0.0"}
   "dune" {>= "2.8.0"}
 ]
 conflicts: [
diff --git a/packages/opam-client/opam-client.2.4.0~rc1/opam b/packages/opam-client/opam-client.2.4.0~rc1/opam
@@ -27,7 +27,7 @@ depends: [
   "base64" {>= "3.1.0"}
   "opam-repository" {= version}
   "re" {>= "1.10.0"}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "1.1.0" & < "2.0.0"}
   "dune" {>= "2.8.0"}
 ]
 conflicts: [
diff --git a/packages/opam-client/opam-client.2.4.1/opam b/packages/opam-client/opam-client.2.4.1/opam
@@ -27,7 +27,7 @@ depends: [
   "base64" {>= "3.1.0"}
   "opam-repository" {= version}
   "re" {>= "1.10.0"}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "1.1.0" & < "2.0.0"}
   "dune" {>= "2.8.0"}
 ]
 conflicts: [
diff --git a/packages/opam-depext/opam-depext.1.2.1-1/opam b/packages/opam-depext/opam-depext.1.2.1-1/opam
@@ -19,7 +19,7 @@ bug-reports: "https://github.com/ocaml/opam-depext/issues"
 depends: [
   "ocaml" {>= "4.00"}
   "base-unix"
-  "cmdliner" {>= "0.9.8" & dev}
+  "cmdliner" {dev & >= "0.9.8" & < "2.0.0"}
   "ocamlfind" {dev}
 ]
 depopts: "ocaml-option-bytecode-only"
diff --git a/packages/opam-depext/opam-depext.1.2.1/opam b/packages/opam-depext/opam-depext.1.2.1/opam
@@ -19,7 +19,7 @@ bug-reports: "https://github.com/ocaml/opam-depext/issues"
 depends: [
   "ocaml" {>= "4.00"}
   "base-unix"
-  "cmdliner" {>= "0.9.8" & dev}
+  "cmdliner" {dev & >= "0.9.8" & < "2.0.0"}
   "ocamlfind" {dev}
 ]
 available: opam-version >= "2.0.0~beta5" & os != "win32"
diff --git a/packages/opam-depext/opam-depext.1.2.3/opam b/packages/opam-depext/opam-depext.1.2.3/opam
@@ -19,7 +19,7 @@ bug-reports: "https://github.com/ocaml/opam-depext/issues"
 depends: [
   "ocaml" {>= "4.00"}
   "base-unix"
-  "cmdliner" {>= "0.9.8" & dev}
+  "cmdliner" {dev & >= "0.9.8" & < "2.0.0"}
   "ocamlfind" {dev}
 ]
 available: opam-version >= "2.0.0~beta5" & os != "win32"
diff --git a/packages/opam-devel/opam-devel.2.0.0/opam b/packages/opam-devel/opam-devel.2.0.0/opam
@@ -23,7 +23,7 @@ build: [
 depends: [
   "ocaml" {>= "4.02.3"}
   "opam-client" {= "2.0.0"}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "jbuilder" {>= "1.0+beta20"}
 ]
 post-messages: [
diff --git a/packages/opam-devel/opam-devel.2.0.1/opam b/packages/opam-devel/opam-devel.2.0.1/opam
@@ -18,7 +18,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.02.3"}
   "opam-client" {= "2.0.1"}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "jbuilder" {>= "1.0+beta20"}
 ]
 build: [
diff --git a/packages/opam-devel/opam-devel.2.0.10/opam b/packages/opam-devel/opam-devel.2.0.10/opam
@@ -21,7 +21,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.02.3"}
   "opam-client" {= version}
-  "cmdliner" {>= "1.0.0"}
+  "cmdliner" {>= "1.0.0" & < "2.0.0"}
   "dune" {>= "1.2.1"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
diff --git a/packages/opam-devel/opam-devel.2.0.2/opam b/packages/opam-devel/opam-devel.2.0.2/opam
@@ -18,7 +18,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.02.3"}
   "opam-client" {= "2.0.2"}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "dune" {>= "1.2.1"}
 ]
 build: [
diff --git a/packages/opam-devel/opam-devel.2.0.3/opam b/packages/opam-devel/opam-devel.2.0.3/opam
@@ -18,7 +18,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.02.3"}
   "opam-client" {= "2.0.3"}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "dune" {>= "1.2.1"}
 ]
 build: [
diff --git a/packages/opam-devel/opam-devel.2.0.4/opam b/packages/opam-devel/opam-devel.2.0.4/opam
@@ -18,7 +18,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.02.3"}
   "opam-client" {= "2.0.4"}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "dune" {>= "1.2.1"}
 ]
 build: [
diff --git a/packages/opam-devel/opam-devel.2.0.5/opam b/packages/opam-devel/opam-devel.2.0.5/opam
@@ -18,7 +18,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.02.3"}
   "opam-client" {= "2.0.5"}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "dune" {>= "1.2.1"}
 ]
 build: [
diff --git a/packages/opam-devel/opam-devel.2.0.6/opam b/packages/opam-devel/opam-devel.2.0.6/opam
@@ -18,7 +18,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.02.3"}
   "opam-client" {= "2.0.6"}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "dune" {>= "1.2.1"}
 ]
 build: [
diff --git a/packages/opam-devel/opam-devel.2.0.7/opam b/packages/opam-devel/opam-devel.2.0.7/opam
@@ -18,7 +18,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.02.3"}
   "opam-client" {= version}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "dune" {>= "1.2.1"}
 ]
 build: [
diff --git a/packages/opam-devel/opam-devel.2.0.8/opam b/packages/opam-devel/opam-devel.2.0.8/opam
@@ -21,7 +21,7 @@ license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 depends: [
   "ocaml" {>= "4.02.3"}
   "opam-client" {= version}
-  "cmdliner" {>= "1.0.0"}
+  "cmdliner" {>= "1.0.0" & < "2.0.0"}
   "dune" {>= "1.2.1"}
 ]
 build: [
diff --git a/packages/opam-devel/opam-devel.2.0.9/opam b/packages/opam-devel/opam-devel.2.0.9/opam
@@ -21,7 +21,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.02.3"}
   "opam-client" {= version}
-  "cmdliner" {>= "1.0.0"}
+  "cmdliner" {>= "1.0.0" & < "2.0.0"}
   "dune" {>= "1.2.1"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
diff --git a/packages/opam-devel/opam-devel.2.1.0/opam b/packages/opam-devel/opam-devel.2.1.0/opam
@@ -21,7 +21,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.02.3"}
   "opam-client" {= version}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "dune" {>= "1.11.0"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
diff --git a/packages/opam-devel/opam-devel.2.1.1/opam b/packages/opam-devel/opam-devel.2.1.1/opam
@@ -21,7 +21,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.02.3"}
   "opam-client" {= version}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "dune" {>= "1.11.0"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
diff --git a/packages/opam-devel/opam-devel.2.1.2/opam b/packages/opam-devel/opam-devel.2.1.2/opam
@@ -27,7 +27,7 @@ build: [
 depends: [
   "ocaml" {>= "4.02.3"}
   "opam-client" {= version}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "dune" {>= "1.11.0"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
diff --git a/packages/opam-devel/opam-devel.2.1.3/opam b/packages/opam-devel/opam-devel.2.1.3/opam
@@ -21,7 +21,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.02.3"}
   "opam-client" {= version}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "dune" {>= "1.11.0"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
diff --git a/packages/opam-devel/opam-devel.2.1.4/opam b/packages/opam-devel/opam-devel.2.1.4/opam
@@ -21,7 +21,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.02.3"}
   "opam-client" {= version}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "dune" {>= "1.11.0"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
diff --git a/packages/opam-devel/opam-devel.2.1.5/opam b/packages/opam-devel/opam-devel.2.1.5/opam
@@ -21,7 +21,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.02.3"}
   "opam-client" {= version}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "dune" {>= "1.11.0"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
diff --git a/packages/opam-devel/opam-devel.2.1.6/opam b/packages/opam-devel/opam-devel.2.1.6/opam
@@ -21,7 +21,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.02.3"}
   "opam-client" {= version}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "dune" {>= "1.11.0"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
diff --git a/packages/opam-devel/opam-devel.2.2.0/opam b/packages/opam-devel/opam-devel.2.2.0/opam
@@ -23,7 +23,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
   "opam-client" {= version}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "1.1.0" & < "2.0.0"}
   "dune" {>= "2.0.0"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
diff --git a/packages/opam-devel/opam-devel.2.2.1/opam b/packages/opam-devel/opam-devel.2.2.1/opam
@@ -23,7 +23,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
   "opam-client" {= version}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "1.1.0" & < "2.0.0"}
   "dune" {>= "2.0.0"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
diff --git a/packages/opam-devel/opam-devel.2.3.0/opam b/packages/opam-devel/opam-devel.2.3.0/opam
@@ -23,7 +23,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
   "opam-client" {= version}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "1.1.0" & < "2.0.0"}
   "dune" {>= "2.8.0"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
diff --git a/packages/opam-devel/opam-devel.2.4.0/opam b/packages/opam-devel/opam-devel.2.4.0/opam
@@ -23,7 +23,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
   "opam-client" {= version}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "1.1.0" & < "2.0.0"}
   "dune" {>= "2.8.0"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
diff --git a/packages/opam-devel/opam-devel.2.4.0~alpha1/opam b/packages/opam-devel/opam-devel.2.4.0~alpha1/opam
@@ -23,7 +23,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
   "opam-client" {= version}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "1.1.0" & < "2.0.0"}
   "dune" {>= "2.8.0"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
diff --git a/packages/opam-devel/opam-devel.2.4.0~alpha2/opam b/packages/opam-devel/opam-devel.2.4.0~alpha2/opam
@@ -23,7 +23,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
   "opam-client" {= version}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "1.1.0" & < "2.0.0"}
   "dune" {>= "2.8.0"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
diff --git a/packages/opam-devel/opam-devel.2.4.0~beta1/opam b/packages/opam-devel/opam-devel.2.4.0~beta1/opam
@@ -23,7 +23,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
   "opam-client" {= version}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "1.1.0" & < "2.0.0"}
   "dune" {>= "2.8.0"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
diff --git a/packages/opam-devel/opam-devel.2.4.0~rc1/opam b/packages/opam-devel/opam-devel.2.4.0~rc1/opam
@@ -23,7 +23,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
   "opam-client" {= version}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "1.1.0" & < "2.0.0"}
   "dune" {>= "2.8.0"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
diff --git a/packages/opam-devel/opam-devel.2.4.1/opam b/packages/opam-devel/opam-devel.2.4.1/opam
@@ -23,7 +23,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
   "opam-client" {= version}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "1.1.0" & < "2.0.0"}
   "dune" {>= "2.8.0"}
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
diff --git a/packages/opam-installer/opam-installer.2.4.0/opam b/packages/opam-installer/opam-installer.2.4.0/opam
@@ -25,7 +25,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
   "opam-format" {= version}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "dune" {>= "2.8.0"}
 ]
 build: [
diff --git a/packages/opam-installer/opam-installer.2.4.0~alpha1/opam b/packages/opam-installer/opam-installer.2.4.0~alpha1/opam
@@ -25,7 +25,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
   "opam-format" {= version}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "dune" {>= "2.8.0"}
 ]
 available: opam-version >= "2.1.0"
diff --git a/packages/opam-installer/opam-installer.2.4.0~alpha2/opam b/packages/opam-installer/opam-installer.2.4.0~alpha2/opam
@@ -25,7 +25,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
   "opam-format" {= version}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "dune" {>= "2.8.0"}
 ]
 available: opam-version >= "2.1.0"
diff --git a/packages/opam-installer/opam-installer.2.4.0~beta1/opam b/packages/opam-installer/opam-installer.2.4.0~beta1/opam
@@ -25,7 +25,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
   "opam-format" {= version}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "dune" {>= "2.8.0"}
 ]
 available: opam-version >= "2.1.0"
diff --git a/packages/opam-installer/opam-installer.2.4.0~rc1/opam b/packages/opam-installer/opam-installer.2.4.0~rc1/opam
@@ -25,7 +25,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
   "opam-format" {= version}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "dune" {>= "2.8.0"}
 ]
 available: opam-version >= "2.1.0"
diff --git a/packages/opam-installer/opam-installer.2.4.1/opam b/packages/opam-installer/opam-installer.2.4.1/opam
@@ -25,7 +25,7 @@ bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
   "opam-format" {= version}
-  "cmdliner" {>= "0.9.8"}
+  "cmdliner" {>= "0.9.8" & < "2.0.0"}
   "dune" {>= "2.8.0"}
 ]
 build: [
diff --git a/packages/opam-lib/opam-lib.1.3.1/opam b/packages/opam-lib/opam-lib.1.3.1/opam
@@ -21,7 +21,7 @@ build: [
 depends: [
   "ocaml"
   "ocamlgraph" {< "2.0.0"}
-  "cmdliner"
+  "cmdliner" {< "2.0.0"}
   "dose3" {>= "5.0" & < "6.0"}
   "cudf"
   "re" {>= "1.2.0"}
diff --git a/packages/opam-publish/opam-publish.0.3.5/opam b/packages/opam-publish/opam-publish.0.3.5/opam
@@ -14,7 +14,7 @@ depends: [
   "ocaml"
   "opam-lib" {build & > "1.2.2"}
   "ocamlfind" {build}
-  "cmdliner" {build}
+  "cmdliner" {build & < "2.0.0"}
   ("ssl" | "tls" {< "1.0.0"})
   ("github" {build & >= "2.0.0" & < "3.0.0"} |
    "github-unix" {build & >= "3.0.0" & < "4.3.0"})
diff --git a/packages/opam-publish/opam-publish.2.0.0/opam b/packages/opam-publish/opam-publish.2.0.0/opam
diff --git a/packages/opam-publish/opam-publish.2.0.1/opam b/packages/opam-publish/opam-publish.2.0.1/opam
diff --git a/packages/opam-publish/opam-publish.2.0.2/opam b/packages/opam-publish/opam-publish.2.0.2/opam
diff --git a/packages/opam-publish/opam-publish.2.0.3/opam b/packages/opam-publish/opam-publish.2.0.3/opam
diff --git a/packages/opam-publish/opam-publish.2.1.0/opam b/packages/opam-publish/opam-publish.2.1.0/opam
diff --git a/packages/opam-publish/opam-publish.2.2.0/opam b/packages/opam-publish/opam-publish.2.2.0/opam
diff --git a/packages/opam-publish/opam-publish.2.3.0/opam b/packages/opam-publish/opam-publish.2.3.0/opam
diff --git a/packages/opam-publish/opam-publish.2.3.1/opam b/packages/opam-publish/opam-publish.2.3.1/opam
diff --git a/packages/opam-publish/opam-publish.2.4.0/opam b/packages/opam-publish/opam-publish.2.4.0/opam
diff --git a/packages/opam-publish/opam-publish.2.5.0/opam b/packages/opam-publish/opam-publish.2.5.0/opam
diff --git a/packages/opam-publish/opam-publish.2.5.1/opam b/packages/opam-publish/opam-publish.2.5.1/opam
diff --git a/packages/opam-publish/opam-publish.2.6.0/opam b/packages/opam-publish/opam-publish.2.6.0/opam

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ depends: [`
`27`	`27`	`"base64" {>= "3.1.0"}`
`28`	`28`	`"opam-repository" {= version}`
`29`	`29`	`"re" {>= "1.10.0"}`
`30`		`- "cmdliner" {>= "1.1.0"}`
	`30`	`+ "cmdliner" {>= "1.1.0" & < "2.0.0"}`
`31`	`31`	`"dune" {>= "2.8.0"}`
`32`	`32`	`]`
`33`	`33`	`conflicts: [`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ bug-reports: "https://github.com/ocaml/opam-depext/issues"`
`19`	`19`	`depends: [`
`20`	`20`	`"ocaml" {>= "4.00"}`
`21`	`21`	`"base-unix"`
`22`		`- "cmdliner" {>= "0.9.8" & dev}`
	`22`	`+ "cmdliner" {dev & >= "0.9.8" & < "2.0.0"}`
`23`	`23`	`"ocamlfind" {dev}`
`24`	`24`	`]`
`25`	`25`	`depopts: "ocaml-option-bytecode-only"`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ build: [`
`23`	`23`	`depends: [`
`24`	`24`	`"ocaml" {>= "4.02.3"}`
`25`	`25`	`"opam-client" {= "2.0.0"}`
`26`		`- "cmdliner" {>= "0.9.8"}`
	`26`	`+ "cmdliner" {>= "0.9.8" & < "2.0.0"}`
`27`	`27`	`"jbuilder" {>= "1.0+beta20"}`
`28`	`28`	`]`
`29`	`29`	`post-messages: [`