Skip to content

Commit

Permalink
Merge pull request #3472 from rjbou/2.0.0
Browse files Browse the repository at this point in the history
Bump version to 2.0.0
  • Loading branch information
AltGr authored Jul 24, 2018
2 parents ded1a3c + 6db50d6 commit b2b8f1e
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 26 deletions.
4 changes: 4 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ 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
* Fixes and documentation
* Add `opam admin add-hashes` helper to add more secure hashes to the repository

2.0.0~rc3
* Fixes
* Added subcommand `switch link` to link a local switch to a defined one
Expand Down
18 changes: 9 additions & 9 deletions configure
Original file line number Diff line number Diff line change
@@ -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~rc3.
# Generated by GNU Autoconf 2.69 for opam 2.0.0.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -578,8 +578,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='opam'
PACKAGE_TARNAME='opam'
PACKAGE_VERSION='2.0.0~rc3'
PACKAGE_STRING='opam 2.0.0~rc3'
PACKAGE_VERSION='2.0.0'
PACKAGE_STRING='opam 2.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''

Expand Down Expand Up @@ -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~rc3 to adapt to many kinds of systems.
\`configure' configures opam 2.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -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~rc3:";;
short | recursive ) echo "Configuration of opam 2.0.0:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -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~rc3
opam configure 2.0.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -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~rc3, which was
It was created by opam $as_me 2.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -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~rc3, which was
This file was extended by opam $as_me 2.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -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~rc3
opam config.status 2.0.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT(opam,2.0.0~rc3)
AC_INIT(opam,2.0.0)
AC_COPYRIGHT(Copyright 2012-2017 OcamlPro SAS)

AC_CONFIG_MACRO_DIR([m4])
Expand Down
6 changes: 3 additions & 3 deletions opam-client.opam
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
opam-version: "1.2"
version: "2.0.0~rc3"
version: "2.0.0"
maintainer: "[email protected]"
authors: [
"Vincent Bernardoff <[email protected]>"
Expand All @@ -21,8 +21,8 @@ build: [
[make "%{name}%.install"]
]
depends: [
"opam-state" {= "2.0.0~rc3"}
"opam-solver" {= "2.0.0~rc3"}
"opam-state" {= "2.0.0"}
"opam-solver" {= "2.0.0"}
"re" {>= "1.7.2"}
"cmdliner" {>= "0.9.8"}
"jbuilder" {build & >= "1.0+beta20"}
Expand Down
2 changes: 1 addition & 1 deletion opam-core.opam
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
opam-version: "1.2"
version: "2.0.0~rc3"
version: "2.0.0"
maintainer: "[email protected]"
authors: [
"Vincent Bernardoff <[email protected]>"
Expand Down
4 changes: 2 additions & 2 deletions opam-devel.opam
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
opam-version: "1.2"
version: "2.0.0~rc3"
version: "2.0.0"
maintainer: "[email protected]"
authors: [
"Vincent Bernardoff <[email protected]>"
Expand All @@ -22,7 +22,7 @@ build: [
]
build-test: [make "tests"]
depends: [
"opam-client" {= "2.0.0~rc3"}
"opam-client" {= "2.0.0"}
"cmdliner" {>= "0.9.8"}
"jbuilder" {build & >= "1.0+beta20"}
]
Expand Down
4 changes: 2 additions & 2 deletions opam-format.opam
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
opam-version: "1.2"
version: "2.0.0~rc3"
version: "2.0.0"
maintainer: "[email protected]"
authors: [
"Vincent Bernardoff <[email protected]>"
Expand All @@ -21,7 +21,7 @@ build: [
[make "%{name}%.install"]
]
depends: [
"opam-core" {= "2.0.0~rc3"}
"opam-core" {= "2.0.0"}
"opam-file-format" {>= "2.0.0~rc2"}
"jbuilder" {build & >= "1.0+beta18"}
]
Expand Down
4 changes: 2 additions & 2 deletions opam-installer.opam
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
opam-version: "1.2"
version: "2.0.0~rc3"
version: "2.0.0"
maintainer: "[email protected]"
authors: [
"Vincent Bernardoff <[email protected]>"
Expand All @@ -23,7 +23,7 @@ build: [
[make "%{name}%.install"]
]
depends: [
"opam-format" {= "2.0.0~rc3"}
"opam-format" {= "2.0.0"}
"cmdliner" {>= "0.9.8"}
"jbuilder" {build & >= "1.0+beta17"}
]
Expand Down
4 changes: 2 additions & 2 deletions opam-repository.opam
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
opam-version: "1.2"
version: "2.0.0~rc3"
version: "2.0.0"
maintainer: "[email protected]"
authors: [
"Vincent Bernardoff <[email protected]>"
Expand All @@ -21,7 +21,7 @@ build: [
[make "%{name}%.install"]
]
depends: [
"opam-format" {= "2.0.0~rc3"}
"opam-format" {= "2.0.0"}
"jbuilder" {build & >= "1.0+beta17"}
]
available: ocaml-version >= "4.02.3"
4 changes: 2 additions & 2 deletions opam-solver.opam
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
opam-version: "1.2"
version: "2.0.0~rc3"
version: "2.0.0"
maintainer: "[email protected]"
authors: [
"Vincent Bernardoff <[email protected]>"
Expand All @@ -21,7 +21,7 @@ build: [
[make "%{name}%.install"]
]
depends: [
"opam-format" {= "2.0.0~rc3"}
"opam-format" {= "2.0.0"}
"mccs" {>= "1.1+8"}
"dose3" {>= "5"}
"cudf" {>= "0.7"}
Expand Down
4 changes: 2 additions & 2 deletions opam-state.opam
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
opam-version: "1.2"
version: "2.0.0~rc3"
version: "2.0.0"
maintainer: "[email protected]"
authors: [
"Vincent Bernardoff <[email protected]>"
Expand All @@ -21,7 +21,7 @@ build: [
[make "%{name}%.install"]
]
depends: [
"opam-repository" {= "2.0.0~rc3"}
"opam-repository" {= "2.0.0"}
"jbuilder" {build & >= "1.0+beta18"}
]
available: ocaml-version >= "4.02.3"

0 comments on commit b2b8f1e

Please sign in to comment.