Changeset: e15bf2847b03 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e15bf2847b03
Modified Files:
Branch: sciql
Log Message:
merge from default branch
diffs (48 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -466,3 +466,6 @@ d9968eb987609db9990da16db1de57737107502f
14ff565c407c49df8512d7a4b29b583b76a505c6 Dec2011_3
d9968eb987609db9990da16db1de57737107502f Dec2011_release
6dbadba38a4635b6319f2ba966f5dde6efab037d Dec2011_release
+2373eb4ee98b690aa72b86bebf4b2b47c87aa77c Dec2011_5
+6dbadba38a4635b6319f2ba966f5dde6efab037d Dec2011_release
+32665cf67d03011ff1fcc2c8e118370c47e5fae6 Dec2011_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -626,6 +626,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
rm -fr $RPM_BUILD_ROOT
%changelog
+* Fri Jan 20 2012 Sjoerd Mullender <sjo...@acm.org> - 11.7.5-20120120
+- Rebuilt.
+
* Tue Jan 17 2012 Sjoerd Mullender <sjo...@acm.org> - 11.7.3-20120117
- Rebuilt.
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+monetdb (11.7.5-20120120) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 20 Jan 2012 15:00:25 +0100
+
monetdb (11.7.3-20120117) unstable; urgency=low
* Rebuilt.
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -38,7 +38,7 @@ GDK_VERSION=4:4:0
MAPI_VERSION=5:0:0
# version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=10:1:0
+MONETDB5_VERSION=10:2:0
# version of the STREAM library (subdirectory common/stream)
STREAM_VERSION=3:0:0
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
