first commit after branching 5.1

6 files changed, 57 insertions, 31 deletions

diff --git a/Changes b/Changes
index 72febc24cb..4ba7de3019 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,29 @@
+Working version
+---------------
+
+### Language features:
+
+### Runtime system:
+
+### Code generation and optimizations:
+
+### Standard library:
+
+### Other libraries:
+
+### Tools:
+
+### Manual and documentation:
+
+### Compiler user-interface and warnings:
+
+### Internal/compiler-libs changes:
+
+### Build system:
+
+### Bug fixes:
+
+
 OCaml 5.1.0
 ---------------
 
diff --git a/README.adoc b/README.adoc
index 8f4ca17835..c7a91297bf 100644
--- a/README.adoc
+++ b/README.adoc
@@ -17,7 +17,7 @@ systems will be added back in later releases. On 32-bit systems, only the
 bytecode compiler will be supported.
 
 |=====
-| Branch `trunk` | Branch `5.0` | Branch `4.14` | Branch `4.13`
+| Branch `trunk` | Branch `5.1` | Branch `5.0` | Branch `4.14`
 
 | image:https://github.com/ocaml/ocaml/workflows/Build/badge.svg?branch=trunk["Github CI Build Status (trunk branch)",
      link="https://github.com/ocaml/ocaml/actions?query=workflow%3ABuild"]
@@ -25,6 +25,10 @@ bytecode compiler will be supported.
      link="https://github.com/ocaml/ocaml/actions?query=workflow%3AHygiene"]
   image:https://ci.appveyor.com/api/projects/status/github/ocaml/ocaml?branch=trunk&svg=true["AppVeyor Build Status (trunk branch)",
      link="https://ci.appveyor.com/project/avsm/ocaml"]
+| image:https://github.com/ocaml/ocaml/workflows/Build/badge.svg?branch=5.1["Github CI Build Status (5.1 branch)",
+     link="https://github.com/ocaml/ocaml/actions?query=workflow%3ABuild"]
+  image:https://ci.appveyor.com/api/projects/status/github/ocaml/ocaml?branch=5.1&svg=true["AppVeyor Build Status (5.1 branch)",
+     link="https://ci.appveyor.com/project/avsm/ocaml"]
 | image:https://github.com/ocaml/ocaml/workflows/Build/badge.svg?branch=5.0["Github CI Build Status (5.0 branch)",
      link="https://github.com/ocaml/ocaml/actions?query=workflow%3ABuild"]
   image:https://ci.appveyor.com/api/projects/status/github/ocaml/ocaml?branch=5.0&svg=true["AppVeyor Build Status (5.0 branch)",
@@ -33,10 +37,6 @@ bytecode compiler will be supported.
      link="https://github.com/ocaml/ocaml/actions?query=workflow%3Amain"]
   image:https://ci.appveyor.com/api/projects/status/github/ocaml/ocaml?branch=4.14&svg=true["AppVeyor Build Status (4.14 branch)",
      link="https://ci.appveyor.com/project/avsm/ocaml"]
-| image:https://travis-ci.org/ocaml/ocaml.svg?branch=4.13["TravisCI Build Status (4.13 branch)",
-     link="https://travis-ci.org/ocaml/ocaml"]
-  image:https://ci.appveyor.com/api/projects/status/github/ocaml/ocaml?branch=4.13&svg=true["AppVeyor Build Status (4.13 branch)",
-     link="https://ci.appveyor.com/project/avsm/ocaml"]
 |=====
 
 = README =
diff --git a/VERSION b/VERSION
index 7c40fb83e8..4f107dd8d1 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-5.1.0+dev2-2023-04-11
+5.2.0+dev0-2023-04-11
 
 # Starting with OCaml 4.14, although the version string that appears above is
 # still correct and this file can thus still be used to figure it out,
diff --git a/build-aux/ocaml_version.m4 b/build-aux/ocaml_version.m4
index 0156ff1da0..abae7773fc 100644
--- a/build-aux/ocaml_version.m4
+++ b/build-aux/ocaml_version.m4
@@ -32,11 +32,11 @@ m4_define([OCAML__DEVELOPMENT_VERSION], [true])
 # including the patchlevel, are mandatory.
 
 m4_define([OCAML__VERSION_MAJOR], [5])
-m4_define([OCAML__VERSION_MINOR], [1])
+m4_define([OCAML__VERSION_MINOR], [2])
 m4_define([OCAML__VERSION_PATCHLEVEL], [0])
 # Note that the OCAML__VERSION_EXTRA string defined below is always empty
 # for officially-released versions of OCaml.
-m4_define([OCAML__VERSION_EXTRA], [dev2-2023-04-11])
+m4_define([OCAML__VERSION_EXTRA], [dev0-2023-04-11])
 
 # The OCAML__VERSION_EXTRA_PREFIX macro defined below should be a
 # single character:
diff --git a/configure b/configure
index 81c7f29e87..37a9ae3102 100755
--- a/configure
+++ b/configure
@@ -56,7 +56,7 @@ if test -e '.git' ; then :
   fi
 fi
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for OCaml 5.1.0+dev2-2023-04-11.
+# Generated by GNU Autoconf 2.71 for OCaml 5.2.0+dev0-2023-04-11.
 #
 # Report bugs to <caml-list@inria.fr>.
 #
@@ -677,8 +677,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='OCaml'
 PACKAGE_TARNAME='ocaml'
-PACKAGE_VERSION='5.1.0+dev2-2023-04-11'
-PACKAGE_STRING='OCaml 5.1.0+dev2-2023-04-11'
+PACKAGE_VERSION='5.2.0+dev0-2023-04-11'
+PACKAGE_STRING='OCaml 5.2.0+dev0-2023-04-11'
 PACKAGE_BUGREPORT='caml-list@inria.fr'
 PACKAGE_URL='http://www.ocaml.org'
 
@@ -1556,7 +1556,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 OCaml 5.1.0+dev2-2023-04-11 to adapt to many kinds of systems.
+\`configure' configures OCaml 5.2.0+dev0-2023-04-11 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1623,7 +1623,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OCaml 5.1.0+dev2-2023-04-11:";;
+     short | recursive ) echo "Configuration of OCaml 5.2.0+dev0-2023-04-11:";;
    esac
   cat <<\_ACEOF
 
@@ -1785,7 +1785,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OCaml configure 5.1.0+dev2-2023-04-11
+OCaml configure 5.2.0+dev0-2023-04-11
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2442,7 +2442,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 OCaml $as_me 5.1.0+dev2-2023-04-11, which was
+It was created by OCaml $as_me 5.2.0+dev0-2023-04-11, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3198,8 +3198,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 5.1.0+dev2-2023-04-11" >&5
-printf "%s\n" "$as_me: Configuring OCaml version 5.1.0+dev2-2023-04-11" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 5.2.0+dev0-2023-04-11" >&5
+printf "%s\n" "$as_me: Configuring OCaml version 5.2.0+dev0-2023-04-11" >&6;}
 
 # Configuration variables
 
@@ -3265,21 +3265,21 @@ ocamltest_unix_include=""
 
 
 
-VERSION=5.1.0+dev2-2023-04-11
+VERSION=5.2.0+dev0-2023-04-11
 
 OCAML_DEVELOPMENT_VERSION=true
 
-OCAML_RELEASE_EXTRA='Some (Plus, "dev2-2023-04-11")'
+OCAML_RELEASE_EXTRA='Some (Plus, "dev0-2023-04-11")'
 
 OCAML_VERSION_MAJOR=5
 
-OCAML_VERSION_MINOR=1
+OCAML_VERSION_MINOR=2
 
 OCAML_VERSION_PATCHLEVEL=0
 
-OCAML_VERSION_EXTRA=dev2-2023-04-11
+OCAML_VERSION_EXTRA=dev0-2023-04-11
 
-OCAML_VERSION_SHORT=5.1
+OCAML_VERSION_SHORT=5.2
 
 
 
@@ -3435,17 +3435,17 @@ ac_config_files="$ac_config_files stdlib/META"
 # Definitions related to the version of OCaml
 printf "%s\n" "#define OCAML_VERSION_MAJOR 5" >>confdefs.h
 
-printf "%s\n" "#define OCAML_VERSION_MINOR 1" >>confdefs.h
+printf "%s\n" "#define OCAML_VERSION_MINOR 2" >>confdefs.h
 
 printf "%s\n" "#define OCAML_VERSION_PATCHLEVEL 0" >>confdefs.h
 
-printf "%s\n" "#define OCAML_VERSION_ADDITIONAL \"dev2-2023-04-11\"" >>confdefs.h
+printf "%s\n" "#define OCAML_VERSION_ADDITIONAL \"dev0-2023-04-11\"" >>confdefs.h
 
-  printf "%s\n" "#define OCAML_VERSION_EXTRA \"dev2-2023-04-11\"" >>confdefs.h
+  printf "%s\n" "#define OCAML_VERSION_EXTRA \"dev0-2023-04-11\"" >>confdefs.h
 
-printf "%s\n" "#define OCAML_VERSION 50100" >>confdefs.h
+printf "%s\n" "#define OCAML_VERSION 50200" >>confdefs.h
 
-printf "%s\n" "#define OCAML_VERSION_STRING \"5.1.0+dev2-2023-04-11\"" >>confdefs.h
+printf "%s\n" "#define OCAML_VERSION_STRING \"5.2.0+dev0-2023-04-11\"" >>confdefs.h
 
 
 # Works out how many "o"s are needed in quoted strings
@@ -20314,7 +20314,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 OCaml $as_me 5.1.0+dev2-2023-04-11, which was
+This file was extended by OCaml $as_me 5.2.0+dev0-2023-04-11, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20383,7 +20383,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-OCaml config.status 5.1.0+dev2-2023-04-11
+OCaml config.status 5.2.0+dev0-2023-04-11
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
diff --git a/ocaml-variants.opam b/ocaml-variants.opam
index 8338c762cf..8b065f2f23 100644
--- a/ocaml-variants.opam
+++ b/ocaml-variants.opam
@@ -1,9 +1,9 @@
 opam-version: "2.0"
-version: "5.1.0+trunk"
+version: "5.2.0+trunk"
 license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
 synopsis: "OCaml development version"
 depends: [
-  "ocaml" {= "5.1.0" & post}
+  "ocaml" {= "5.2.0" & post}
   "base-unix" {post}
   "base-bigarray" {post}
   "base-threads" {post}