Changeset: f7b09270c290 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f7b09270c290
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
@@ -550,3 +550,6 @@ 0dde9d886d08c52bb27f6517dafd91101bf66246
ffb7f23188e48470dfe38d4821c675c99c8fef71 Jan2014_5
0dde9d886d08c52bb27f6517dafd91101bf66246 Jan2014_release
493536e9b1f592ef08778febca455c329945cd91 Jan2014_release
+b0ebdc497497292f4a6cb340da3e1340e3407466 Jan2014_7
+493536e9b1f592ef08778febca455c329945cd91 Jan2014_release
+fb702cba0210295b29825b095ed87d92b6645434 Jan2014_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
+* Fri Feb 07 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.7-20140207
+- Rebuilt.
+- BZ#3436: COPY INTO from file containing leading Byte Order Mark (BOM)
+ causes corruption
+
* Thu Feb 06 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.5-20140206
- Rebuilt.
- BZ#3420: Database does not start after upgrade
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+monetdb (11.17.7-20140207) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 07 Feb 2014 12:53:25 +0100
+
+monetdb (11.17.7-20140207) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#3436: COPY INTO from file containing leading Byte Order Mark (BOM)
+ causes corruption
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 07 Feb 2014 12:53:23 +0100
+
monetdb (11.17.5-20140206) 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:2:0
+GDK_VERSION=10:3: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:2:0
+MONETDB5_VERSION=16:3:0
# version of the STREAM library (subdirectory common/stream)
-STREAM_VERSION=5:0:0
+STREAM_VERSION=5:1:0
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
