MonetDB: default - Merge with Oct2014 branch.

[Sjoerd Mullender]

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

Merge with Oct2014 branch.


diffs (48 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -583,3 +583,6 @@ 4f894ebf1a93ae895ec23d54ce2112bf21a6427e
 88a29a5a2bef5c6cef6b3bfa5ab7c4d3b855a2c8 Oct2014_release
 eb2967c408350131b63f5393704fd697c701fc49 Oct2014_5
 2da8cbcb65ed56690bad29f089d996eac347b48d Oct2014_SP1_release
+ee3d8e3af6aae6be6cfaa876a379a0751f164e97 Oct2014_7
+2da8cbcb65ed56690bad29f089d996eac347b48d Oct2014_SP1_release
+6607367487d91eb02c5eb7dfb9d96606f8f7c6f0 Oct2014_SP1_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
+* Fri Nov 21 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.7-20141121
+- Rebuilt.
+
 * Thu Nov 20 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120
 - Rebuilt.
 - BZ#3580: cosmetic change (append newline)
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+monetdb (11.19.7-20141121) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Fri, 21 Nov 2014 10:14:18 +0100
+
 monetdb (11.19.5-20141120) 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=11:2:0
+GDK_VERSION=11:3:0
 
 # version of the MAPI library (subdirectory clients/mapilib)
 MAPI_VERSION=7:1:0
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list