aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2023-07-05 10:10:48 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2023-07-05 10:10:48 +0200
commit4df547b027c0011dcc8a47d268a8a29f8a8d67be (patch)
tree1fc4a39d08000d283c53ad7a413f8d4fe5f340f8
parent58030c07bc964711bb1f0699ed781320b33cea0c (diff)
Change version to 2.5.0-b.26.zHEADmaster
-rw-r--r--manifest8
-rw-r--r--odb/boost/version-build2.hxx.in2
-rw-r--r--odb/boost/version.hxx10
-rw-r--r--odb/boost/version.options2
-rw-r--r--version2
5 files changed, 12 insertions, 12 deletions
diff --git a/manifest b/manifest
index e26dff5..9f5da05 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
: 1
name: libodb-boost
-version: 2.5.0-b.25
+version: 2.5.0-b.26.z
project: odb
summary: Boost ODB profile library
license: GPL-2.0-only
@@ -16,6 +16,6 @@ build-warning-email: odb-builds@codesynthesis.com
builds: all
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.25
+depends: * build2 >= 0.16.0-
+depends: * bpkg >= 0.16.0-
+depends: libodb [2.5.0-b.26.1 2.5.0-b.27)
diff --git a/odb/boost/version-build2.hxx.in b/odb/boost/version-build2.hxx.in
index a5890cf..37a1ffc 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 2047500
+#define ODB_BOOST_VERSION 2047600
// The numeric version format is AAAAABBBBBCCCCCDDDE where:
//
diff --git a/odb/boost/version.hxx b/odb/boost/version.hxx
index cc23ad3..c46e21a 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 != 20475
+#if ODB_VERSION != 20476
# error incompatible odb interface version detected
#endif
// ODB Boost interface version: odb interface version plus the Boost interface
// version.
//
-#define ODB_BOOST_VERSION 2047500
-#define ODB_BOOST_VERSION_STR "2.5.0-b.25"
+#define ODB_BOOST_VERSION 2047600
+#define ODB_BOOST_VERSION_STR "2.5.0-b.26"
// 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 2049975
-#define LIBODB_BOOST_VERSION_STR "2.5.0-b.25"
+#define LIBODB_BOOST_VERSION 2049976
+#define LIBODB_BOOST_VERSION_STR "2.5.0-b.26"
#include <odb/post.hxx>
diff --git a/odb/boost/version.options b/odb/boost/version.options
index 585d0e0..904dcc5 100644
--- a/odb/boost/version.options
+++ b/odb/boost/version.options
@@ -7,6 +7,6 @@
#
--hxx-prologue '#include <odb/boost/version.hxx>'
---hxx-prologue '#if ODB_BOOST_VERSION != 2047500 // 2.5.0-b.25'
+--hxx-prologue '#if ODB_BOOST_VERSION != 2047600 // 2.5.0-b.26'
--hxx-prologue '# error ODB and C++ compilers see different libodb-boost interface versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index 2636902..6bc2f39 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.5.0-b.25
+2.5.0-b.26