772b17b666
This is no longer needed now we found another way to work around build notes breakage.
87 lines
3.2 KiB
Diff
87 lines
3.2 KiB
Diff
From 8741f4d88801e478e0ab7f871dc7dbcf9d7cc8f4 Mon Sep 17 00:00:00 2001
|
|
From: Florian Angeletti <florian.angeletti@inria.fr>
|
|
Date: Thu, 15 Dec 2022 14:28:32 +0100
|
|
Subject: [PATCH 01/17] increment version number after tagging 5.0.0
|
|
|
|
---
|
|
VERSION | 2 +-
|
|
build-aux/ocaml_version.m4 | 6 +++---
|
|
configure | Bin 617024 -> 617302 bytes
|
|
ocaml-variants.opam | 6 +++---
|
|
4 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/VERSION b/VERSION
|
|
index fc40ac52d7..314f8ec760 100644
|
|
--- a/VERSION
|
|
+++ b/VERSION
|
|
@@ -1,4 +1,4 @@
|
|
-5.0.0
|
|
+5.0.1+dev0-2022-12-15
|
|
|
|
# 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 ba48c00277..78049eaab0 100644
|
|
--- a/build-aux/ocaml_version.m4
|
|
+++ b/build-aux/ocaml_version.m4
|
|
@@ -25,7 +25,7 @@
|
|
# The following macro, OCAML__DEVELOPMENT_VERSION, should be either
|
|
# [true] of [false].
|
|
|
|
-m4_define([OCAML__DEVELOPMENT_VERSION], [false])
|
|
+m4_define([OCAML__DEVELOPMENT_VERSION], [true])
|
|
|
|
# The three following components (major, minor and patch level) MUST be
|
|
# integers. They MUST NOT be left-padded with zeros and all of them,
|
|
@@ -33,10 +33,10 @@ m4_define([OCAML__DEVELOPMENT_VERSION], [false])
|
|
|
|
m4_define([OCAML__VERSION_MAJOR], [5])
|
|
m4_define([OCAML__VERSION_MINOR], [0])
|
|
-m4_define([OCAML__VERSION_PATCHLEVEL], [0])
|
|
+m4_define([OCAML__VERSION_PATCHLEVEL], [1])
|
|
# Note that the OCAML__VERSION_EXTRA string defined below is always empty
|
|
# for officially-released versions of OCaml.
|
|
-m4_define([OCAML__VERSION_EXTRA], [])
|
|
+m4_define([OCAML__VERSION_EXTRA], [dev0-2022-12-15])
|
|
|
|
# The OCAML__VERSION_EXTRA_PREFIX macro defined below should be a
|
|
# single character:
|
|
diff --git a/configure b/configure
|
|
index 19764d19a9b8fb1a9f01868f8f7863733a4c4ecd..f54df41388272a49e583ca20f325508c5b814eff 100755
|
|
GIT binary patch
|
|
delta 558
|
|
zcmX?bMfKV>)eSNnf`-~DsbvPbMg~Skx`sexx>=UvgA=CkWIk^hOwrBS-boQyg!>lT
|
|
z^I#D^w|=RVFoum>>61UO%Wj^0>LnI?x7YGA-j2jHYkHy%qwMsubVfN$x$RTa8SPkv
|
|
zFfE!a6)I(ITT)b-%EjgH?C9$gALQ!e>KN=A?-~&j<Y=oNoS&Pjpb?N$TCAg>gcdML
|
|
zn(EW}a~M6D47nz63=t8qMU&s2pTqc^h0$<&pc<q4^twVuX?`>n(`ObkI${VGs4{AT
|
|
zl=Ds(C}Lzq($6>DyNHn&(|gk&sxgYT=M^ymF%u9o12N0?ydu`PGG?IP+Aq9d1!A`C
|
|
q7hbSOxPU~a14U%Fd+Kt$%*A3FFo1ow*U#pd&5kL#U3xKx>Tv-4Xq`R)
|
|
|
|
delta 271
|
|
zcmcb1P4&PP)eSNnj0T%^IX*Zs8cf#nmH~32y^|t<)Vam>JU~ir!%`_`1FrPRAJ}C#
|
|
ze?IjRsBZgPUdG#zj0V#$>M+Vq|CY`u2NYAyV6<alGT@r*6)L4*o0gbUoXW-J@9gO7
|
|
z6CdR2<LVgf8t)nr669#>m!Fq9{ZtO4CrI(b5D`Y(?UuQW&sl)xDHbt0O)n~9be#S`
|
|
zl~Hqge<33;n}VqU5P+mi`GP}&JpJ4iVw6nv4D<}z1B)4fm<foPftY1`U@>cP84Jkj
|
|
x_Tw*EftYRk@t5ooE?}YQKq1-f_IeyIbAdJiec-dbbq>dDcA(P@mvE>a2LKy+Taf?&
|
|
|
|
diff --git a/ocaml-variants.opam b/ocaml-variants.opam
|
|
index 5928f357f2..a0876e02c9 100644
|
|
--- a/ocaml-variants.opam
|
|
+++ b/ocaml-variants.opam
|
|
@@ -1,9 +1,9 @@
|
|
opam-version: "2.0"
|
|
-version: "5.0.0"
|
|
+version: "5.0.1+trunk"
|
|
license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
|
|
-synopsis: "Official release of OCaml 5.0.0"
|
|
+synopsis: "OCaml development version"
|
|
depends: [
|
|
- "ocaml" {= "5.0.0" & post}
|
|
+ "ocaml" {= "5.0.1" & post}
|
|
"base-unix" {post}
|
|
"base-bigarray" {post}
|
|
"base-threads" {post}
|
|
--
|
|
2.41.0
|
|
|