Changeset: d330627d491a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d330627d491a Added Files: ChangeLog.Dec2016 buildtools/ChangeLog.Dec2016 clients/ChangeLog.Dec2016 clients/mapilib/ChangeLog.Dec2016 common/stream/ChangeLog.Dec2016 gdk/ChangeLog.Dec2016 geom/ChangeLog.Dec2016 monetdb5/ChangeLog.Dec2016 sql/ChangeLog.Dec2016 testing/ChangeLog.Dec2016 tools/merovingian/ChangeLog.Dec2016 Modified Files: ChangeLog 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 clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag gdk/ChangeLog gdk/libbat.rc monetdb5/ChangeLog monetdb5/tools/libmonetdb5.rc sql/ChangeLog vertoo.data Branch: default Log Message:
Step two towards a new stable branch "Dec2016". Increment version numbers. >From now on, *all* bug fixes, and *only* bug fixes, *must* go to the stable branch with the name "Dec2016". diffs (truncated from 468 to 300 lines): diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,13 +1,3 @@ # ChangeLog file for devel # This file is updated with Maddlog -* Thu Sep 22 2016 Sjoerd Mullender <sjo...@acm.org> -- The Perl, PHP, and Python clients, and the JDBC driver each now have - their own repositories and release cycles. The Python client is - maintained by Gijs Molenaar on Github - (https://github.com/gijzelaerr/pymonetdb), the other clients are - maintained by CWI/MonetDB on our own server - (https://dev.monetdb.org/hg/monetdb-java, - https://dev.monetdb.org/hg/monetdb-perl, - https://dev.monetdb.org/hg/monetdb-php). - diff --git a/ChangeLog b/ChangeLog.Dec2016 copy from ChangeLog copy to ChangeLog.Dec2016 diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1,5 +1,5 @@ %define name MonetDB -%define version 11.24.0 +%define version 11.26.0 %{!?buildno: %global buildno %(date +%Y%m%d)} # groups of related archs diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj b/NT/installer32/MonetDB-ODBC-Installer.vdproj --- a/NT/installer32/MonetDB-ODBC-Installer.vdproj +++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj @@ -574,7 +574,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.24.0" + "ProductVersion" = "8:11.26.0" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://www.monetdb.org/"; diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj b/NT/installer32/MonetDB5-Geom-Module.vdproj --- a/NT/installer32/MonetDB5-Geom-Module.vdproj +++ b/NT/installer32/MonetDB5-Geom-Module.vdproj @@ -439,7 +439,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.24.0" + "ProductVersion" = "8:11.26.0" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://www.monetdb.org/"; diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj b/NT/installer32/MonetDB5-SQL-Installer.vdproj --- a/NT/installer32/MonetDB5-SQL-Installer.vdproj +++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj @@ -4348,7 +4348,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.24.0" + "ProductVersion" = "8:11.26.0" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://www.monetdb.org/"; diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj b/NT/installer64/MonetDB-ODBC-Installer.vdproj --- a/NT/installer64/MonetDB-ODBC-Installer.vdproj +++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj @@ -574,7 +574,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.24.0" + "ProductVersion" = "8:11.26.0" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://www.monetdb.org/"; diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj b/NT/installer64/MonetDB5-Geom-Module.vdproj --- a/NT/installer64/MonetDB5-Geom-Module.vdproj +++ b/NT/installer64/MonetDB5-Geom-Module.vdproj @@ -439,7 +439,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.24.0" + "ProductVersion" = "8:11.26.0" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://www.monetdb.org/"; diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj b/NT/installer64/MonetDB5-SQL-Installer.vdproj --- a/NT/installer64/MonetDB5-SQL-Installer.vdproj +++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj @@ -4348,7 +4348,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.24.0" + "ProductVersion" = "8:11.26.0" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://www.monetdb.org/"; diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in --- a/NT/monetdb_config.h.in +++ b/NT/monetdb_config.h.in @@ -772,13 +772,13 @@ #define PACKAGE_NAME "MonetDB" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "MonetDB 11.24.0" +#define PACKAGE_STRING "MonetDB 11.26.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "MonetDB" /* Define to the version of this package. */ -#define PACKAGE_VERSION "11.24.0" +#define PACKAGE_VERSION "11.26.0" /* Define to the home page for this package. */ #define PACKAGE_URL "" diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -6,7 +6,7 @@ # # Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. -VERSION=11.24.0 +VERSION=11.26.0 # ^^^^^^ # Maintained via vertoo. Please don't modify by hand! # Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog --- a/buildtools/ChangeLog +++ b/buildtools/ChangeLog @@ -1,12 +1,3 @@ # ChangeLog file for buildtools # This file is updated with Maddlog -* Tue Jul 19 2016 Stefan Manegold <stefan.maneg...@cwi.nl> -- With OID size equal to ABI/word size, mserver5 does not need to print - the OID size, anymore. -- Removed obsolete code associated with long gone static linking option. - -* Mon Jul 18 2016 Sjoerd Mullender <sjo...@acm.org> -- Removed configure option --enable-oid32 to compile with 32 bit OIDs - on a 64 bit architecture. - diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog.Dec2016 copy from buildtools/ChangeLog copy to buildtools/ChangeLog.Dec2016 diff --git a/clients/ChangeLog b/clients/ChangeLog.Dec2016 copy from clients/ChangeLog copy to clients/ChangeLog.Dec2016 diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Dec2016 copy from clients/mapilib/ChangeLog copy to clients/mapilib/ChangeLog.Dec2016 diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc --- a/clients/mapilib/mapi.rc +++ b/clients/mapilib/mapi.rc @@ -3,8 +3,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 VERSIONINFO - FILEVERSION 11,24,0,1 - PRODUCTVERSION 11,24,0,1 + FILEVERSION 11,26,0,1 + PRODUCTVERSION 11,26,0,1 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -18,7 +18,7 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "MonetDB B.V.\0" VALUE "FileDescription", "MonetDB Application Interface DLL\0" - VALUE "FileVersion", "11.24.0\0" + VALUE "FileVersion", "11.26.0\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. @@ -28,7 +28,7 @@ BEGIN VALUE "OriginalFilename", "Mapi.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB Client Libraries\0" - VALUE "ProductVersion", "11.24.0\0" + VALUE "ProductVersion", "11.26.0\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc --- a/clients/odbc/driver/driver.rc +++ b/clients/odbc/driver/driver.rc @@ -3,8 +3,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 VERSIONINFO - FILEVERSION 11,24,0,1 - PRODUCTVERSION 11,24,0,1 + FILEVERSION 11,26,0,1 + PRODUCTVERSION 11,26,0,1 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -18,7 +18,7 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "MonetDB B.V.\0" VALUE "FileDescription", "MonetDB ODBC Driver DLL\0" - VALUE "FileVersion", "11.24.0\0" + VALUE "FileVersion", "11.26.0\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. @@ -28,7 +28,7 @@ BEGIN VALUE "OriginalFilename", "libMonetODBC.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB SQL Server\0" - VALUE "ProductVersion", "11.24.0\0" + VALUE "ProductVersion", "11.26.0\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc --- a/clients/odbc/winsetup/setup.rc +++ b/clients/odbc/winsetup/setup.rc @@ -62,8 +62,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 11,24,0,1 - PRODUCTVERSION 11,24,0,1 + FILEVERSION 11,26,0,1 + PRODUCTVERSION 11,26,0,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -80,12 +80,12 @@ BEGIN BEGIN VALUE "CompanyName", "MonetDB B.V." VALUE "FileDescription", "MonetDB ODBC Setup DLL" - VALUE "FileVersion", "11.24.0" + VALUE "FileVersion", "11.26.0" VALUE "InternalName", "libMonetODBCs.dll" VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2016" VALUE "OriginalFilename", "libMonetODBCs.dll" VALUE "ProductName", "MonetDB SQL Server" - VALUE "ProductVersion", "11.24.0" + VALUE "ProductVersion", "11.26.0" END END BLOCK "VarFileInfo" diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Dec2016 copy from common/stream/ChangeLog copy to common/stream/ChangeLog.Dec2016 diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -46,7 +46,7 @@ dnl configure file, whereas comments st dnl (including their trailing newline). AC_PREREQ([2.63]) -AC_INIT([MonetDB], [11.24.0], [https://bugs.monetdb.org/], [MonetDB], [https://www.monetdb.org/]) +AC_INIT([MonetDB], [11.26.0], [https://bugs.monetdb.org/], [MonetDB], [https://www.monetdb.org/]) AC_CONFIG_AUX_DIR([buildtools/conf]) AC_CONFIG_MACRO_DIR([buildtools/conf]) AC_CANONICAL_HOST diff --git a/gdk/ChangeLog b/gdk/ChangeLog --- a/gdk/ChangeLog +++ b/gdk/ChangeLog @@ -1,56 +1,3 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog -* Wed Sep 14 2016 Sjoerd Mullender <sjo...@acm.org> -- VALcopy and VALinit both return their first argument on success or - (and that's new) NULL on (allocation) failure. - -* Tue Jul 26 2016 Sjoerd Mullender <sjo...@acm.org> -- BATattach now can also create a str BAT from a file consisting of - null-terminated strings. The input file must be encoded using UTF-8. -- BATattach now copies the input file instead of "stealing" it. -- Removed the lastused "timestamp" from the BBP. -- Removed batStamp field from BAT descriptor, and removed the BBPcurstamp - function. - -* Fri Jul 22 2016 Sjoerd Mullender <sjo...@acm.org> -- Removed unused functions BBPhot and BBPcold. - -* Wed Jul 6 2016 Sjoerd Mullender <sjo...@acm.org> -- Removed BATderiveTailProps and BATderiveProps. Just set the properties - you know about, or use BATsettrivprop. - -* Fri Jul 1 2016 Sjoerd Mullender <sjo...@acm.org> -- Removed the macro BUNfirst. It can be replaced by 0. - -* Wed Jun 29 2016 Sjoerd Mullender <sjo...@acm.org> -- Changed BATroles by removing the argument to set the name of the - head column. -- The head column is now completely gone. MonetDB is completely - "headless". _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
