Changeset: 61736868abe8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=61736868abe8 Modified Files: .hgtags MonetDB.spec debian/changelog libversions Branch: default Log Message:
Merge with Jan2014 branch. diffs (64 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -569,3 +569,6 @@ 13e1b24f442791f5ab790fa77453d3bd4e88a9c8 389f5f0d4c43ab689e31c28e01b43c8b7ba8de9c Jan2014_SP2_release dc158ade928d0305f3f0e7ef9613dd81329f613d Jan2014_19 0218c4ec31068bd1b9be7d2bb1ccad31e17e8d5f Jan2014_SP3_release +6830d0b9c31fe23954c75014a581f145c7a551ff Jan2014_21 +0218c4ec31068bd1b9be7d2bb1ccad31e17e8d5f Jan2014_SP3_release +6c7d5f562fcb044b745c871344c25b1c6bab7cf4 Jan2014_SP3_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -802,6 +802,11 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD rm -fr $RPM_BUILD_ROOT %changelog +* Fri Jul 25 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.21-20140725 +- Rebuilt. +- BZ#3519: Uppercase TRUE/FALSE strings cannot be converted to boolean + values + * Tue Jul 22 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.19-20140722 - Rebuilt. - BZ#3487: dead link to "Professional services" diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +monetdb (11.17.21-20140725) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 25 Jul 2014 15:09:55 +0200 + +monetdb (11.17.21-20140725) unstable; urgency=low + + * Rebuilt. + * BZ#3519: Uppercase TRUE/FALSE strings cannot be converted to boolean + values + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 25 Jul 2014 15:09:53 +0200 + monetdb (11.17.19-20140722) unstable; urgency=low * Rebuilt. diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -36,7 +36,7 @@ # version of the GDK library (subdirectory gdk; also includes # common/options and common/utils) -GDK_VERSION=10:8:0 +GDK_VERSION=10:9:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=6:5:0 @@ -45,4 +45,4 @@ MAPI_VERSION=6:5:0 MONETDB5_VERSION=16:9:0 # version of the STREAM library (subdirectory common/stream) -STREAM_VERSION=5:5:0 +STREAM_VERSION=5:6:0 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list