Changeset: e454083e4651 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e454083e4651 Modified Files: 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 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: Dec2016 Log Message:
Pre-release version number update. diffs (truncated from 368 to 300 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.25.8 +%define version 11.25.9 %{!?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 @@ -566,15 +566,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB ODBC Driver" - "ProductCode" = "8:{02A9712F-FDDA-4506-B852-217E6B42B05A}" - "PackageCode" = "8:{7FAC638B-8CEE-40EA-8412-757BF91A6BCB}" + "ProductCode" = "8:{786C0FCD-D55B-4E0A-A92E-1E6366AA69F3}" + "PackageCode" = "8:{168C58D1-E8CA-4C2D-BF57-7BF573B611A5}" "UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.25.8" + "ProductVersion" = "8:11.25.9" "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 @@ -431,15 +431,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB5 SQL GIS Module" - "ProductCode" = "8:{2B8D3E2D-242A-466E-9A8C-32A233475A70}" - "PackageCode" = "8:{C7E3A1EE-F898-46A2-95D2-243CCE07982F}" + "ProductCode" = "8:{38A41DB7-21CB-4985-AB08-AA9796A4B795}" + "PackageCode" = "8:{9E9B7E1E-F2EF-4645-8838-26BCAF79CF69}" "UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.25.8" + "ProductVersion" = "8:11.25.9" "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 @@ -4340,15 +4340,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB5" - "ProductCode" = "8:{A170B641-A5DD-4B8E-A940-FCEBFBFBE084}" - "PackageCode" = "8:{F9230601-C620-4384-B128-6E80F938CFF3}" + "ProductCode" = "8:{3A174C7D-5EDD-4E40-8AAD-5AB891D648A9}" + "PackageCode" = "8:{4C39BDCD-A278-4C34-A2B5-2D28658F892E}" "UpgradeCode" = "8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.25.8" + "ProductVersion" = "8:11.25.9" "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 @@ -566,15 +566,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB ODBC Driver" - "ProductCode" = "8:{8BFFD76F-9569-4359-AB4A-B2F9C94A03C0}" - "PackageCode" = "8:{D3983854-0716-44A7-9A22-53F05D19EE02}" + "ProductCode" = "8:{DEF68E5D-E3B8-4558-BEA7-61966C092B42}" + "PackageCode" = "8:{C4D27B43-B11D-4534-8E80-05FF82C3F9E4}" "UpgradeCode" = "8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.25.8" + "ProductVersion" = "8:11.25.9" "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 @@ -431,15 +431,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB5 SQL GIS Module" - "ProductCode" = "8:{3691AAB3-28E8-47C6-9EED-99286ED48930}" - "PackageCode" = "8:{E6F16AEF-21BB-4862-9B47-83D9FBEFBC4B}" + "ProductCode" = "8:{D2906CAC-B556-4A24-894F-F35CAD73506C}" + "PackageCode" = "8:{42C8FA4A-B7A4-469B-8070-9DC4C40996D7}" "UpgradeCode" = "8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.25.8" + "ProductVersion" = "8:11.25.9" "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 @@ -4340,15 +4340,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB5" - "ProductCode" = "8:{04C28DA5-AC55-495C-8E99-7A7B7CAD0CCE}" - "PackageCode" = "8:{A2782BA9-3361-426E-BB34-E6091013195A}" + "ProductCode" = "8:{AE971EB3-E105-44CC-8D80-95C8726D29D5}" + "PackageCode" = "8:{64A02011-A634-4DCA-B4D5-230F37852559}" "UpgradeCode" = "8:{839D3C90-B578-41E2-A004-431440F9E899}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.25.8" + "ProductVersion" = "8:11.25.9" "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 @@ -754,7 +754,7 @@ #define MONETDB5_PASSWDHASH_TOKEN SHA512 /* Release name or "unreleased" */ -#define MONETDB_RELEASE "unreleased" +#define MONETDB_RELEASE "Dec2016-SP2" /* Suffix for C++ files */ #define MX_CXX_SUFFIX "cxx" @@ -772,13 +772,13 @@ #define PACKAGE_NAME "MonetDB" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "MonetDB 11.25.8" +#define PACKAGE_STRING "MonetDB 11.25.9" /* 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.25.8" +#define PACKAGE_VERSION "11.25.9" /* 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 - 2017 MonetDB B.V. -VERSION=11.25.8 +VERSION=11.25.9 # ^^^^^^ # 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,25,8,1 - PRODUCTVERSION 11,25,8,1 + FILEVERSION 11,25,9,1 + PRODUCTVERSION 11,25,9,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.25.8\0" + VALUE "FileVersion", "11.25.9\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.25.8\0" + VALUE "ProductVersion", "11.25.9\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,25,8,1 - PRODUCTVERSION 11,25,8,1 + FILEVERSION 11,25,9,1 + PRODUCTVERSION 11,25,9,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.25.8\0" + VALUE "FileVersion", "11.25.9\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.25.8\0" + VALUE "ProductVersion", "11.25.9\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,25,8,1 - PRODUCTVERSION 11,25,8,1 + FILEVERSION 11,25,9,1 + PRODUCTVERSION 11,25,9,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.25.8" + VALUE "FileVersion", "11.25.9" VALUE "InternalName", "libMonetODBCs.dll" VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2017" VALUE "OriginalFilename", "libMonetODBCs.dll" VALUE "ProductName", "MonetDB SQL Server" - VALUE "ProductVersion", "11.25.8" + VALUE "ProductVersion", "11.25.9" 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.25.8], [https://bugs.monetdb.org/], [MonetDB], [https://www.monetdb.org/]) +AC_INIT([MonetDB], [11.25.9], [https://bugs.monetdb.org/], [MonetDB], [https://www.monetdb.org/]) AC_CONFIG_AUX_DIR([buildtools/conf]) AC_CONFIG_MACRO_DIR([buildtools/conf]) AC_CANONICAL_HOST @@ -60,7 +60,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], ["Dec2016-SP2"], [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 @@ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list