Changeset: 2e21c96f735c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2e21c96f735c Modified Files: .hgtags MonetDB.spec debian/changelog libversions tools/merovingian/ChangeLog-Archive tools/merovingian/ChangeLog.Feb2013 Branch: default Log Message:
Merge with Feb2013 branch. diffs (100 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -532,3 +532,5 @@ 64caf95db680ce67235697114693cbcf4cc859eb 334140294fb20e04aa85ab7f06bc3da45b1ae4f3 before_new_JOIN_implementation 508d02b1f9bf8bac7a86664b092000dd3fd20824 before_reviving_RECYCLER 64caf95db680ce67235697114693cbcf4cc859eb fixed_strict_Windows_compilation +0ee7e3f578f7ed364682cae20edac923c27dfd86 Feb2013_13 +89679ea95aac8f548c787cd74c35212137f5b56f Feb2013_SP4_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -27,7 +27,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Feb2013-SP3/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Feb2013-SP4/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -755,6 +755,13 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/Maddlog rm -fr $RPM_BUILD_ROOT %changelog +* Fri Sep 20 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.13-20130920 +- Rebuilt. + +* Tue Jul 30 2013 Fabian Groffen <fab...@monetdb.org> - 11.15.13-20130920 +- merovingian: monetdb now no longer compresses output when not connected to a terminal, + bug #3292 + * Wed Jun 19 2013 Hannes Muehleisen <han...@cwi.nl> - 11.15.11-20130619 - Rebuilt. diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +monetdb (11.15.13-20130920) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 20 Sep 2013 10:23:23 +0200 + +monetdb (11.15.13-20130920) unstable; urgency=low + + * merovingian: monetdb now no longer compresses output when not connected to a terminal, + bug #3292 + + -- Fabian Groffen <fab...@monetdb.org> Tue, 30 Jul 2013 10:23:22 +0200 + monetdb (11.15.11-20130619) 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=9:4:0 +GDK_VERSION=9:5: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=14:4:0 +MONETDB5_VERSION=14:5:0 # version of the STREAM library (subdirectory common/stream) -STREAM_VERSION=4:6:1 +STREAM_VERSION=4:7:1 diff --git a/tools/merovingian/ChangeLog-Archive b/tools/merovingian/ChangeLog-Archive --- a/tools/merovingian/ChangeLog-Archive +++ b/tools/merovingian/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Jul 30 2013 Fabian Groffen <fab...@monetdb.org> - 11.15.13-20130920 +- monetdb now no longer compresses output when not connected to a terminal, + bug #3292 + * Sat Dec 1 2012 Fabian Groffen <fab...@monetdb.org> - 11.15.1-20130212 - Upgrade support for dbfarms from Mar2011 and Aug2011 was dropped diff --git a/tools/merovingian/ChangeLog.Feb2013 b/tools/merovingian/ChangeLog.Feb2013 --- a/tools/merovingian/ChangeLog.Feb2013 +++ b/tools/merovingian/ChangeLog.Feb2013 @@ -1,7 +1,3 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog -* Tue Jul 30 2013 Fabian Groffen <fab...@monetdb.org> -- monetdb now no longer compresses output when not connected to a terminal, - bug #3292 - _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
