Changeset: ed641f5d908b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed641f5d908b Modified Files: .hgtags MonetDB.spec debian/changelog libversions Branch: default Log Message:
Merge with Aug2018 branch. diffs (55 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -703,3 +703,6 @@ e96bb94b4c9c3b99e1c33d9c8b49bc3ce7f8e95b 44182a802530768278cf750fd93c829acdde29f1 Aug2018_root 9c824ea44063e239b7251dce71f9af741c682211 Aug2018_1 9c824ea44063e239b7251dce71f9af741c682211 Aug2018_release +2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd Aug2018_3 +9c824ea44063e239b7251dce71f9af741c682211 Aug2018_release +2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd Aug2018_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1032,6 +1032,9 @@ done %postun -p /sbin/ldconfig %changelog +* Tue Aug 21 2018 Sjoerd Mullender <[email protected]> - 11.31.3-20180821 +- Rebuilt. + * Wed Aug 15 2018 Sjoerd Mullender <[email protected]> - 11.31.1-20180815 - Rebuilt. - BZ#4020: Importing timestamp with zone from copy into diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +monetdb (11.31.3) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Tue, 21 Aug 2018 09:59:19 +0200 + monetdb (11.31.1) unstable; urgency=low * Rebuilt. diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -36,13 +36,13 @@ # version of the GDK library (subdirectory gdk; also includes # common/options and common/utils) -GDK_VERSION=17:0:0 +GDK_VERSION=17:1:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=11:0:1 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=25:0:0 +MONETDB5_VERSION=25:1:0 # version of the STREAM library (subdirectory common/stream) STREAM_VERSION=12:0:1 _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
