Merge pull request #5580 from rjbou/2.2.0.alpha-changes

Updates for 2.2.0~alpha release

AUTHORS

@@ -1,5 +1,7 @@
+David Allsopp      <[email protected]>
 Vincent Bernardoff <[email protected]>
 Raja Boujbel       <[email protected]>
+Kate Deplaix       <[email protected]>
 Roberto Di Cosmo   <[email protected]>
 Thomas Gazagnaire  <[email protected]>
 Louis Gesbert      <[email protected]>

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

opam-admin.opam

@@ -2,8 +2,10 @@ opam-version: "2.0"
 synopsis: "Meta-package for Dune"
 maintainer: "[email protected]"
 authors: [
+  "David Allsopp <[email protected]>"
   "Vincent Bernardoff <[email protected]>"
   "Raja Boujbel <[email protected]>"
+  "Kate Deplaix <[email protected]>"
   "Roberto Di Cosmo <[email protected]>"
   "Thomas Gazagnaire <[email protected]>"
   "Louis Gesbert <[email protected]>"

opam-client.opam

@@ -1,13 +1,15 @@
 opam-version: "2.0"
-version: "2.2.0~alpha~dev"
-synopsis: "Client library for opam 2.1"
+version: "2.2.0~alpha"
+synopsis: "Client library for opam 2.2"
 description: """
 Actions on the opam root, switches, installations, and front-end.
 """
 maintainer: "[email protected]"
 authors: [
+  "David Allsopp <[email protected]>"
   "Vincent Bernardoff <[email protected]>"
   "Raja Boujbel <[email protected]>"
+  "Kate Deplaix <[email protected]>"
   "Roberto Di Cosmo <[email protected]>"
   "Thomas Gazagnaire <[email protected]>"
   "Louis Gesbert <[email protected]>"

opam-core.opam

@@ -1,13 +1,15 @@
 opam-version: "2.0"
-version: "2.2.0~alpha~dev"
-synopsis: "Core library for opam 2.1"
+version: "2.2.0~alpha"
+synopsis: "Core library for opam 2.2"
 description: """
 Small standard library extensions, and generic system interaction modules used by opam.
 """
 maintainer: "[email protected]"
 authors: [
+  "David Allsopp <[email protected]>"
   "Vincent Bernardoff <[email protected]>"
   "Raja Boujbel <[email protected]>"
+  "Kate Deplaix <[email protected]>"
   "Roberto Di Cosmo <[email protected]>"
   "Thomas Gazagnaire <[email protected]>"
   "Louis Gesbert <[email protected]>"

opam-devel.opam

@@ -1,13 +1,15 @@
 opam-version: "2.0"
-version: "2.2.0~alpha~dev"
-synopsis: "Bootstrapped development binary for opam 2.1"
+version: "2.2.0~alpha"
+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.
 """
 maintainer: "[email protected]"
 authors: [
+  "David Allsopp <[email protected]>"
   "Vincent Bernardoff <[email protected]>"
   "Raja Boujbel <[email protected]>"
+  "Kate Deplaix <[email protected]>"
   "Roberto Di Cosmo <[email protected]>"
   "Thomas Gazagnaire <[email protected]>"
   "Louis Gesbert <[email protected]>"

opam-format.opam

@@ -1,13 +1,15 @@
 opam-version: "2.0"
-version: "2.2.0~alpha~dev"
-synopsis: "Format library for opam 2.1"
+version: "2.2.0~alpha"
+synopsis: "Format library for opam 2.2"
 description: """
 Definition of opam datastructures and its file interface.
 """
 maintainer: "[email protected]"
 authors: [
+  "David Allsopp <[email protected]>"
   "Vincent Bernardoff <[email protected]>"
   "Raja Boujbel <[email protected]>"
+  "Kate Deplaix <[email protected]>"
   "Roberto Di Cosmo <[email protected]>"
   "Thomas Gazagnaire <[email protected]>"
   "Louis Gesbert <[email protected]>"

opam-installer.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~alpha~dev"
+version: "2.2.0~alpha"
 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.
@@ -8,8 +8,10 @@ opam-installer is a small tool that can read *.install files, as defined by opam
 """
 maintainer: "[email protected]"
 authors: [
+  "David Allsopp <[email protected]>"
   "Vincent Bernardoff <[email protected]>"
   "Raja Boujbel <[email protected]>"
+  "Kate Deplaix <[email protected]>"
   "Roberto Di Cosmo <[email protected]>"
   "Thomas Gazagnaire <[email protected]>"
   "Louis Gesbert <[email protected]>"

opam-repository.opam

@@ -1,13 +1,15 @@
 opam-version: "2.0"
-version: "2.2.0~alpha~dev"
-synopsis: "Repository library for opam 2.1"
+version: "2.2.0~alpha"
+synopsis: "Repository library for opam 2.2"
 description: """
 This library includes repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends.
 """
 maintainer: "[email protected]"
 authors: [
+  "David Allsopp <[email protected]>"
   "Vincent Bernardoff <[email protected]>"
   "Raja Boujbel <[email protected]>"
+  "Kate Deplaix <[email protected]>"
   "Roberto Di Cosmo <[email protected]>"
   "Thomas Gazagnaire <[email protected]>"
   "Louis Gesbert <[email protected]>"

opam-solver.opam

@@ -1,13 +1,15 @@
 opam-version: "2.0"
-version: "2.2.0~alpha~dev"
-synopsis: "Solver library for opam 2.1"
+version: "2.2.0~alpha"
+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.
 """
 maintainer: "[email protected]"
 authors: [
+  "David Allsopp <[email protected]>"
   "Vincent Bernardoff <[email protected]>"
   "Raja Boujbel <[email protected]>"
+  "Kate Deplaix <[email protected]>"
   "Roberto Di Cosmo <[email protected]>"
   "Thomas Gazagnaire <[email protected]>"
   "Louis Gesbert <[email protected]>"

opam-state.opam

@@ -1,13 +1,15 @@
 opam-version: "2.0"
-version: "2.2.0~alpha~dev"
-synopsis: "State library for opam 2.1"
+version: "2.2.0~alpha"
+synopsis: "State library for opam 2.2"
 description: """
 Handling of the ~/.opam hierarchy, repository and switch states.
 """
 maintainer: "[email protected]"
 authors: [
+  "David Allsopp <[email protected]>"
   "Vincent Bernardoff <[email protected]>"
   "Raja Boujbel <[email protected]>"
+  "Kate Deplaix <[email protected]>"
   "Roberto Di Cosmo <[email protected]>"
   "Thomas Gazagnaire <[email protected]>"
   "Louis Gesbert <[email protected]>"

opam.opam

@@ -1,10 +1,12 @@
 opam-version: "2.0"
-version: "2.2.0~alpha~dev"
+version: "2.2.0~alpha"
 synopsis: "Meta-package for Dune"
 maintainer: "[email protected]"
 authors: [
+  "David Allsopp <[email protected]>"
   "Vincent Bernardoff <[email protected]>"
   "Raja Boujbel <[email protected]>"
+  "Kate Deplaix <[email protected]>"
   "Roberto Di Cosmo <[email protected]>"
   "Thomas Gazagnaire <[email protected]>"
   "Louis Gesbert <[email protected]>"

src/client/opamArg.ml

@@ -417,8 +417,10 @@ let help_sections cli =
     `P (Printf.sprintf "See https://opam.ocaml.org/doc.");
 
     `S Manpage.s_authors;
+    `S "David Allsopp      <[email protected]>"; `Noblank;
     `P "Vincent Bernardoff <[email protected]>"; `Noblank;
     `P "Raja Boujbel       <[email protected]>"; `Noblank;
+    `S "Kate Deplaix       <[email protected]>"; `Noblank;
     `P "Roberto Di Cosmo   <[email protected]>"; `Noblank;
     `P "Thomas Gazagnaire  <[email protected]>"; `Noblank;
     `P "Louis Gesbert      <[email protected]>"; `Noblank;