From eaa37669078bd0a36e553e82987b8db3983ab9bb Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sat, 16 Oct 2021 11:12:52 +0200 Subject: Release version 2.5.0-b.21 --- manifest | 4 ++-- odb/qt/version-build2.hxx.in | 2 +- odb/qt/version.hxx | 10 +++++----- odb/qt/version.options | 2 +- version | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 04d3788..aef15fa 100644 --- a/manifest +++ b/manifest @@ -1,6 +1,6 @@ : 1 name: libodb-qt -version: 2.5.0-b.20.z +version: 2.5.0-b.21 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.13.0 depends: * bpkg >= 0.13.0 -depends: libodb [2.5.0-b.20.1 2.5.0-b.21) +depends: libodb == 2.5.0-b.21 diff --git a/odb/qt/version-build2.hxx.in b/odb/qt/version-build2.hxx.in index 776e2c1..47babbc 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 2047000 +#define ODB_QT_VERSION 2047100 // The numeric version format is AAAAABBBBBCCCCCDDDE where: // diff --git a/odb/qt/version.hxx b/odb/qt/version.hxx index 7a44b7c..6cd6442 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 != 20470 +#if ODB_VERSION != 20471 # error incompatible odb interface version detected #endif // ODB Qt interface version: odb interface version plus the Qt interface // version. // -#define ODB_QT_VERSION 2047000 -#define ODB_QT_VERSION_STR "2.5.0-b.20" +#define ODB_QT_VERSION 2047100 +#define ODB_QT_VERSION_STR "2.5.0-b.21" // 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 2049970 -#define LIBODB_QT_VERSION_STR "2.5.0-b.20" +#define LIBODB_QT_VERSION 2049971 +#define LIBODB_QT_VERSION_STR "2.5.0-b.21" #include diff --git a/odb/qt/version.options b/odb/qt/version.options index 54e847c..00b2516 100644 --- a/odb/qt/version.options +++ b/odb/qt/version.options @@ -11,6 +11,6 @@ # --hxx-prologue '#include ' ---hxx-prologue '#if ODB_QT_VERSION != 2047000 // 2.5.0-b.20' +--hxx-prologue '#if ODB_QT_VERSION != 2047100 // 2.5.0-b.21' --hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions' --hxx-prologue '#endif' diff --git a/version b/version index a60117f..412a335 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.5.0-b.20 +2.5.0-b.21 -- cgit v1.1