Changeset: 5b74800dbdff for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5b74800dbdff
Modified Files:
        .hgtags
        MonetDB.spec
        buildtools/ChangeLog-Archive
        buildtools/ChangeLog.Aug2018
        debian/changelog
        libversions
Branch: default
Log Message:

Merge with Aug2018 branch.


diffs (112 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -712,3 +712,5 @@ 3aaf6c916bd870cc478d3973241bc24cafbe1655
 a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_7
 3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_release
 a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_release
+a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_9
+a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_SP1_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -108,7 +108,7 @@ Vendor: MonetDB BV <[email protected]>
 Group: Applications/Databases
 License: MPLv2.0
 URL: https://www.monetdb.org/
-Source: 
https://www.monetdb.org/downloads/sources/Aug2018/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Aug2018-SP1/%{name}-%{version}.tar.bz2
 
 # we need systemd for the _unitdir macro to exist
 # we need checkpolicy and selinux-policy-devel for the SELinux policy
@@ -1038,6 +1038,18 @@ done
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Oct 05 2018 Sjoerd Mullender <[email protected]> - 11.31.9-20181005
+- Rebuilt.
+- BZ#6640: timestamp_to_str returning incorrectly adjusted results
+- BZ#6641: race condition in SQL UDF with update
+- BZ#6642: Hanging query
+- BZ#6646: Example SQLcopyinto.java does not work
+
+* Wed Oct  3 2018 Sjoerd Mullender <[email protected]> - 11.31.9-20181005
+- buildtools: On Ubuntu 18.10 (Cosmic Cuttlefish), the libmonetdb5-server-bam 
package
+  cannot be built because of an incompatibility in the libbam library
+  (it cannot be used in a shared object.
+
 * Wed Aug 29 2018 Sjoerd Mullender <[email protected]> - 11.31.7-20180829
 - Rebuilt.
 
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,11 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Wed Oct  3 2018 Sjoerd Mullender <[email protected]> - 11.31.9-20181005
+- On Ubuntu 18.10 (Cosmic Cuttlefish), the libmonetdb5-server-bam package
+  cannot be built because of an incompatibility in the libbam library
+  (it cannot be used in a shared object.
+
 * Tue Aug 28 2018 Sjoerd Mullender <[email protected]> - 11.31.5-20180829
 - Build the MonetDB-cfitsio RPM and libmonetdb5-server-cfitsio
   Debian/Ubuntu package.
diff --git a/buildtools/ChangeLog.Aug2018 b/buildtools/ChangeLog.Aug2018
--- a/buildtools/ChangeLog.Aug2018
+++ b/buildtools/ChangeLog.Aug2018
@@ -1,8 +1,3 @@
 # ChangeLog file for buildtools
 # This file is updated with Maddlog
 
-* Wed Oct  3 2018 Sjoerd Mullender <[email protected]>
-- On Ubuntu 18.10 (Cosmic Cuttlefish), the libmonetdb5-server-bam package
-  cannot be built because of an incompatibility in the libbam library
-  (it cannot be used in a shared object.
-
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+monetdb (11.31.9) unstable; urgency=low
+
+  * Rebuilt.
+  * BZ#6640: timestamp_to_str returning incorrectly adjusted results
+  * BZ#6641: race condition in SQL UDF with update
+  * BZ#6642: Hanging query
+  * BZ#6646: Example SQLcopyinto.java does not work
+
+ -- Sjoerd Mullender <[email protected]>  Fri, 05 Oct 2018 09:50:02 +0200
+
+monetdb (11.31.9) unstable; urgency=low
+
+  * buildtools: On Ubuntu 18.10 (Cosmic Cuttlefish), the 
libmonetdb5-server-bam package
+    cannot be built because of an incompatibility in the libbam library
+    (it cannot be used in a shared object.
+
+ -- Sjoerd Mullender <[email protected]>  Wed, 3 Oct 2018 09:50:02 +0200
+
 monetdb (11.31.7) 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:1:0
+GDK_VERSION=17:2: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:2:0
+MONETDB5_VERSION=25:3:0
 
 # version of the STREAM library (subdirectory common/stream)
-STREAM_VERSION=12:0:1
+STREAM_VERSION=12:1:1
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to