From d86c4a436f78c761cb225987742188c08cdbeef4 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 21 Nov 2019 06:30:31 +0200 Subject: Change version to 2.5.0-b.18.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 91abc9b..3801d87 100644 --- a/manifest +++ b/manifest @@ -1,6 +1,6 @@ : 1 name: libodb-qt -version: 2.5.0-b.17 +version: 2.5.0-b.18.z project: odb summary: Qt ODB profile library license: GPLv2 @@ -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.11.0 -depends: * bpkg >= 0.11.0 -depends: libodb == 2.5.0-b.17 +depends: * build2 >= 0.12.0 +depends: * bpkg >= 0.12.0 +depends: libodb [2.5.0-b.18.1 2.5.0-b.19) diff --git a/odb/qt/version-build2.hxx.in b/odb/qt/version-build2.hxx.in index 3b479cf..10791c8 100644 --- a/odb/qt/version-build2.hxx.in +++ b/odb/qt/version-build2.hxx.in @@ -6,7 +6,7 @@ // @@ TODO: need to derive automatically (it is also hardcoded in *.options). // -#define ODB_QT_VERSION 2046700 +#define ODB_QT_VERSION 2046800 // The numeric version format is AAAAABBBBBCCCCCDDDE where: // diff --git a/odb/qt/version.hxx b/odb/qt/version.hxx index 162f051..5e50a31 100644 --- a/odb/qt/version.hxx +++ b/odb/qt/version.hxx @@ -32,23 +32,23 @@ // Check that we have compatible ODB version. // -#if ODB_VERSION != 20467 +#if ODB_VERSION != 20468 # error incompatible odb interface version detected #endif // ODB Qt interface version: odb interface version plus the Qt interface // version. // -#define ODB_QT_VERSION 2046700 -#define ODB_QT_VERSION_STR "2.5.0-b.17" +#define ODB_QT_VERSION 2046800 +#define ODB_QT_VERSION_STR "2.5.0-b.18" // 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 2049967 -#define LIBODB_QT_VERSION_STR "2.5.0-b.17" +#define LIBODB_QT_VERSION 2049968 +#define LIBODB_QT_VERSION_STR "2.5.0-b.18" #include diff --git a/odb/qt/version.options b/odb/qt/version.options index 5af28b1..fc241af 100644 --- a/odb/qt/version.options +++ b/odb/qt/version.options @@ -12,6 +12,6 @@ # --hxx-prologue '#include ' ---hxx-prologue '#if ODB_QT_VERSION != 2046700 // 2.5.0-b.17' +--hxx-prologue '#if ODB_QT_VERSION != 2046800 // 2.5.0-b.18' --hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions' --hxx-prologue '#endif' diff --git a/version b/version index 020c790..a9b5191 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.5.0-b.17 +2.5.0-b.18 -- cgit v1.1