Changeset: abdb9aa6eff4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=abdb9aa6eff4 Modified Files: .hgtags MonetDB.spec debian/changelog gdk/ChangeLog-Archive gdk/ChangeLog.Feb2013 java/ChangeLog-Archive java/ChangeLog.Feb2013 libversions monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Feb2013 Branch: default Log Message:
Merge with Feb2013 branch. diffs (167 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -518,3 +518,5 @@ 23894afae1679eb37e6866a793ba00782c4b0804 355d0e22cf76c461ba4009d11f84d7bd7349b2a4 Feb2013_3 fc0c9b319d2275215c283a7ece1d389e55b43217 Feb2013_SP1_release 0ee398b5025f7bc3c0320d70eb5c0a3707b69c67 mutation_root +7daa66a6db1c0404dbf7ed935437b59b7bf54d4b Feb2013_5 +df2cbb7845660d94dc484bab860b6893344be92a Feb2013_SP2_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-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Feb2013-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -722,6 +722,20 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Fri Apr 12 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.5-20130412 +- Rebuilt. + +* Thu Apr 11 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.5-20130412 +- java: The pre-compiled .jar files are now created using Java 7 instead of + Java 6. + +* Mon Apr 8 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.5-20130412 +- gdk: Fixed a bug in case the candidate list is dense and completely + outside the range of the bat being worked upon. + +* Tue Mar 12 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.5-20130412 +- monetdb5: Fixed argument parsing of mapi.reconnect() with 5 arguments. + * Wed Feb 27 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.3-20130227 - Rebuilt. diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,29 @@ +monetdb (11.15.5-20130412) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 12 Apr 2013 09:33:06 +0200 + +monetdb (11.15.5-20130412) unstable; urgency=low + + * java: The pre-compiled .jar files are now created using Java 7 instead of + Java 6. + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 11 Apr 2013 09:33:05 +0200 + +monetdb (11.15.5-20130412) unstable; urgency=low + + * gdk: Fixed a bug in case the candidate list is dense and completely + outside the range of the bat being worked upon. + + -- Sjoerd Mullender <sjo...@acm.org> Mon, 8 Apr 2013 09:33:05 +0200 + +monetdb (11.15.5-20130412) unstable; urgency=low + + * monetdb5: Fixed argument parsing of mapi.reconnect() with 5 arguments. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 12 Mar 2013 09:33:05 +0200 + monetdb (11.15.3-20130227) unstable; urgency=low * Rebuilt. diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive --- a/gdk/ChangeLog-Archive +++ b/gdk/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Mon Apr 8 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.5-20130412 +- Fixed a bug in case the candidate list is dense and completely + outside the range of the bat being worked upon. + * Wed Aug 8 2012 Sjoerd Mullender <sjo...@acm.org> - 11.13.1-20121010 - Removed the gdk_embedded (and embedded) option. The code wasn't tested and most likely non-functional. diff --git a/gdk/ChangeLog.Feb2013 b/gdk/ChangeLog.Feb2013 --- a/gdk/ChangeLog.Feb2013 +++ b/gdk/ChangeLog.Feb2013 @@ -1,7 +1,3 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog -* Mon Apr 8 2013 Sjoerd Mullender <sjo...@acm.org> -- Fixed a bug in case the candidate list is dense and completely - outside the range of the bat being worked upon. - diff --git a/java/ChangeLog-Archive b/java/ChangeLog-Archive --- a/java/ChangeLog-Archive +++ b/java/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Thu Apr 11 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.5-20130412 +- The pre-compiled .jar files are now created using Java 7 instead of + Java 6. + * Sat Dec 1 2012 Fabian Groffen <fab...@monetdb.org> - 11.15.1-20130212 - merocontrol was changed to return server URIs, and lastStop time. Connections and dbpath were removed. diff --git a/java/ChangeLog.Feb2013 b/java/ChangeLog.Feb2013 --- a/java/ChangeLog.Feb2013 +++ b/java/ChangeLog.Feb2013 @@ -1,7 +1,3 @@ # ChangeLog file for java # This file is updated with Maddlog -* Thu Apr 11 2013 Sjoerd Mullender <sjo...@acm.org> -- The pre-compiled .jar files are now created using Java 7 instead of - Java 6. - 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:1:0 +GDK_VERSION=9:2: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:1:0 +MONETDB5_VERSION=14:2:0 # version of the STREAM library (subdirectory common/stream) STREAM_VERSION=4:5:1 diff --git a/monetdb5/ChangeLog-Archive b/monetdb5/ChangeLog-Archive --- a/monetdb5/ChangeLog-Archive +++ b/monetdb5/ChangeLog-Archive @@ -1,6 +1,9 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Mar 12 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.5-20130412 +- Fixed argument parsing of mapi.reconnect() with 5 arguments. + * Wed Nov 14 2012 Sjoerd Mullender <sjo...@acm.org> - 11.15.1-20130212 - mserver5: The --dbname and --dbfarm options have been replaced by the single --dbpath option. diff --git a/monetdb5/ChangeLog.Feb2013 b/monetdb5/ChangeLog.Feb2013 --- a/monetdb5/ChangeLog.Feb2013 +++ b/monetdb5/ChangeLog.Feb2013 @@ -1,6 +1,3 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog -* Tue Mar 12 2013 Sjoerd Mullender <sjo...@acm.org> -- Fixed argument parsing of mapi.reconnect() with 5 arguments. - _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
