diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2020-07-21 15:13:40 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2020-07-21 15:13:40 +0200 |
commit | 99c163f1954f6b337efb0d97f928386a00426aec (patch) | |
tree | 1b6c78e095e9b7ca4fafc3848bd6a603b2ea644a | |
parent | e267b60f20c242f919e508652e2c11cb578ffa16 (diff) |
Change version to 2.5.0-b.20.z
-rw-r--r-- | manifest | 8 | ||||
-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, 12 insertions, 12 deletions
@@ -1,6 +1,6 @@ : 1 name: libodb-qt -version: 2.5.0-b.19 +version: 2.5.0-b.20.z project: odb summary: Qt ODB profile library license: GPL-2.0-only @@ -16,6 +16,6 @@ build-email: odb-builds@codesynthesis.com builds: all requires: c++11 requires: libqt-core ; Requires not yet packaged libqt-core. -depends: * build2 >= 0.12.0 -depends: * bpkg >= 0.12.0 -depends: libodb == 2.5.0-b.19 +depends: * build2 >= 0.13.0 +depends: * bpkg >= 0.13.0 +depends: libodb [2.5.0-b.20.1 2.5.0-b.21) diff --git a/odb/qt/version-build2.hxx.in b/odb/qt/version-build2.hxx.in index 04f43b8..776e2c1 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 2046900 +#define ODB_QT_VERSION 2047000 // The numeric version format is AAAAABBBBBCCCCCDDDE where: // diff --git a/odb/qt/version.hxx b/odb/qt/version.hxx index c372cee..7a44b7c 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 != 20469 +#if ODB_VERSION != 20470 # error incompatible odb interface version detected #endif // ODB Qt interface version: odb interface version plus the Qt interface // version. // -#define ODB_QT_VERSION 2046900 -#define ODB_QT_VERSION_STR "2.5.0-b.19" +#define ODB_QT_VERSION 2047000 +#define ODB_QT_VERSION_STR "2.5.0-b.20" // 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 2049969 -#define LIBODB_QT_VERSION_STR "2.5.0-b.19" +#define LIBODB_QT_VERSION 2049970 +#define LIBODB_QT_VERSION_STR "2.5.0-b.20" #include <odb/post.hxx> diff --git a/odb/qt/version.options b/odb/qt/version.options index 8111e10..54e847c 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 != 2046900 // 2.5.0-b.19' +--hxx-prologue '#if ODB_QT_VERSION != 2047000 // 2.5.0-b.20' --hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions' --hxx-prologue '#endif' @@ -1 +1 @@ -2.5.0-b.19 +2.5.0-b.20 |