aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 96d0e41..9d70a71 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
: 1
name: libodb-boost
-version: 2.5.0-b.21
+version: 2.5.0-b.22.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.13.0
-depends: * bpkg >= 0.13.0
-depends: libodb == 2.5.0-b.21
+depends: * build2 >= 0.14.0
+depends: * bpkg >= 0.14.0
+depends: libodb [2.5.0-b.22.1 2.5.0-b.23)
diff --git a/odb/boost/version-build2.hxx.in b/odb/boost/version-build2.hxx.in
index 644455f..f852792 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 2047100
+#define ODB_BOOST_VERSION 2047200
// The numeric version format is AAAAABBBBBCCCCCDDDE where:
//
diff --git a/odb/boost/version.hxx b/odb/boost/version.hxx
index 9de9649..3576b02 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 != 20471
+#if ODB_VERSION != 20472
# error incompatible odb interface version detected
#endif
// ODB Boost interface version: odb interface version plus the Boost interface
// version.
//
-#define ODB_BOOST_VERSION 2047100
-#define ODB_BOOST_VERSION_STR "2.5.0-b.21"
+#define ODB_BOOST_VERSION 2047200
+#define ODB_BOOST_VERSION_STR "2.5.0-b.22"
// 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 2049971
-#define LIBODB_BOOST_VERSION_STR "2.5.0-b.21"
+#define LIBODB_BOOST_VERSION 2049972
+#define LIBODB_BOOST_VERSION_STR "2.5.0-b.22"
#include <odb/post.hxx>
diff --git a/odb/boost/version.options b/odb/boost/version.options
index 8b0bf31..171b041 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 != 2047100 // 2.5.0-b.21'
+--hxx-prologue '#if ODB_BOOST_VERSION != 2047200 // 2.5.0-b.22'
--hxx-prologue '# error ODB and C++ compilers see different libodb-boost interface versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index 412a335..6d2beda 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.5.0-b.21
+2.5.0-b.22