Changeset: a6c844e27c9f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a6c844e27c9f Modified Files: .hgtags MonetDB.spec buildtools/ChangeLog-Archive buildtools/ChangeLog.Apr2012 debian/changelog gdk/ChangeLog-Archive gdk/ChangeLog.Apr2012 libversions Branch: default Log Message:
Merge with Apr2012 branch. diffs (132 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -476,3 +476,5 @@ e36693f883f56d50da695471b876542755306736 f50d60ffdbeec52cc17a72ecb91eed6753ab403c Dec2011_SP2_release 4702495ed780241f85da16bda9cb8f6bf7cf0a08 Apr2012_1 62f7cc254c8e83e5021d8230ed5b8e62c3793dd8 Apr2012_release +961301b12e2c230afc5471fefcc3d7af9ab3e98f Apr2012_3 +cbc7f297899d61201e4d5a8cb06ae3aacf070111 Apr2012_SP1_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/Apr2012/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Apr2012-SP1/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -655,6 +655,16 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Mon May 14 2012 Fabian Groffen <fab...@monetdb.org> - 11.9.3-20120514 +- Rebuilt. + +* Wed May 2 2012 Sjoerd Mullender <sjo...@acm.org> - 11.9.3-20120514 +- buildtools: Windows: we now use OpenSSL 1.0.1b. + +* Fri Apr 27 2012 Fabian Groffen <fab...@cwi.nl> - 11.9.3-20120514 +- gdk: Implemented MT_getrss for Mac OS X systems, this allows the server to + know about how much memory is currently in use. + * Wed Apr 18 2012 Sjoerd Mullender <sjo...@acm.org> - 11.9.1-20120418 - Rebuilt. diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive --- a/buildtools/ChangeLog-Archive +++ b/buildtools/ChangeLog-Archive @@ -1,6 +1,9 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed May 2 2012 Sjoerd Mullender <sjo...@acm.org> - 11.9.3-20120514 +- Windows: we now use OpenSSL 1.0.1b. + * Wed Feb 22 2012 Sjoerd Mullender <sjo...@acm.org> - 11.7.7-20120224 - Fixed some of the package names for Debian/Ubuntu. Packages for libraries should contain the major number of the library version number. diff --git a/buildtools/ChangeLog.Apr2012 b/buildtools/ChangeLog.Apr2012 --- a/buildtools/ChangeLog.Apr2012 +++ b/buildtools/ChangeLog.Apr2012 @@ -1,6 +1,3 @@ # ChangeLog file for buildtools # This file is updated with Maddlog -* Wed May 2 2012 Sjoerd Mullender <sjo...@acm.org> -- Windows: we now use OpenSSL 1.0.1b. - diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +monetdb (11.9.3-20120514) unstable; urgency=low + + * Rebuilt. + + -- Fabian Groffen <fab...@monetdb.org> Mon, 14 May 2012 12:36:35 +0200 + +monetdb (11.9.3-20120514) unstable; urgency=low + + * buildtools: Windows: we now use OpenSSL 1.0.1b. + + -- Sjoerd Mullender <sjo...@acm.org> Wed, 2 May 2012 12:36:35 +0200 + +monetdb (11.9.3-20120514) unstable; urgency=low + + * gdk: Implemented MT_getrss for Mac OS X systems, this allows the server to + know about how much memory is currently in use. + + -- Fabian Groffen <fab...@cwi.nl> Fri, 27 Apr 2012 12:36:35 +0200 + monetdb (11.9.1-20120418) 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 +* Fri Apr 27 2012 Fabian Groffen <fab...@cwi.nl> - 11.9.3-20120514 +- Implemented MT_getrss for Mac OS X systems, this allows the server to + know about how much memory is currently in use. + * Tue Feb 7 2012 Sjoerd Mullender <sjo...@acm.org> - 11.9.1-20120418 - The type "chr" has been removed. chr has long been superseded by bte for 1 byte arithmetic plus it is diff --git a/gdk/ChangeLog.Apr2012 b/gdk/ChangeLog.Apr2012 --- a/gdk/ChangeLog.Apr2012 +++ b/gdk/ChangeLog.Apr2012 @@ -1,7 +1,3 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog -* Fri Apr 27 2012 Fabian Groffen <fab...@cwi.nl> -- Implemented MT_getrss for Mac OS X systems, this allows the server to - know about how much memory is currently in use. - diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -35,13 +35,13 @@ # version of the GDK library (subdirectory gdk; also includes # common/options and common/mutils) -GDK_VERSION=5:0:0 +GDK_VERSION=5:1:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=6:0:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=11:0:0 +MONETDB5_VERSION=11:1:0 # version of the STREAM library (subdirectory common/stream) -STREAM_VERSION=4:0:1 +STREAM_VERSION=4:1:1 _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
