Changeset: fee036e86f2d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fee036e86f2d
Modified Files:
.hgtags
MonetDB.spec
debian/changelog
libversions
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (66 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -559,3 +559,6 @@ fb702cba0210295b29825b095ed87d92b6645434
14baa1e3a827c26932ec5d853feca28eacd70009 Jan2014_release
28bad4f9c07415a7f784ac6af2494b0333c866a6 Jan2014_11
fa6872e2a8cf8bb3b4fb25a3b356946316f52a6b Jan2014_SP1_release
+45d2af6f6cca3478319a11b5ddae69ecd9f19943 Jan2014_13
+fa6872e2a8cf8bb3b4fb25a3b356946316f52a6b Jan2014_SP1_release
+242fe4b4960f54c339f7a6fb79aedd8f3b5e217a Jan2014_SP1_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -798,6 +798,11 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD
rm -fr $RPM_BUILD_ROOT
%changelog
+* Thu Mar 06 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.13-20140306
+- Rebuilt.
+- BZ#3452: ODBC driver build fails on Mac OS X due to a conflicting
+ types for the SQLColAttribute with the unixODBC library
+
* Mon Mar 03 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.11-20140303
- Rebuilt.
- BZ#3442: COPY INTO ... LOCKED reports incorrect count
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+monetdb (11.17.13-20140306) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Thu, 06 Mar 2014 11:48:51 +0100
+
+monetdb (11.17.13-20140306) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#3452: ODBC driver build fails on Mac OS X due to a conflicting
+ types for the SQLColAttribute with the unixODBC library
+
+ -- Sjoerd Mullender <sjo...@acm.org> Thu, 06 Mar 2014 11:48:50 +0100
+
monetdb (11.17.11-20140303) 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=10:5:0
+GDK_VERSION=10:6:0
# version of the MAPI library (subdirectory clients/mapilib)
MAPI_VERSION=6:5:0
# version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=16:5:0
+MONETDB5_VERSION=16:6:0
# version of the STREAM library (subdirectory common/stream)
-STREAM_VERSION=5:1:0
+STREAM_VERSION=5:2:0
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
