Changeset: b6b7ff0e7672 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b6b7ff0e7672
Modified Files:
.hgtags
MonetDB.spec
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Jun2016
debian/changelog
libversions
Branch: default
Log Message:
Merge with Jun2016 branch.
diffs (93 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -634,3 +634,6 @@ 4a05df3932a97865ac7e4037361723d5563490b3
c8b06c670a635978640d742643c317b82c5f4b8c Jun2016_SP1_release
731a25ce40993c0d73ee4fcefb286b9a0a2e0981 Jun2016_9
731a25ce40993c0d73ee4fcefb286b9a0a2e0981 Jun2016_SP2_release
+f16cdfed96bdc0f3324f8ced85a8b74c67f4dc9b Jun2016_11
+731a25ce40993c0d73ee4fcefb286b9a0a2e0981 Jun2016_SP2_release
+f16cdfed96bdc0f3324f8ced85a8b74c67f4dc9b Jun2016_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -899,6 +899,13 @@ rm -f %{buildroot}%{_bindir}/Maddlog
%postun -p /sbin/ldconfig
%changelog
+* Wed Sep 28 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.11-20160928
+- Rebuilt.
+
+* Mon Sep 26 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.11-20160928
+- buildtools: We now use the CommonCrypto library instead of the OpenSSL
library
+ on Darwin.
+
* Mon Sep 19 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.9-20160919
- Rebuilt.
- BZ#3939: Assert failure on concurrent queries when querying sys.queue
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Mon Sep 26 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.11-20160928
+- We now use the CommonCrypto library instead of the OpenSSL library
+ on Darwin.
+
* Fri Feb 26 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.1-20160601
- A new package MonetDB-lidar (Fedora) or libmonetdb5-server-lidar
(Debian/Ubuntu) has been created to work with LiDAR data.
diff --git a/buildtools/ChangeLog.Jun2016 b/buildtools/ChangeLog.Jun2016
--- a/buildtools/ChangeLog.Jun2016
+++ b/buildtools/ChangeLog.Jun2016
@@ -1,7 +1,3 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
-* Mon Sep 26 2016 Sjoerd Mullender <sjo...@acm.org>
-- We now use the CommonCrypto library instead of the OpenSSL library
- on Darwin.
-
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+monetdb (11.23.11) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Wed, 28 Sep 2016 13:47:01 +0200
+
+monetdb (11.23.11) unstable; urgency=low
+
+ * buildtools: We now use the CommonCrypto library instead of the OpenSSL
library
+ on Darwin.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Mon, 26 Sep 2016 13:47:01 +0200
+
monetdb (11.23.9) 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=13:4:0
+GDK_VERSION=13:5:0
# version of the MAPI library (subdirectory clients/mapilib)
-MAPI_VERSION=8:0:0
+MAPI_VERSION=8:1:0
# version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=21:4:0
+MONETDB5_VERSION=21:5:0
# version of the STREAM library (subdirectory common/stream)
-STREAM_VERSION=8:2:0
+STREAM_VERSION=8:3:0
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
