From aed102836f341885dae33e21d9f1f65b86195d1d Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 20 Mar 2019 17:13:50 +0200 Subject: Change version to 2.5.0-b.14.z --- manifest | 8 ++++---- odb/boost/version-build2.hxx.in | 2 +- odb/boost/version.hxx | 10 +++++----- odb/boost/version.options | 2 +- version | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 652b866..12597fc 100644 --- a/manifest +++ b/manifest @@ -1,6 +1,6 @@ : 1 name: libodb-boost -version: 2.5.0-b.13 +version: 2.5.0-b.14.z project: odb summary: Boost ODB profile library license: GPLv2 @@ -16,6 +16,6 @@ build-email: odb-builds@codesynthesis.com builds: all requires: c++11 requires: libboost ; Requires not yet packaged libboost. -depends: * build2 >= 0.9.0 -depends: * bpkg >= 0.9.0 -depends: libodb == 2.5.0-b.13 +depends: * build2 >= 0.10.0 +depends: * bpkg >= 0.10.0 +depends: libodb [2.5.0-b.14.1 2.5.0-b.15) diff --git a/odb/boost/version-build2.hxx.in b/odb/boost/version-build2.hxx.in index bc702b2..51fd497 100644 --- a/odb/boost/version-build2.hxx.in +++ b/odb/boost/version-build2.hxx.in @@ -6,7 +6,7 @@ // @@ TODO: need to derive automatically (it is also hardcoded in *.options). // -#define ODB_BOOST_VERSION 2046300 +#define ODB_BOOST_VERSION 2046400 // Note: using build2 standard versioning scheme. The numeric version format // is AAABBBCCCDDDE where: diff --git a/odb/boost/version.hxx b/odb/boost/version.hxx index 102886d..f026b96 100644 --- a/odb/boost/version.hxx +++ b/odb/boost/version.hxx @@ -32,23 +32,23 @@ // Check that we have compatible ODB version. // -#if ODB_VERSION != 20463 +#if ODB_VERSION != 20464 # error incompatible odb interface version detected #endif // ODB Boost interface version: odb interface version plus the Boost interface // version. // -#define ODB_BOOST_VERSION 2046300 -#define ODB_BOOST_VERSION_STR "2.5.0-b.13" +#define ODB_BOOST_VERSION 2046400 +#define ODB_BOOST_VERSION_STR "2.5.0-b.14" // 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 2049963 -#define LIBODB_BOOST_VERSION_STR "2.5.0-b.13" +#define LIBODB_BOOST_VERSION 2049964 +#define LIBODB_BOOST_VERSION_STR "2.5.0-b.14" #include diff --git a/odb/boost/version.options b/odb/boost/version.options index f402319..3f71a51 100644 --- a/odb/boost/version.options +++ b/odb/boost/version.options @@ -8,6 +8,6 @@ # --hxx-prologue '#include ' ---hxx-prologue '#if ODB_BOOST_VERSION != 2046300 // 2.5.0-b.13' +--hxx-prologue '#if ODB_BOOST_VERSION != 2046400 // 2.5.0-b.14' --hxx-prologue '# error ODB and C++ compilers see different libodb-boost interface versions' --hxx-prologue '#endif' diff --git a/version b/version index e3350c4..17ef4f0 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.5.0-b.13 +2.5.0-b.14 -- cgit v1.1