Merge pull request #3420 from rjbou/2.0.0-rc3

Bump opam to version 2.0.0~rc3
ocaml · Jun 19, 2018 · d5327ef · d5327ef
2 parents 0e26133 + deec74b
commit d5327ef
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 27 deletions.
diff --git a/CHANGES b/CHANGES
@@ -2,6 +2,13 @@ Changes prefixed with "(*)" are potentially breaking to scripts or existing
 repositories (changes that are automatically handled by the format upgrade tools
 are not marked).
 
+2.0.0~rc3
+* Fixes
+* Added subcommand `switch link` to link a local switch to a defined one
+* Added option `--assume-built` to install an already built pinned package
+* Better Windows support
+* Obsolete `opam config setup` option
+
 2.0.0~rc2
 * Fixes
 * Much faster CUDF universe loading

diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for opam 2.0.0~rc2.
+# Generated by GNU Autoconf 2.69 for opam 2.0.0~rc3.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -578,8 +578,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='opam'
 PACKAGE_TARNAME='opam'
-PACKAGE_VERSION='2.0.0~rc2'
-PACKAGE_STRING='opam 2.0.0~rc2'
+PACKAGE_VERSION='2.0.0~rc3'
+PACKAGE_STRING='opam 2.0.0~rc3'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1262,7 +1262,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures opam 2.0.0~rc2 to adapt to many kinds of systems.
+\`configure' configures opam 2.0.0~rc3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1324,7 +1324,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of opam 2.0.0~rc2:";;
+     short | recursive ) echo "Configuration of opam 2.0.0~rc3:";;
    esac
   cat <<\_ACEOF
 
@@ -1428,7 +1428,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-opam configure 2.0.0~rc2
+opam configure 2.0.0~rc3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1523,7 +1523,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by opam $as_me 2.0.0~rc2, which was
+It was created by opam $as_me 2.0.0~rc3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -5806,7 +5806,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by opam $as_me 2.0.0~rc2, which was
+This file was extended by opam $as_me 2.0.0~rc3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5859,7 +5859,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-opam config.status 2.0.0~rc2
+opam config.status 2.0.0~rc3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(opam,2.0.0~rc2)
+AC_INIT(opam,2.0.0~rc3)
 AC_COPYRIGHT(Copyright 2012-2017 OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/opam-client.opam b/opam-client.opam
@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.0~rc2"
+version: "2.0.0~rc3"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Vincent Bernardoff <vb@luminar.eu.org>"
@@ -21,8 +21,8 @@ build: [
   [make "%{name}%.install"]
 ]
 depends: [
-  "opam-state" {= "2.0.0~rc2"}
-  "opam-solver" {= "2.0.0~rc2"}
+  "opam-state" {= "2.0.0~rc3"}
+  "opam-solver" {= "2.0.0~rc3"}
   "re" {>= "1.7.2"}
   "cmdliner" {>= "0.9.8"}
   "jbuilder" {build & >= "1.0+beta20"}

diff --git a/opam-core.opam b/opam-core.opam
@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.0~rc2"
+version: "2.0.0~rc3"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Vincent Bernardoff <vb@luminar.eu.org>"

diff --git a/opam-devel.opam b/opam-devel.opam
@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.0~rc2"
+version: "2.0.0~rc3"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Vincent Bernardoff <vb@luminar.eu.org>"
@@ -22,7 +22,7 @@ build: [
 ]
 build-test: [make "tests"]
 depends: [
-  "opam-client" {= "2.0.0~rc2"}
+  "opam-client" {= "2.0.0~rc3"}
   "cmdliner" {>= "0.9.8"}
   "jbuilder" {build & >= "1.0+beta20"}
 ]

diff --git a/opam-format.opam b/opam-format.opam
@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.0~rc2"
+version: "2.0.0~rc3"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Vincent Bernardoff <vb@luminar.eu.org>"
@@ -21,7 +21,7 @@ build: [
   [make "%{name}%.install"]
 ]
 depends: [
-  "opam-core" {= "2.0.0~rc2"}
+  "opam-core" {= "2.0.0~rc3"}
   "opam-file-format" {>= "2.0.0~rc2"}
   "jbuilder" {build & >= "1.0+beta18"}
 ]

diff --git a/opam-installer.opam b/opam-installer.opam
@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.0~rc2"
+version: "2.0.0~rc3"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Vincent Bernardoff <vb@luminar.eu.org>"
@@ -23,7 +23,7 @@ build: [
   [make "%{name}%.install"]
 ]
 depends: [
-  "opam-format" {= "2.0.0~rc2"}
+  "opam-format" {= "2.0.0~rc3"}
   "cmdliner" {>= "0.9.8"}
   "jbuilder" {build & >= "1.0+beta17"}
 ]

diff --git a/opam-repository.opam b/opam-repository.opam
@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.0~rc2"
+version: "2.0.0~rc3"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Vincent Bernardoff <vb@luminar.eu.org>"
@@ -21,7 +21,7 @@ build: [
   [make "%{name}%.install"]
 ]
 depends: [
-  "opam-format" {= "2.0.0~rc2"}
+  "opam-format" {= "2.0.0~rc3"}
   "jbuilder" {build & >= "1.0+beta17"}
 ]
 available: ocaml-version >= "4.02.3"
diff --git a/opam-solver.opam b/opam-solver.opam
@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.0~rc2"
+version: "2.0.0~rc3"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Vincent Bernardoff <vb@luminar.eu.org>"
@@ -21,8 +21,8 @@ build: [
   [make "%{name}%.install"]
 ]
 depends: [
-  "opam-format" {= "2.0.0~rc2"}
-  "mccs" {>= "1.1+6"}
+  "opam-format" {= "2.0.0~rc3"}
+  "mccs" {>= "1.1+8"}
   "dose3" {>= "5"}
   "cudf" {>= "0.7"}
   "jbuilder" {build & >= "1.0+beta17"}

diff --git a/opam-state.opam b/opam-state.opam
@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "2.0.0~rc2"
+version: "2.0.0~rc3"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Vincent Bernardoff <vb@luminar.eu.org>"
@@ -21,7 +21,7 @@ build: [
   [make "%{name}%.install"]
 ]
 depends: [
-  "opam-repository" {= "2.0.0~rc2"}
+  "opam-repository" {= "2.0.0~rc3"}
   "jbuilder" {build & >= "1.0+beta18"}
 ]
 available: ocaml-version >= "4.02.3"