Changeset: 4497ad63242a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4497ad63242a Modified Files: MonetDB.spec NT/monetdb_config.h.in NT/rules.msc clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag gdk/libbat.rc monetdb5/tools/libmonetdb5.rc vertoo.data Branch: Aug2018 Log Message:
Pre-release version number update. diffs (228 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1,5 +1,5 @@ %define name MonetDB -%define version 11.31.0 +%define version 11.31.1 %{!?buildno: %global buildno %(date +%Y%m%d)} # groups of related archs 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 @@ -642,7 +642,7 @@ #define MONETDB5_PASSWDHASH_TOKEN SHA512 /* Release name or "unreleased" */ -#define MONETDB_RELEASE "unreleased" +#define MONETDB_RELEASE "Aug2018" /* Define if you do not want assertions */ /* #undef NDEBUG */ @@ -666,7 +666,7 @@ #define PACKAGE_URL "https://www.monetdb.org/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "11.31.0" +#define PACKAGE_VERSION "11.31.1" /* Path separator */ #define PATH_SEP ';' 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 - 2018 MonetDB B.V. -VERSION=11.31.0 +VERSION=11.31.1 # ^^^^^^ # Maintained via vertoo. Please don't modify by hand! # Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. 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,31,0,1 - PRODUCTVERSION 11,31,0,1 + FILEVERSION 11,31,1,1 + PRODUCTVERSION 11,31,1,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.31.0\0" + VALUE "FileVersion", "11.31.1\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.31.0\0" + VALUE "ProductVersion", "11.31.1\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,31,0,1 - PRODUCTVERSION 11,31,0,1 + FILEVERSION 11,31,1,1 + PRODUCTVERSION 11,31,1,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.31.0\0" + VALUE "FileVersion", "11.31.1\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.31.0\0" + VALUE "ProductVersion", "11.31.1\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,31,0,1 - PRODUCTVERSION 11,31,0,1 + FILEVERSION 11,31,1,1 + PRODUCTVERSION 11,31,1,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.31.0" + VALUE "FileVersion", "11.31.1" VALUE "InternalName", "libMonetODBCs.dll" VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2018" VALUE "OriginalFilename", "libMonetODBCs.dll" VALUE "ProductName", "MonetDB SQL Server" - VALUE "ProductVersion", "11.31.0" + VALUE "ProductVersion", "11.31.1" END END BLOCK "VarFileInfo" 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.31.0], [https://bugs.monetdb.org/], [MonetDB], [https://www.monetdb.org/]) +AC_INIT([MonetDB], [11.31.1], [https://bugs.monetdb.org/], [MonetDB], [https://www.monetdb.org/]) AC_COPYRIGHT([Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.]) AC_CONFIG_AUX_DIR([buildtools/conf]) AC_CONFIG_MACRO_DIR([buildtools/conf]) @@ -61,7 +61,7 @@ AC_SUBST([CONFIG_H], [monetdb_config.h]) HOST=[$target] AC_DEFINE_UNQUOTED([HOST], ["$HOST"], [Host identifier]) -AC_DEFINE([MONETDB_RELEASE], ["unreleased"], [Release name or "unreleased"]) +AC_DEFINE([MONETDB_RELEASE], ["Aug2018"], [Release name or "unreleased"]) AS_VAR_IF([target_os], [cygwin], [AC_DEFINE([WIN32], 1, [Define on Microsoft Windows (also under Cygwin)])]) diff --git a/gdk/libbat.rc b/gdk/libbat.rc --- a/gdk/libbat.rc +++ b/gdk/libbat.rc @@ -3,8 +3,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 VERSIONINFO - FILEVERSION 11,31,0,1 - PRODUCTVERSION 11,31,0,1 + FILEVERSION 11,31,1,1 + PRODUCTVERSION 11,31,1,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 Goblin Database Kernel DLL\0" - VALUE "FileVersion", "11.31.0\0" + VALUE "FileVersion", "11.31.1\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", "libbat.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB Common Libraries\0" - VALUE "ProductVersion", "11.31.0\0" + VALUE "ProductVersion", "11.31.1\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff --git a/monetdb5/tools/libmonetdb5.rc b/monetdb5/tools/libmonetdb5.rc --- a/monetdb5/tools/libmonetdb5.rc +++ b/monetdb5/tools/libmonetdb5.rc @@ -3,8 +3,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 VERSIONINFO - FILEVERSION 11,31,0,1 - PRODUCTVERSION 11,31,0,1 + FILEVERSION 11,31,1,1 + PRODUCTVERSION 11,31,1,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", "MonetDB5 Library DLL\0" - VALUE "FileVersion", "11.31.0\0" + VALUE "FileVersion", "11.31.1\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", "libmonetdb5.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB5 Server\0" - VALUE "ProductVersion", "11.31.0\0" + VALUE "ProductVersion", "11.31.1\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff --git a/vertoo.data b/vertoo.data --- a/vertoo.data +++ b/vertoo.data @@ -1,1 +1,1 @@ -monetdb = major:11; minor:31; release:0; +monetdb = major:11; minor:31; release:1; \ No newline at end of file _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list