Skip to content

Commit

Permalink
Merge pull request #3922 from rjbou/2.0.5
Browse files Browse the repository at this point in the history
Bump version 2.0.5
  • Loading branch information
rjbou committed Jul 10, 2019
2 parents 804f522 + 7b42b99 commit 2b2e2c6
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions CHANGES
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion 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])
Expand Down
6 changes: 3 additions & 3 deletions 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 <vb@luminar.eu.org>"
Expand All @@ -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"}
Expand Down
2 changes: 1 addition & 1 deletion 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 <vb@luminar.eu.org>"
Expand Down
4 changes: 2 additions & 2 deletions 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 <vb@luminar.eu.org>"
Expand All @@ -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"}
]
Expand Down
4 changes: 2 additions & 2 deletions 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 <vb@luminar.eu.org>"
Expand All @@ -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"}
]
Expand Down
4 changes: 2 additions & 2 deletions 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 <vb@luminar.eu.org>"
Expand All @@ -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"}
]
Expand Down
4 changes: 2 additions & 2 deletions 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 <vb@luminar.eu.org>"
Expand All @@ -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"
4 changes: 2 additions & 2 deletions 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 <vb@luminar.eu.org>"
Expand All @@ -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"}
Expand Down
4 changes: 2 additions & 2 deletions 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 <vb@luminar.eu.org>"
Expand All @@ -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"
2 changes: 1 addition & 1 deletion shell/bundle.sh
Expand Up @@ -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=
Expand Down

0 comments on commit 2b2e2c6

Please sign in to comment.