aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-06-08 10:06:20 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-06-08 10:06:20 +0200
commit9d5760eac1df15dc09c98bb63208b55e8850c3b4 (patch)
tree084b866d7caaa335524ef7de2bf3af73a877f186
parent76f6440cca50b5e7471adf0cf7fcace944d63c11 (diff)
Release version 2.5.0-b.15v2.5.0-b.15
-rw-r--r--manifest4
-rw-r--r--odb/qt/version-build2.hxx.in2
-rw-r--r--odb/qt/version.hxx10
-rw-r--r--odb/qt/version.options2
-rw-r--r--version2
5 files changed, 10 insertions, 10 deletions
diff --git a/manifest b/manifest
index 9c38049..376e6a5 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
: 1
name: libodb-qt
-version: 2.5.0-b.14.z
+version: 2.5.0-b.15
project: odb
summary: Qt ODB profile library
license: GPLv2
@@ -18,4 +18,4 @@ requires: c++11
requires: libqt-core ; Requires not yet packaged libqt-core.
depends: * build2 >= 0.10.0
depends: * bpkg >= 0.10.0
-depends: libodb [2.5.0-b.14.1 2.5.0-b.15)
+depends: libodb == 2.5.0-b.15
diff --git a/odb/qt/version-build2.hxx.in b/odb/qt/version-build2.hxx.in
index 683ccf1..ac6e602 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 2046400
+#define ODB_QT_VERSION 2046500
// The numeric version format is AAAAABBBBBCCCCCDDDE where:
//
diff --git a/odb/qt/version.hxx b/odb/qt/version.hxx
index 8b8a132..8c58123 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 != 20464
+#if ODB_VERSION != 20465
# error incompatible odb interface version detected
#endif
// ODB Qt interface version: odb interface version plus the Qt interface
// version.
//
-#define ODB_QT_VERSION 2046400
-#define ODB_QT_VERSION_STR "2.5.0-b.14"
+#define ODB_QT_VERSION 2046500
+#define ODB_QT_VERSION_STR "2.5.0-b.15"
// 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 2049964
-#define LIBODB_QT_VERSION_STR "2.5.0-b.14"
+#define LIBODB_QT_VERSION 2049965
+#define LIBODB_QT_VERSION_STR "2.5.0-b.15"
#include <odb/post.hxx>
diff --git a/odb/qt/version.options b/odb/qt/version.options
index b4d7dbd..ffc1729 100644
--- a/odb/qt/version.options
+++ b/odb/qt/version.options
@@ -12,6 +12,6 @@
#
--hxx-prologue '#include <odb/qt/version.hxx>'
---hxx-prologue '#if ODB_QT_VERSION != 2046400 // 2.5.0-b.14'
+--hxx-prologue '#if ODB_QT_VERSION != 2046500 // 2.5.0-b.15'
--hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index 17ef4f0..48aee48 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.5.0-b.14
+2.5.0-b.15