From 6b5046f3f299ee32d3d04fabbd8f214fe7972290 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 21 Feb 2019 16:24:13 +0200 Subject: Change version to 2.5.0-b.12.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 f142008..4bf4797 100644 --- a/manifest +++ b/manifest @@ -1,6 +1,6 @@ : 1 name: libodb-qt -version: 2.5.0-b.11+1 +version: 2.5.0-b.12.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.8.0- -depends: * bpkg >= 0.8.0- -depends: libodb == 2.5.0-b.11 +depends: * build2 >= 0.9.0 +depends: * bpkg >= 0.9.0 +depends: libodb [2.5.0-b.12.1 2.5.0-b.13) diff --git a/odb/qt/version-build2.hxx.in b/odb/qt/version-build2.hxx.in index 3912bea..01c998a 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 2046100 +#define ODB_QT_VERSION 2046200 // Note: using build2 standard versioning scheme. The numeric version format // is AAABBBCCCDDDE where: diff --git a/odb/qt/version.hxx b/odb/qt/version.hxx index 6e5b515..b5c9eca 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 != 20461 +#if ODB_VERSION != 20462 # error incompatible odb interface version detected #endif // ODB Qt interface version: odb interface version plus the Qt interface // version. // -#define ODB_QT_VERSION 2046100 -#define ODB_QT_VERSION_STR "2.5.0-b.11" +#define ODB_QT_VERSION 2046200 +#define ODB_QT_VERSION_STR "2.5.0-b.12" // 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 2049961 -#define LIBODB_QT_VERSION_STR "2.5.0-b.11" +#define LIBODB_QT_VERSION 2049962 +#define LIBODB_QT_VERSION_STR "2.5.0-b.12" #include diff --git a/odb/qt/version.options b/odb/qt/version.options index 45435ca..eb4e88b 100644 --- a/odb/qt/version.options +++ b/odb/qt/version.options @@ -12,6 +12,6 @@ # --hxx-prologue '#include ' ---hxx-prologue '#if ODB_QT_VERSION != 2046100 // 2.5.0-b.11' +--hxx-prologue '#if ODB_QT_VERSION != 2046200 // 2.5.0-b.12' --hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions' --hxx-prologue '#endif' diff --git a/version b/version index 3ba4219..4a125a9 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.5.0-b.11 +2.5.0-b.12 -- cgit v1.1