Changeset: 588412507a91 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=588412507a91 Modified Files: .hgtags MonetDB.spec NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-Geom-Module.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj NT/monetdb_config.h.in NT/rules.msc buildtools/ChangeLog-Archive buildtools/ChangeLog.Jan2014 clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python2/setup.py clients/python3/setup.py configure.ag debian/changelog gdk/libbat.rc libversions monetdb5/tools/libmonetdb5.rc vertoo.data Branch: geo Log Message:
Merge with default branch. diffs (120 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -567,3 +567,5 @@ 13e1b24f442791f5ab790fa77453d3bd4e88a9c8 c3051f066a9eea814487dfb0b7cf7070ae16cd21 Jan2014_17 13e1b24f442791f5ab790fa77453d3bd4e88a9c8 Jan2014_SP2_release 389f5f0d4c43ab689e31c28e01b43c8b7ba8de9c Jan2014_SP2_release +dc158ade928d0305f3f0e7ef9613dd81329f613d Jan2014_19 +0218c4ec31068bd1b9be7d2bb1ccad31e17e8d5f Jan2014_SP3_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -45,7 +45,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/Jan2014-SP2/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jan2014-SP3/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -802,6 +802,19 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD rm -fr $RPM_BUILD_ROOT %changelog +* Tue Jul 22 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.19-20140722 +- Rebuilt. +- BZ#3487: dead link to "Professional services" +- BZ#3500: MonetDB driver wants an empty string for SQLTables and + SQLColumns API calls, where other drivers expect NULL +- BZ#3514: mserver5 crash due (assertion failure in gdk_select.c) +- BZ#3515: mserver5 crash due (assertion failure in gdk_bat.c) + +* Tue Jun 3 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.19-20140722 +- buildtools: Fix configure to continue without Python if the python binary is + too old. This instead of always aborting configure if python happens + to be too old. + * Wed May 14 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.17-20140514 - Rebuilt. - BZ#3482: Crossproduct error diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive --- a/buildtools/ChangeLog-Archive +++ b/buildtools/ChangeLog-Archive @@ -1,6 +1,11 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Jun 3 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.19-20140722 +- Fix configure to continue without Python if the python binary is + too old. This instead of always aborting configure if python happens + to be too old. + * Wed Apr 30 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.15-20140508 - Lots of minor fixes were made for potential defects found by Coverity Scan. diff --git a/buildtools/ChangeLog.Jan2014 b/buildtools/ChangeLog.Jan2014 --- a/buildtools/ChangeLog.Jan2014 +++ b/buildtools/ChangeLog.Jan2014 @@ -1,8 +1,3 @@ # ChangeLog file for buildtools # This file is updated with Maddlog -* Tue Jun 3 2014 Sjoerd Mullender <sjo...@acm.org> -- Fix configure to continue without Python if the python binary is - too old. This instead of always aborting configure if python happens - to be too old. - diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,28 @@ +monetdb (11.17.19-20140722) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 22 Jul 2014 11:42:09 +0200 + +monetdb (11.17.19-20140722) unstable; urgency=low + + * Rebuilt. + * BZ#3487: dead link to "Professional services" + * BZ#3500: MonetDB driver wants an empty string for SQLTables and + SQLColumns API calls, where other drivers expect NULL + * BZ#3514: mserver5 crash due (assertion failure in gdk_select.c) + * BZ#3515: mserver5 crash due (assertion failure in gdk_bat.c) + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 22 Jul 2014 11:42:07 +0200 + +monetdb (11.17.19-20140722) unstable; urgency=low + + * buildtools: Fix configure to continue without Python if the python binary is + too old. This instead of always aborting configure if python happens + to be too old. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 3 Jun 2014 11:42:07 +0200 + monetdb (11.17.17-20140514) 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=10:7:0 +GDK_VERSION=10:8: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=16:8:0 +MONETDB5_VERSION=16:9:0 # version of the STREAM library (subdirectory common/stream) -STREAM_VERSION=5:4:0 +STREAM_VERSION=5:5:0 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
