From 1fdcf34fa7140ec473d65a03658336c5387ef846 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 29 Jul 2022 09:50:27 +0200 Subject: Change version to 2.5.0-b.24.z --- manifest | 4 ++-- odb/boost/version-build2.hxx.in | 2 +- odb/boost/version.hxx | 10 +++++----- odb/boost/version.options | 2 +- version | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 23fe5c0..9d0c209 100644 --- a/manifest +++ b/manifest @@ -1,6 +1,6 @@ : 1 name: libodb-boost -version: 2.5.0-b.23 +version: 2.5.0-b.24.z project: odb summary: Boost ODB profile library license: GPL-2.0-only @@ -18,4 +18,4 @@ requires: c++11 requires: libboost ; Requires not yet packaged libboost. depends: * build2 >= 0.15.0- depends: * bpkg >= 0.15.0- -depends: libodb == 2.5.0-b.23 +depends: libodb [2.5.0-b.24.1 2.5.0-b.25) diff --git a/odb/boost/version-build2.hxx.in b/odb/boost/version-build2.hxx.in index 1b8fbeb..17e901b 100644 --- a/odb/boost/version-build2.hxx.in +++ b/odb/boost/version-build2.hxx.in @@ -5,7 +5,7 @@ // @@ TODO: need to derive automatically (it is also hardcoded in *.options). // -#define ODB_BOOST_VERSION 2047300 +#define ODB_BOOST_VERSION 2047400 // The numeric version format is AAAAABBBBBCCCCCDDDE where: // diff --git a/odb/boost/version.hxx b/odb/boost/version.hxx index c59b532..fb74e05 100644 --- a/odb/boost/version.hxx +++ b/odb/boost/version.hxx @@ -31,23 +31,23 @@ // Check that we have compatible ODB version. // -#if ODB_VERSION != 20473 +#if ODB_VERSION != 20474 # error incompatible odb interface version detected #endif // ODB Boost interface version: odb interface version plus the Boost interface // version. // -#define ODB_BOOST_VERSION 2047300 -#define ODB_BOOST_VERSION_STR "2.5.0-b.23" +#define ODB_BOOST_VERSION 2047400 +#define ODB_BOOST_VERSION_STR "2.5.0-b.24" // libodb-boost version: odb interface version plus the bugfix version. Note // that LIBODB_BOOST_VERSION is always greater or equal to ODB_BOOST_VERSION // since if the Boost interface virsion is incremented then the bugfix version // must be incremented as well. // -#define LIBODB_BOOST_VERSION 2049973 -#define LIBODB_BOOST_VERSION_STR "2.5.0-b.23" +#define LIBODB_BOOST_VERSION 2049974 +#define LIBODB_BOOST_VERSION_STR "2.5.0-b.24" #include diff --git a/odb/boost/version.options b/odb/boost/version.options index f10a507..badb947 100644 --- a/odb/boost/version.options +++ b/odb/boost/version.options @@ -7,6 +7,6 @@ # --hxx-prologue '#include ' ---hxx-prologue '#if ODB_BOOST_VERSION != 2047300 // 2.5.0-b.23' +--hxx-prologue '#if ODB_BOOST_VERSION != 2047400 // 2.5.0-b.24' --hxx-prologue '# error ODB and C++ compilers see different libodb-boost interface versions' --hxx-prologue '#endif' diff --git a/version b/version index 0a10d59..cd2d927 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.5.0-b.23 +2.5.0-b.24 -- cgit v1.1