MonetDB: default - Merge with Feb2013 branch.

[Sjoerd Mullender]

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

Merge with Feb2013 branch.


diffs (49 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -534,3 +534,6 @@ 508d02b1f9bf8bac7a86664b092000dd3fd20824
 64caf95db680ce67235697114693cbcf4cc859eb fixed_strict_Windows_compilation
 0ee7e3f578f7ed364682cae20edac923c27dfd86 Feb2013_13
 89679ea95aac8f548c787cd74c35212137f5b56f Feb2013_SP4_release
+e4239a86f8032fd67169ddf4bcea6f37f32a0f8b Feb2013_15
+89679ea95aac8f548c787cd74c35212137f5b56f Feb2013_SP4_release
+11955d7a07f23672650e41dd0c9fbc9e0fc4c1af Feb2013_SP4_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -755,6 +755,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/Maddlog
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Wed Sep 25 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.15-20130925
+- Rebuilt.
+
 * Fri Sep 20 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.13-20130920
 - Rebuilt.
 
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+monetdb (11.15.15-20130925) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Wed, 25 Sep 2013 14:02:36 +0200
+
 monetdb (11.15.13-20130920) unstable; urgency=low
 
   * Rebuilt.
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -42,7 +42,7 @@ GDK_VERSION=9:5:0
 MAPI_VERSION=6:5:0
 
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=14:5:0
+MONETDB5_VERSION=14:6:0
 
 # version of the STREAM library (subdirectory common/stream)
-STREAM_VERSION=4:7:1
+STREAM_VERSION=4:8:1
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list