From e267b60f20c242f919e508652e2c11cb578ffa16 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sat, 18 Jul 2020 14:32:25 +0200 Subject: Release version 2.5.0-b.19 --- 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 fa705b4..7a7b686 100644 --- a/manifest +++ b/manifest @@ -1,6 +1,6 @@ : 1 name: libodb-qt -version: 2.5.0-b.18.z +version: 2.5.0-b.19 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.12.0 depends: * bpkg >= 0.12.0 -depends: libodb [2.5.0-b.18.1 2.5.0-b.19) +depends: libodb == 2.5.0-b.19 diff --git a/odb/qt/version-build2.hxx.in b/odb/qt/version-build2.hxx.in index 42684db..04f43b8 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 2046800 +#define ODB_QT_VERSION 2046900 // The numeric version format is AAAAABBBBBCCCCCDDDE where: // diff --git a/odb/qt/version.hxx b/odb/qt/version.hxx index ef4cae9..c372cee 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 != 20468 +#if ODB_VERSION != 20469 # error incompatible odb interface version detected #endif // ODB Qt interface version: odb interface version plus the Qt interface // version. // -#define ODB_QT_VERSION 2046800 -#define ODB_QT_VERSION_STR "2.5.0-b.18" +#define ODB_QT_VERSION 2046900 +#define ODB_QT_VERSION_STR "2.5.0-b.19" // 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 2049968 -#define LIBODB_QT_VERSION_STR "2.5.0-b.18" +#define LIBODB_QT_VERSION 2049969 +#define LIBODB_QT_VERSION_STR "2.5.0-b.19" #include diff --git a/odb/qt/version.options b/odb/qt/version.options index 56d0c75..8111e10 100644 --- a/odb/qt/version.options +++ b/odb/qt/version.options @@ -11,6 +11,6 @@ # --hxx-prologue '#include ' ---hxx-prologue '#if ODB_QT_VERSION != 2046800 // 2.5.0-b.18' +--hxx-prologue '#if ODB_QT_VERSION != 2046900 // 2.5.0-b.19' --hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions' --hxx-prologue '#endif' diff --git a/version b/version index a9b5191..ea83ada 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.5.0-b.18 +2.5.0-b.19 -- cgit v1.1