aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--buildfile2
-rw-r--r--manifest14
-rw-r--r--odb/boost/version-build2.hxx.in2
-rw-r--r--odb/boost/version.hxx10
-rw-r--r--odb/boost/version.options2
-rw-r--r--version2
6 files changed, 16 insertions, 16 deletions
diff --git a/buildfile b/buildfile
index 28c514a..1c342be 100644
--- a/buildfile
+++ b/buildfile
@@ -1,7 +1,7 @@
# file : buildfile
# license : GNU GPL v2; see accompanying LICENSE file
-./: {*/ -build/ -m4/} doc{INSTALL LICENSE NEWS README} manifest
+./: {*/ -build/ -m4/} doc{INSTALL NEWS README} legal{LICENSE} manifest
# Don't install tests or the INSTALL file.
#
diff --git a/manifest b/manifest
index 838634b..9f5da05 100644
--- a/manifest
+++ b/manifest
@@ -1,10 +1,10 @@
: 1
name: libodb-boost
-version: 2.5.0-b.18.z
+version: 2.5.0-b.26.z
project: odb
summary: Boost ODB profile library
-license: GPLv2
-license: proprietary
+license: GPL-2.0-only
+license: other: proprietary ; Not free/open source.
topics: C++, ORM, Boost, SQL
description-file: README
changes-file: NEWS
@@ -12,10 +12,10 @@ url: https://www.codesynthesis.com/products/odb/
doc-url: https://www.codesynthesis.com/products/odb/doc/manual.xhtml
src-url: https://git.codesynthesis.com/cgit/odb/libodb-boost/
email: odb-users@codesynthesis.com
-build-email: odb-builds@codesynthesis.com
+build-warning-email: odb-builds@codesynthesis.com
builds: all
requires: c++11
requires: libboost ; Requires not yet packaged libboost.
-depends: * build2 >= 0.12.0
-depends: * bpkg >= 0.12.0
-depends: libodb [2.5.0-b.18.1 2.5.0-b.19)
+depends: * build2 >= 0.16.0-
+depends: * bpkg >= 0.16.0-
+depends: libodb [2.5.0-b.26.1 2.5.0-b.27)
diff --git a/odb/boost/version-build2.hxx.in b/odb/boost/version-build2.hxx.in
index aea0466..37a1ffc 100644
--- a/odb/boost/version-build2.hxx.in
+++ b/odb/boost/version-build2.hxx.in
@@ -5,7 +5,7 @@
// @@ TODO: need to derive automatically (it is also hardcoded in *.options).
//
-#define ODB_BOOST_VERSION 2046800
+#define ODB_BOOST_VERSION 2047600
// The numeric version format is AAAAABBBBBCCCCCDDDE where:
//
diff --git a/odb/boost/version.hxx b/odb/boost/version.hxx
index 8f4204b..c46e21a 100644
--- a/odb/boost/version.hxx
+++ b/odb/boost/version.hxx
@@ -31,23 +31,23 @@
// Check that we have compatible ODB version.
//
-#if ODB_VERSION != 20468
+#if ODB_VERSION != 20476
# error incompatible odb interface version detected
#endif
// ODB Boost interface version: odb interface version plus the Boost interface
// version.
//
-#define ODB_BOOST_VERSION 2046800
-#define ODB_BOOST_VERSION_STR "2.5.0-b.18"
+#define ODB_BOOST_VERSION 2047600
+#define ODB_BOOST_VERSION_STR "2.5.0-b.26"
// libodb-boost version: odb interface version plus the bugfix version. Note
// that LIBODB_BOOST_VERSION is always greater or equal to ODB_BOOST_VERSION
// since if the Boost interface virsion is incremented then the bugfix version
// must be incremented as well.
//
-#define LIBODB_BOOST_VERSION 2049968
-#define LIBODB_BOOST_VERSION_STR "2.5.0-b.18"
+#define LIBODB_BOOST_VERSION 2049976
+#define LIBODB_BOOST_VERSION_STR "2.5.0-b.26"
#include <odb/post.hxx>
diff --git a/odb/boost/version.options b/odb/boost/version.options
index 8587cdf..904dcc5 100644
--- a/odb/boost/version.options
+++ b/odb/boost/version.options
@@ -7,6 +7,6 @@
#
--hxx-prologue '#include <odb/boost/version.hxx>'
---hxx-prologue '#if ODB_BOOST_VERSION != 2046800 // 2.5.0-b.18'
+--hxx-prologue '#if ODB_BOOST_VERSION != 2047600 // 2.5.0-b.26'
--hxx-prologue '# error ODB and C++ compilers see different libodb-boost interface versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index a9b5191..6bc2f39 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.5.0-b.18
+2.5.0-b.26