Merge pull request #6039 from kit-ty-kate/rel-2.2.0-rc1

Release 2.2.0~rc1

CHANGES

@@ -3,6 +3,23 @@ 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~rc1:
+* Fix `opam upgrade` wanting to recompile opam files containing the
+  `x-env-path-rewrite` field [#6029 @kit-ty-kate - fix #6028]
+* Provide defaults so `opam init -y` no longer asks questions
+  [#6033 @dra27 - fix #6013]
+* Fix OpamConsole.menu > 9 options [#6026 @kit-ty-kate]
+* Fix the lower-bound constraint on ocaml-re
+  (bump from >= 1.9.0 to >= 1.10.0) [#6016 @kit-ty-kate]
+* Update source file location as caml.inria.fr is unavailable
+  [#6032 #5789 @mtelvers @kit-ty-kate]
+* Fix a wrong use of `OpamFilename.of_string` [#6024 @kit-ty-kate]
+* Add Windows to opam's release script [#5789 @kit-ty-kate]
+* Improve and extend the tests [#6029 @kit-ty-kate]
+* API changes:
+  * `OpamTypesBase`: Add `nullify_pos_map` and `nullify_pos_value`
+    [#6029 @kit-ty-kate]
+
 2.2.0~beta3:
 * (+) New option `opam init --cygwin-extra-packages=CYGWIN_PKGS
   --cygwin-internal-install`, to specify additional packages for internal Cygwin
@@ -94,8 +111,6 @@ are not marked). Those prefixed with "(+)" are new command/option (since
 * Improve the benchmarks [#5909 @kit-ty-kate]
 * Improve the test infrastructure [#5935 #5938 #5998 @dra27]
 * API changes:
-
-
   * `OpamClient.init` and `OpamClient.reinit`: now can have additional cygwin
     packages to install [#5930 @moyodiallo]
   * `OpamClientConfig.opam_init`: add `original_root_dir` argument that

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

master_changes.md

@@ -11,15 +11,12 @@ moved, etc.), please update the _API updates_ part (it helps opam library
 users)
 
 ## Version
-  * Bump the version number after the release of 2.2.0~beta3 [#6009 @kit-ty-kate]
 
 ## Global CLI
-  * Fix OpamConsole.menu > 9 options [#6026 @kit-ty-kate]
 
 ## Plugins
 
 ## Init
-  * Provide defaults so `opam init -y` no longer asks questions [#6033 @dra27 fix #6013]
 
 ## Config report
 
@@ -42,7 +39,6 @@ users)
 ## Var/Option
 
 ## Update / Upgrade
-  * Fix `opam upgrade` wanting to recompile opam files containing the `x-env-path-rewrite` field [#6029 @kit-ty-kate - fix #6028]
 
 ## Tree
 
@@ -71,13 +67,10 @@ users)
 ## VCS
 
 ## Build
-  * Fix the lower-bound constraint on ocaml-re (bump from >= 1.9.0 to >= 1.10.0) [#6016 @kit-ty-kate]
-  * Update source file location as caml.inria.fr is unavailable [#6032 #5789 @mtelvers @kit-ty-kate]
 
 ## Infrastructure
 
 ## Release scripts
-  * Add windows to the release script [#5789 @kit-ty-kate]
 
 ## Install script
 
@@ -96,7 +89,6 @@ users)
 ## Shell
 
 ## Internal
-  * Fix a wrong use of `OpamFilename.of_string` [#6024 @kit-ty-kate]
 
 ## Internal: Windows
 
@@ -106,7 +98,6 @@ users)
 
 ## Reftests
 ### Tests
-  * add a complete test to make sure effectively_equal does not take the location of the fields into account [#6029 @kit-ty-kate]
 
 ### Engine
 
@@ -126,6 +117,5 @@ users)
 ## opam-solver
 
 ## opam-format
-  * `OpamTypesBase`: Add `nullify_pos_map` and `nullify_pos_value` [#6029 @kit-ty-kate]
 
 ## opam-core

opam-client.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~rc1~dev"
+version: "2.2.0~rc1"
 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~rc1~dev"
+version: "2.2.0~rc1"
 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~rc1~dev"
+version: "2.2.0~rc1"
 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~rc1~dev"
+version: "2.2.0~rc1"
 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~rc1~dev"
+version: "2.2.0~rc1"
 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~rc1~dev"
+version: "2.2.0~rc1"
 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~rc1~dev"
+version: "2.2.0~rc1"
 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~rc1~dev"
+version: "2.2.0~rc1"
 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~rc1~dev"
+version: "2.2.0~rc1"
 synopsis: "Meta-package for Dune"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [