From e26c71ff68471adab2e1e1cdc02639912b2578aa Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 20 Oct 2021 09:01:11 +0200 Subject: Change version to 2.5.0-b.22.z --- manifest | 8 ++++---- odb/qt/version-build2.hxx.in | 2 +- odb/qt/version.hxx | 10 +++++----- odb/qt/version.options | 2 +- version | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index aef15fa..31cbbbe 100644 --- a/manifest +++ b/manifest @@ -1,6 +1,6 @@ : 1 name: libodb-qt -version: 2.5.0-b.21 +version: 2.5.0-b.22.z project: odb summary: Qt 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: libqt-core ; Requires not yet packaged libqt-core. -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/qt/version-build2.hxx.in b/odb/qt/version-build2.hxx.in index 47babbc..25d73b9 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 2047100 +#define ODB_QT_VERSION 2047200 // The numeric version format is AAAAABBBBBCCCCCDDDE where: // diff --git a/odb/qt/version.hxx b/odb/qt/version.hxx index 6cd6442..9965709 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 != 20471 +#if ODB_VERSION != 20472 # error incompatible odb interface version detected #endif // ODB Qt interface version: odb interface version plus the Qt interface // version. // -#define ODB_QT_VERSION 2047100 -#define ODB_QT_VERSION_STR "2.5.0-b.21" +#define ODB_QT_VERSION 2047200 +#define ODB_QT_VERSION_STR "2.5.0-b.22" // 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 2049971 -#define LIBODB_QT_VERSION_STR "2.5.0-b.21" +#define LIBODB_QT_VERSION 2049972 +#define LIBODB_QT_VERSION_STR "2.5.0-b.22" #include diff --git a/odb/qt/version.options b/odb/qt/version.options index 00b2516..4aa3fbe 100644 --- a/odb/qt/version.options +++ b/odb/qt/version.options @@ -11,6 +11,6 @@ # --hxx-prologue '#include ' ---hxx-prologue '#if ODB_QT_VERSION != 2047100 // 2.5.0-b.21' +--hxx-prologue '#if ODB_QT_VERSION != 2047200 // 2.5.0-b.22' --hxx-prologue '# error ODB and C++ compilers see different libodb-qt 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 -- cgit v1.1