From 75f86cb67d3b274b0e6b2ee9621a61fc3ae41b2f Mon Sep 17 00:00:00 2001 From: Raja Boujbel Date: Wed, 10 Jul 2019 15:49:09 +0200 Subject: [PATCH 1/2] Bump version to 2.0.5 --- configure.ac | 2 +- opam-client.opam | 6 +++--- opam-core.opam | 2 +- opam-devel.opam | 4 ++-- opam-format.opam | 4 ++-- opam-installer.opam | 4 ++-- opam-repository.opam | 4 ++-- opam-solver.opam | 4 ++-- opam-state.opam | 4 ++-- shell/bundle.sh | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index c4a64668c0d..29762b4f1c8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl The line below must be formatted AC_INIT(opam,VERSION) with no extra spaces -AC_INIT(opam,2.0.4) +AC_INIT(opam,2.0.5) AC_COPYRIGHT(Copyright 2012-2017 OcamlPro SAS) AC_CONFIG_MACRO_DIR([m4]) diff --git a/opam-client.opam b/opam-client.opam index 8065a2141eb..4954cbe131d 100644 --- a/opam-client.opam +++ b/opam-client.opam @@ -1,5 +1,5 @@ opam-version: "1.2" -version: "2.0.4" +version: "2.0.5" maintainer: "opam-devel@lists.ocaml.org" authors: [ "Vincent Bernardoff " @@ -21,8 +21,8 @@ build: [ [make "%{name}%.install"] ] depends: [ - "opam-state" {= "2.0.4"} - "opam-solver" {= "2.0.4"} + "opam-state" {= "2.0.5"} + "opam-solver" {= "2.0.5"} "re" {>= "1.7.2"} "cmdliner" {>= "0.9.8"} "dune" {build & >= "1.2.1"} diff --git a/opam-core.opam b/opam-core.opam index 22a831d0f83..8bae34602a0 100644 --- a/opam-core.opam +++ b/opam-core.opam @@ -1,5 +1,5 @@ opam-version: "1.2" -version: "2.0.4" +version: "2.0.5" maintainer: "opam-devel@lists.ocaml.org" authors: [ "Vincent Bernardoff " diff --git a/opam-devel.opam b/opam-devel.opam index 5be27acfc1f..d6fdd521bbf 100644 --- a/opam-devel.opam +++ b/opam-devel.opam @@ -1,5 +1,5 @@ opam-version: "1.2" -version: "2.0.4" +version: "2.0.5" maintainer: "opam-devel@lists.ocaml.org" authors: [ "Vincent Bernardoff " @@ -22,7 +22,7 @@ build: [ ] build-test: [make "tests"] depends: [ - "opam-client" {= "2.0.4"} + "opam-client" {= "2.0.5"} "cmdliner" {>= "0.9.8"} "dune" {build & >= "1.2.1"} ] diff --git a/opam-format.opam b/opam-format.opam index 9772470dd98..78a58cda881 100644 --- a/opam-format.opam +++ b/opam-format.opam @@ -1,5 +1,5 @@ opam-version: "1.2" -version: "2.0.4" +version: "2.0.5" maintainer: "opam-devel@lists.ocaml.org" authors: [ "Vincent Bernardoff " @@ -21,7 +21,7 @@ build: [ [make "%{name}%.install"] ] depends: [ - "opam-core" {= "2.0.4"} + "opam-core" {= "2.0.5"} "opam-file-format" {>= "2.0.0~rc2"} "dune" {build & >= "1.2.1"} ] diff --git a/opam-installer.opam b/opam-installer.opam index e07352ccd67..6acba2782c4 100644 --- a/opam-installer.opam +++ b/opam-installer.opam @@ -1,5 +1,5 @@ opam-version: "1.2" -version: "2.0.4" +version: "2.0.5" maintainer: "opam-devel@lists.ocaml.org" authors: [ "Vincent Bernardoff " @@ -21,7 +21,7 @@ build: [ [make "%{name}%.install"] ] depends: [ - "opam-format" {= "2.0.4"} + "opam-format" {= "2.0.5"} "cmdliner" {>= "0.9.8"} "dune" {build & >= "1.2.1"} ] diff --git a/opam-repository.opam b/opam-repository.opam index 0122dde5b55..459fb04749e 100644 --- a/opam-repository.opam +++ b/opam-repository.opam @@ -1,5 +1,5 @@ opam-version: "1.2" -version: "2.0.4" +version: "2.0.5" maintainer: "opam-devel@lists.ocaml.org" authors: [ "Vincent Bernardoff " @@ -21,7 +21,7 @@ build: [ [make "%{name}%.install"] ] depends: [ - "opam-format" {= "2.0.4"} + "opam-format" {= "2.0.5"} "dune" {build & >= "1.2.1"} ] available: ocaml-version >= "4.02.3" diff --git a/opam-solver.opam b/opam-solver.opam index a7bef8baf1e..7df9e78bb81 100644 --- a/opam-solver.opam +++ b/opam-solver.opam @@ -1,5 +1,5 @@ opam-version: "1.2" -version: "2.0.4" +version: "2.0.5" maintainer: "opam-devel@lists.ocaml.org" authors: [ "Vincent Bernardoff " @@ -21,7 +21,7 @@ build: [ [make "%{name}%.install"] ] depends: [ - "opam-format" {= "2.0.4"} + "opam-format" {= "2.0.5"} "mccs" {>= "1.1+9"} "dose3" {>= "5"} "cudf" {>= "0.7"} diff --git a/opam-state.opam b/opam-state.opam index ac41ad9e767..4a9163a8b71 100644 --- a/opam-state.opam +++ b/opam-state.opam @@ -1,5 +1,5 @@ opam-version: "1.2" -version: "2.0.4" +version: "2.0.5" maintainer: "opam-devel@lists.ocaml.org" authors: [ "Vincent Bernardoff " @@ -21,7 +21,7 @@ build: [ [make "%{name}%.install"] ] depends: [ - "opam-repository" {= "2.0.4"} + "opam-repository" {= "2.0.5"} "dune" {build & >= "1.2.1"} ] available: ocaml-version >= "4.02.3" diff --git a/shell/bundle.sh b/shell/bundle.sh index b390a1e077b..48902fb9676 100755 --- a/shell/bundle.sh +++ b/shell/bundle.sh @@ -2,7 +2,7 @@ set -ue OCAMLV=4.04.1 -OPAMV=2.0.4 +OPAMV=2.0.5 OPAM_REPO=https://opam.ocaml.org/2.0 DEBUG= MAKESELF= From 7b42b99f94847f27875895307aa0a6a10621bdfa Mon Sep 17 00:00:00 2001 From: Raja Boujbel Date: Wed, 10 Jul 2019 15:57:05 +0200 Subject: [PATCH 2/2] typo changes --- CHANGES | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 283132166d2..83d68149540 100644 --- a/CHANGES +++ b/CHANGES @@ -10,8 +10,8 @@ are not marked). * Read jobs variable from OpamStateConfig [#3916 @dra27] * Linting: * add check upstream option [#3758 @rjbou] - * add warning for with-test in run-test field [#3765, #3860 @rjbou] - * fix misleading `doc` filter warning [#3871 @rjbou] + * add warning for with-test in run-test field [#3765, #3860 @rjbou] + * fix misleading `doc` filter warning [#3871 @rjbou] * Fix typos [#3891 @dra27, @mehdid] 2.0.4: