Merge pull request #6060 from rjbou/release-2.2

Release 2.2

CHANGES

@@ -3,6 +3,20 @@ repositories (changes that are automatically handled by the format upgrade tools
 are not marked). Those prefixed with "(+)" are new command/option (since
 2.1.0~alpha2).
 
+2.2.0:
+* Bump `opam-root-version` to 2.2 [#5980 @kit-ty-kate]
+* Cygwin initialisation enhancement
+  * Always pass `--no-version-check` and `--no-write-registry` to Cygwin setup
+    [#6046 @dra27]
+  * Use `--quiet-mode noinput` for the internal Cygwin installation (which is
+    definitely a fully-specified command line) and `--quiet-mode` unattended
+    for external Cygwin installations (in case the user does need to select
+    something, e.g. a mirror) [#6046 @dra27]
+* API changes
+  * `OpamStateConfig.opamroot_with_provenance`: restore previous behaviour to
+    `OpamStateConfig.opamroot` for compatibility with third party code
+    [#6047 @dra27]
+
 2.2.0~rc1:
 * Fix `opam upgrade` wanting to recompile opam files containing the
   `x-env-path-rewrite` field [#6029 @kit-ty-kate - fix #6028]

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.2.0~rc2~dev])
+AC_INIT([opam],[2.2.0])
 AC_COPYRIGHT(Copyright 2012-2019 OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])

master_changes.md

@@ -11,8 +11,6 @@ moved, etc.), please update the _API updates_ part (it helps opam library
 users)
 
 ## Version
-  * Bump version to 2.20~rc2~dev [#6048 @rjbou]
-  * Bump opam-root-version to 2.2 [#5980 @kit-ty-kate]
 
 ## Global CLI
 
@@ -61,8 +59,6 @@ users)
 ## Opamfile
 
 ## External dependencies
- * Always pass --no-version-check and --no-write-registry to Cygwin setup [#6046 @dra27]
- * Use --quiet-mode noinput for the internal Cygwin installation (which is definitely a fully-specified command line) and --quiet-mode unattended for external Cygwin installations (in case the user does need to select something, e.g. a mirror) [#6046 @dra27]
 
 ## Format upgrade
 
@@ -118,7 +114,6 @@ users)
 ## opam-repository
 
 ## opam-state
- * `OpamStateConfig.opamroot_with_provenance`: restore previous behaviour to `OpamStateConfig.opamroot` for compatibility with third party code [#6047 @dra27]
 
 ## opam-solver
 

opam-client.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~rc2~dev"
+version: "2.2.0"
 synopsis: "Client library for opam 2.2"
 description: """
 Actions on the opam root, switches, installations, and front-end.

opam-core.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~rc2~dev"
+version: "2.2.0"
 synopsis: "Core library for opam 2.2"
 description:
   "Small standard library extensions, and generic system interaction modules used by opam."

opam-devel.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~rc2~dev"
+version: "2.2.0"
 synopsis: "Bootstrapped development binary for opam 2.2"
 description: """
 This package compiles (bootstraps) opam. For consistency and safety of the installation, the binaries are not installed into the PATH, but into lib/opam-devel, from where the user can manually install them system-wide.

opam-format.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~rc2~dev"
+version: "2.2.0"
 synopsis: "Format library for opam 2.2"
 description: """
 Definition of opam datastructures and its file interface.

opam-installer.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~rc2~dev"
+version: "2.2.0"
 synopsis: "Installation of files to a prefix, following opam conventions"
 description: """
 opam-installer is a small tool that can read *.install files, as defined by opam [1], and execute them to install or remove package files without going through opam.

opam-repository.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~rc2~dev"
+version: "2.2.0"
 synopsis: "Repository library for opam 2.2"
 description: """
 This library includes repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends.

opam-solver.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~rc2~dev"
+version: "2.2.0"
 synopsis: "Solver library for opam 2.2"
 description: """
 Solver and Cudf interaction. This library is based on the Cudf and Dose libraries, and handles calls to the external solver from opam.

opam-state.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~rc2~dev"
+version: "2.2.0"
 synopsis: "State library for opam 2.2"
 description: """
 Handling of the ~/.opam hierarchy, repository and switch states.

opam.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~rc2~dev"
+version: "2.2.0"
 synopsis: "Meta-package for Dune"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [