MonetDB: default - Merge with Oct2014 branch.

[Sjoerd Mullender]

Changeset: f8519f8d3562 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f8519f8d3562
Modified Files:
        .hgtags
        MonetDB.spec
        debian/changelog
        libversions
Branch: default
Log Message:

Merge with Oct2014 branch.


diffs (55 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -578,3 +578,6 @@ 6c7d5f562fcb044b745c871344c25b1c6bab7cf4
 3899334ca1f3c13924e8bd22d2afab8ab468e5ba Oct2014_root
 0dd4a291a01def38d0d2f0a96559ea8c73a56b3f Oct2014_1
 4f894ebf1a93ae895ec23d54ce2112bf21a6427e Oct2014_release
+e92e434d19b7308c2952d50978c2cfd78e1bdb80 Oct2014_3
+4f894ebf1a93ae895ec23d54ce2112bf21a6427e Oct2014_release
+88a29a5a2bef5c6cef6b3bfa5ab7c4d3b855a2c8 Oct2014_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -960,6 +960,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Tue Oct 28 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.3-20141028
+- Rebuilt.
+
 * Fri Oct 24 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.1-20141024
 - Rebuilt.
 - BZ#2618: Implement master slave scheme
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+monetdb (11.19.3-20141028) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 28 Oct 2014 09:02:24 +0100
+
 monetdb (11.19.1-20141024) 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=11:0:0
+GDK_VERSION=11:1:0
 
 # version of the MAPI library (subdirectory clients/mapilib)
 MAPI_VERSION=7:0:0
 
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=17:0:0
+MONETDB5_VERSION=17:1:0
 
 # version of the STREAM library (subdirectory common/stream)
 STREAM_VERSION=6:0:0
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list