diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2022-07-29 09:50:27 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2022-07-29 09:50:27 +0200 |
commit | 810d8974ce583f1b2a91d2b08499d710dc1c50f3 (patch) | |
tree | e4f00bbc211198336ffa1a9e84021a2a11c7f36c | |
parent | 3fdb5b377b1630bd46ca48d7e8d52b4ef657c9a7 (diff) |
Change version to 2.5.0-b.24.z
-rw-r--r-- | manifest | 4 | ||||
-rw-r--r-- | odb/qt/version-build2.hxx.in | 2 | ||||
-rw-r--r-- | odb/qt/version.hxx | 10 | ||||
-rw-r--r-- | odb/qt/version.options | 2 | ||||
-rw-r--r-- | version | 2 |
5 files changed, 10 insertions, 10 deletions
@@ -1,6 +1,6 @@ : 1 name: libodb-qt -version: 2.5.0-b.23 +version: 2.5.0-b.24.z project: odb summary: Qt ODB profile library license: GPL-2.0-only @@ -18,4 +18,4 @@ requires: c++11 requires: libqt-core ; Requires not yet packaged libqt-core. 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/qt/version-build2.hxx.in b/odb/qt/version-build2.hxx.in index d3df25c..9977be3 100644 --- a/odb/qt/version-build2.hxx.in +++ b/odb/qt/version-build2.hxx.in @@ -5,7 +5,7 @@ // @@ TODO: need to derive automatically (it is also hardcoded in *.options). // -#define ODB_QT_VERSION 2047300 +#define ODB_QT_VERSION 2047400 // The numeric version format is AAAAABBBBBCCCCCDDDE where: // diff --git a/odb/qt/version.hxx b/odb/qt/version.hxx index 6f1dad2..c370374 100644 --- a/odb/qt/version.hxx +++ b/odb/qt/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 Qt interface version: odb interface version plus the Qt interface // version. // -#define ODB_QT_VERSION 2047300 -#define ODB_QT_VERSION_STR "2.5.0-b.23" +#define ODB_QT_VERSION 2047400 +#define ODB_QT_VERSION_STR "2.5.0-b.24" // libodb-qt version: odb interface version plus the bugfix version. Note // that LIBODB_QT_VERSION is always greater or equal to ODB_QT_VERSION // since if the Qt interface virsion is incremented then the bugfix version // must be incremented as well. // -#define LIBODB_QT_VERSION 2049973 -#define LIBODB_QT_VERSION_STR "2.5.0-b.23" +#define LIBODB_QT_VERSION 2049974 +#define LIBODB_QT_VERSION_STR "2.5.0-b.24" #include <odb/post.hxx> diff --git a/odb/qt/version.options b/odb/qt/version.options index 6647dd1..6e65997 100644 --- a/odb/qt/version.options +++ b/odb/qt/version.options @@ -11,6 +11,6 @@ # --hxx-prologue '#include <odb/qt/version.hxx>' ---hxx-prologue '#if ODB_QT_VERSION != 2047300 // 2.5.0-b.23' +--hxx-prologue '#if ODB_QT_VERSION != 2047400 // 2.5.0-b.24' --hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions' --hxx-prologue '#endif' @@ -1 +1 @@ -2.5.0-b.23 +2.5.0-b.24 |