aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-03-18 16:01:55 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-03-18 16:01:55 +0200
commit3f3e998cd0be92b858572135f04a4c3c9d0e075f (patch)
treeb9c4e27867566eed0a8471b49cfd7600121b170c
parent579f30582ea556af158f0c923120cb3d2c259133 (diff)
Release version 2.5.0-b.13v2.5.0-b.13
-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 925e22f..92e86b6 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
: 1
name: libodb-qt
-version: 2.5.0-b.12.z
+version: 2.5.0-b.13
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.9.0
depends: * bpkg >= 0.9.0
-depends: libodb [2.5.0-b.12.1 2.5.0-b.13)
+depends: libodb == 2.5.0-b.13
diff --git a/odb/qt/version-build2.hxx.in b/odb/qt/version-build2.hxx.in
index 01c998a..32bb537 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 2046200
+#define ODB_QT_VERSION 2046300
// 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 b5c9eca..8b97fb8 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 != 20462
+#if ODB_VERSION != 20463
# error incompatible odb interface version detected
#endif
// ODB Qt interface version: odb interface version plus the Qt interface
// version.
//
-#define ODB_QT_VERSION 2046200
-#define ODB_QT_VERSION_STR "2.5.0-b.12"
+#define ODB_QT_VERSION 2046300
+#define ODB_QT_VERSION_STR "2.5.0-b.13"
// 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 2049962
-#define LIBODB_QT_VERSION_STR "2.5.0-b.12"
+#define LIBODB_QT_VERSION 2049963
+#define LIBODB_QT_VERSION_STR "2.5.0-b.13"
#include <odb/post.hxx>
diff --git a/odb/qt/version.options b/odb/qt/version.options
index eb4e88b..0f3c955 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 != 2046200 // 2.5.0-b.12'
+--hxx-prologue '#if ODB_QT_VERSION != 2046300 // 2.5.0-b.13'
--hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index 4a125a9..e3350c4 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.5.0-b.12
+2.5.0-b.13