release 4.10.24.10.2

6 files changed, 24 insertions, 24 deletions

diff --git a/Changes b/Changes
index 685de03a8d..0ea866b37b 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,5 @@
-Working version
----------------
+OCaml 4.10.2 (8 December 2020)
+------------------------------
 
 ### Build system:
 
@@ -16,12 +16,12 @@ Working version
 
 ### Code generation and optimization
 
- - #9752, #10026: Revised handling of calling conventions for
-   external C functions.
-   Provide a more precise description of the types of unboxed arguments,
-   so that the ARM64 iOS/macOS calling conventions can be honored.
-   Backported from OCaml 4.12.0
-   (Xavier Leroy, review by Mark Shinwell and Github user @EduardoRFS)
+- #9752, #10026: Revised handling of calling conventions for
+  external C functions.
+  Provide a more precise description of the types of unboxed arguments,
+  so that the ARM64 iOS/macOS calling conventions can be honored.
+  Backported from OCaml 4.12.0
+  (Xavier Leroy, review by Mark Shinwell and Github user @EduardoRFS)
 
 - #9969, #9981: Added mergeable flag tqo ELF sections containing mergeable
   constants.  Fixes compatibility with the integrated assembler in clang 11.0.0.
diff --git a/VERSION b/VERSION
index 29cfab24d9..3effc2578f 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-4.10.2+dev1-2020-12-08
+4.10.2
 
 # The version string is the first line of this file.
 # It must be in the format described in stdlib/sys.mli
diff --git a/boot/ocamlc b/boot/ocamlc
index 047bb00817..0f14129148 100755
--- a/boot/ocamlc
+++ b/boot/ocamlc
diff --git a/boot/ocamllex b/boot/ocamllex
index 462fe17b57..2438a1a1b3 100755
--- a/boot/ocamllex
+++ b/boot/ocamllex
diff --git a/configure b/configure
index 9dd6881509..7539fe0f10 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.69 for OCaml 4.10.2+dev1-2020-12-08.
+# Generated by GNU Autoconf 2.69 for OCaml 4.10.2.
 #
 # Report bugs to <caml-list@inria.fr>.
 #
@@ -646,8 +646,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='OCaml'
 PACKAGE_TARNAME='ocaml'
-PACKAGE_VERSION='4.10.2+dev1-2020-12-08'
-PACKAGE_STRING='OCaml 4.10.2+dev1-2020-12-08'
+PACKAGE_VERSION='4.10.2'
+PACKAGE_STRING='OCaml 4.10.2'
 PACKAGE_BUGREPORT='caml-list@inria.fr'
 PACKAGE_URL='http://www.ocaml.org'
 
@@ -1480,7 +1480,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 4.10.2+dev1-2020-12-08 to adapt to many kinds of systems.
+\`configure' configures OCaml 4.10.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1546,7 +1546,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OCaml 4.10.2+dev1-2020-12-08:";;
+     short | recursive ) echo "Configuration of OCaml 4.10.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1708,7 +1708,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OCaml configure 4.10.2+dev1-2020-12-08
+OCaml configure 4.10.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2417,7 +2417,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 4.10.2+dev1-2020-12-08, which was
+It was created by OCaml $as_me 4.10.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2766,8 +2766,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.10.2+dev1-2020-12-08" >&5
-$as_echo "$as_me: Configuring OCaml version 4.10.2+dev1-2020-12-08" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.10.2" >&5
+$as_echo "$as_me: Configuring OCaml version 4.10.2" >&6;}
 
 # Configuration variables
 
@@ -2843,7 +2843,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-VERSION=4.10.2+dev1-2020-12-08
+VERSION=4.10.2
 
 
 # Note: This is present for the flexdll bootstrap where it exposed as the old
@@ -12507,7 +12507,7 @@ case $ocaml_cv_cc_vendor in #(
   msvc-*) :
     outputobj=-Fo; gcc_warnings="" ;; #(
   *) :
-    outputobj='-o $(EMPTY)'; case 4.10.2+dev1-2020-12-08 in #(
+    outputobj='-o $(EMPTY)'; case 4.10.2 in #(
   *+dev*) :
     gcc_warnings="-Wall -Werror" ;; #(
   *) :
@@ -17465,7 +17465,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 4.10.2+dev1-2020-12-08, which was
+This file was extended by OCaml $as_me 4.10.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17532,7 +17532,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="\\
-OCaml config.status 4.10.2+dev1-2020-12-08
+OCaml config.status 4.10.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/ocaml-variants.opam b/ocaml-variants.opam
index bcf8bcb8cf..c961d28c7b 100644
--- a/ocaml-variants.opam
+++ b/ocaml-variants.opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
-version: "4.10.2+trunk"
-synopsis: "OCaml development version"
+version: "4.10.2"
+synopsis: "OCaml 4.10.2 official release"
 depends: [
   "ocaml" {= "4.10.2" & post}
   "base-unix" {post}