Changeset: ef3c87eb9f8e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef3c87eb9f8e 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 clients/python2/setup.py clients/python3/setup.py configure.ag gdk/libbat.rc monetdb5/tools/libmonetdb5.rc vertoo.data Branch: Jun2016 Log Message:
Pre-release version number update. diffs (truncated from 408 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.23.2 +%define version 11.23.3 %{!?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:{56A53F48-0D94-41D5-93D0-09C61B2E5E38}" - "PackageCode" = "8:{215C9638-202A-4AA5-A1B6-B7AE0BA414FA}" + "ProductCode" = "8:{811D3340-DC2C-45F5-A9B5-8841F8FF7CD8}" + "PackageCode" = "8:{8C88A0F2-7C19-45AC-9EB3-C0CD58A2F3CC}" "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.23.2" + "ProductVersion" = "8:11.23.3" "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:{6AC23A86-B46F-4640-8C11-9854D8CAA211}" - "PackageCode" = "8:{15A23BED-E3BF-4917-8B2D-4D590B95BFD9}" + "ProductCode" = "8:{56F779A9-E1BA-46F4-A63E-797226D5A19A}" + "PackageCode" = "8:{3439D424-DF06-45A2-A9BB-CC000218664D}" "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.23.2" + "ProductVersion" = "8:11.23.3" "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 @@ -4288,15 +4288,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB5" - "ProductCode" = "8:{1C3C3CE1-BBC0-465B-B474-43C62EC8461E}" - "PackageCode" = "8:{FD8DD830-B38B-4C9A-9FE6-ADCCA6FE435F}" + "ProductCode" = "8:{FB7D7E3E-9036-4C02-8CDE-16808044AEE7}" + "PackageCode" = "8:{2129334A-0371-4D0A-BE14-6F26B52AEBA5}" "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.23.2" + "ProductVersion" = "8:11.23.3" "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:{BCD4DA56-3CC8-457D-B36A-0AA8E213ACD4}" - "PackageCode" = "8:{69FDE6D5-BDEF-4C83-817D-897083E96FC6}" + "ProductCode" = "8:{A47CD0FB-5928-4B16-9EAA-B68D0F325065}" + "PackageCode" = "8:{E8CECC0D-EF4A-4808-9C5C-6AA3C83F99D5}" "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.23.2" + "ProductVersion" = "8:11.23.3" "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:{44F575F4-C071-4403-8163-49A398774BCC}" - "PackageCode" = "8:{0C0D9CF3-4098-468A-9F0A-5E9A83EBE1AB}" + "ProductCode" = "8:{C24F67DE-5FD0-49AE-BA00-30E34635DA68}" + "PackageCode" = "8:{5E9F1B77-EEC6-49D0-850D-98A57346441C}" "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.23.2" + "ProductVersion" = "8:11.23.3" "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 @@ -4288,15 +4288,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB5" - "ProductCode" = "8:{8E53A523-5333-46E1-8F59-78A7515E918C}" - "PackageCode" = "8:{0A1BEEB1-FAA8-4258-A438-947FF2FAEDD6}" + "ProductCode" = "8:{8D1A1FCB-8FCA-419C-830B-310E3019C167}" + "PackageCode" = "8:{54E89DCC-C8E4-4AD8-A67A-546D038CE699}" "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.23.2" + "ProductVersion" = "8:11.23.3" "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 @@ -793,7 +793,7 @@ #define MONETDB5_PASSWDHASH "SHA512" /* Release name or "unreleased" */ -#define MONETDB_RELEASE "unreleased" +#define MONETDB_RELEASE "Jun2016" /* Define if the oid type should use 32 bits on a 64-bit architecture */ /* #undef MONET_OID32 */ @@ -814,13 +814,13 @@ #define PACKAGE_NAME "MonetDB" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "MonetDB 11.23.2" +#define PACKAGE_STRING "MonetDB 11.23.3" /* 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.23.2" +#define PACKAGE_VERSION "11.23.3" /* 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.23.2 +VERSION=11.23.3 # ^^^^^^ # 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,23,2,1 - PRODUCTVERSION 11,23,2,1 + FILEVERSION 11,23,3,1 + PRODUCTVERSION 11,23,3,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.23.2\0" + VALUE "FileVersion", "11.23.3\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.23.2\0" + VALUE "ProductVersion", "11.23.3\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,23,2,1 - PRODUCTVERSION 11,23,2,1 + FILEVERSION 11,23,3,1 + PRODUCTVERSION 11,23,3,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.23.2\0" + VALUE "FileVersion", "11.23.3\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.23.2\0" + VALUE "ProductVersion", "11.23.3\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,23,2,1 - PRODUCTVERSION 11,23,2,1 + FILEVERSION 11,23,3,1 + PRODUCTVERSION 11,23,3,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.23.2" + VALUE "FileVersion", "11.23.3" VALUE "InternalName", "libMonetODBCs.dll" VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2016" VALUE "OriginalFilename", "libMonetODBCs.dll" VALUE "ProductName", "MonetDB SQL Server" - VALUE "ProductVersion", "11.23.2" + VALUE "ProductVersion", "11.23.3" END END BLOCK "VarFileInfo" diff --git a/clients/python2/setup.py b/clients/python2/setup.py --- a/clients/python2/setup.py +++ b/clients/python2/setup.py @@ -13,14 +13,14 @@ def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() setup(name='python-monetdb', - version='11.23.2', + version='11.23.3', description='Native MonetDB client Python API', long_description=read('README.rst'), author='MonetDB BV', author_email='i...@monetdb.org', url='http://www.monetdb.org/', packages=['monetdb', 'monetdb.sql'], - download_url='<will be filled in before a release>/python2-monetdb-11.23.2.tar.gz', + download_url='http://dev.monetdb.org/downloads/sources/Jun2016/python2-monetdb-11.23.3.tar.gz', classifiers=[ "Topic :: Database", "Topic :: Database :: Database Engines/Servers", diff --git a/clients/python3/setup.py b/clients/python3/setup.py --- a/clients/python3/setup.py +++ b/clients/python3/setup.py @@ -13,14 +13,14 @@ def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list