Changeset: 767354221d18 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=767354221d18 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: Feb2013 Log Message:
Pre-release version number update. diffs (truncated from 460 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.15.8 +%define version 11.15.9 %{!?buildno: %define 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:{08CFCC45-6017-4FD5-990E-F3879AB25143}" - "PackageCode" = "8:{7F8EA25D-0C1E-4321-8052-6F3ED75487C6}" + "ProductCode" = "8:{01A83492-A3CB-4692-B4E7-E40E14E7BD2E}" + "PackageCode" = "8:{B2D03A3C-B0D4-4E79-827A-036A9EB53F7F}" "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.15.8" + "ProductVersion" = "8:11.15.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 @@ -425,14 +425,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB5 SQL GIS Module" - "ProductCode" = "8:{3D027B53-EFF1-4A9E-B5DC-E6DBCD3FA498}" - "PackageCode" = "8:{110DDCC6-3EF9-4D3B-A2B2-58444A7DB0FE}" + "ProductCode" = "8:{E460FFB1-A899-4C2E-9D98-70304B3FF41F}" + "PackageCode" = "8:{4EBDD44D-681E-4BF5-9659-EC22913D29D8}" "UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.15.8" + "ProductVersion" = "8:11.15.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 @@ -2329,7 +2329,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA" { - "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.15.8\\dump-restore.txt" + "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.15.9\\dump-restore.txt" "TargetName" = "8:dump-restore.txt" "Tag" = "8:" "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37" @@ -2969,7 +2969,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6" { - "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.15.8\\dump-restore.html" + "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.15.9\\dump-restore.html" "TargetName" = "8:dump-restore.html" "Tag" = "8:" "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37" @@ -4173,7 +4173,7 @@ { "{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37" { - "Name" = "8:MonetDB-SQL-11.15.8" + "Name" = "8:MonetDB-SQL-11.15.9" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" @@ -4215,15 +4215,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB5" - "ProductCode" = "8:{DC2A0A17-0614-4E31-AEFF-AD1A1BA5559D}" - "PackageCode" = "8:{D4F18759-B87E-4963-ADEE-EF2A7A597E4B}" + "ProductCode" = "8:{BF76534E-D1EF-46DF-B1BB-4C88BEE9408E}" + "PackageCode" = "8:{2BCCFEE1-9578-4D23-B872-435A442543D5}" "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.15.8" + "ProductVersion" = "8:11.15.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:{863739EA-738B-45BA-B7BE-0BF827298EB0}" - "PackageCode" = "8:{2986B92C-54C7-4A22-A6C2-13BA105A9608}" + "ProductCode" = "8:{CF447F85-2603-4948-A1FA-CFC863B4268A}" + "PackageCode" = "8:{A170972B-E4FA-4701-B705-E550CF8978B5}" "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.15.8" + "ProductVersion" = "8:11.15.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 @@ -425,14 +425,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB5 SQL GIS Module" - "ProductCode" = "8:{53D7FD0E-D623-4422-AFA9-3FB786D13259}" - "PackageCode" = "8:{DE5966A2-F77D-484F-BC96-ED99E3C60178}" + "ProductCode" = "8:{0EAA485A-EADB-49D1-A509-64155759F238}" + "PackageCode" = "8:{B77B50C8-D25C-4802-B35E-62EFA6BDB72B}" "UpgradeCode" = "8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.15.8" + "ProductVersion" = "8:11.15.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 @@ -2149,7 +2149,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA" { - "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.15.8\\dump-restore.txt" + "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.15.9\\dump-restore.txt" "TargetName" = "8:dump-restore.txt" "Tag" = "8:" "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37" @@ -3049,7 +3049,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6" { - "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.15.8\\dump-restore.html" + "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.15.9\\dump-restore.html" "TargetName" = "8:dump-restore.html" "Tag" = "8:" "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37" @@ -4173,7 +4173,7 @@ { "{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37" { - "Name" = "8:MonetDB-SQL-11.15.8" + "Name" = "8:MonetDB-SQL-11.15.9" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" @@ -4215,15 +4215,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB5" - "ProductCode" = "8:{1B32B001-E7F0-4C37-B323-EE6A8A977F50}" - "PackageCode" = "8:{20D90DDC-DA14-4443-AAD2-0B9E5130022F}" + "ProductCode" = "8:{E7D19498-E9C4-44C9-A093-3B6D2B7733A5}" + "PackageCode" = "8:{8023676A-B3FF-48A7-B8D5-4A9E571DA3CC}" "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.15.8" + "ProductVersion" = "8:11.15.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 @@ -676,7 +676,7 @@ #define MONETDB5_PASSWDHASH "SHA512" /* Release name or "unreleased" */ -#define MONETDB_RELEASE "unreleased" +#define MONETDB_RELEASE "Feb2013-SP3" /* Define if the oid type should use 32 bits on a 64-bit architecture */ /* #undef MONET_OID32 */ @@ -697,13 +697,13 @@ #define PACKAGE_NAME "MonetDB" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "MonetDB 11.15.8" +#define PACKAGE_STRING "MonetDB 11.15.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.15.8" +#define PACKAGE_VERSION "11.15.9" /* Path separator */ #define PATH_SEP ';' diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -17,7 +17,7 @@ # Copyright August 2008-2013 MonetDB B.V. # All Rights Reserved. -VERSION=11.15.8 +VERSION=11.15.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,15,8,1 - PRODUCTVERSION 11,15,8,1 + FILEVERSION 11,15,9,1 + PRODUCTVERSION 11,15,9,1 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -18,7 +18,7 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "CWI\0" VALUE "FileDescription", "MonetDB Application Interface DLL\0" - VALUE "FileVersion", "11.15.8\0" + VALUE "FileVersion", "11.15.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.15.8\0" + VALUE "ProductVersion", "11.15.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,15,8,1 - PRODUCTVERSION 11,15,8,1 + FILEVERSION 11,15,9,1 + PRODUCTVERSION 11,15,9,1 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -18,7 +18,7 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "CWI\0" VALUE "FileDescription", "MonetDB ODBC Driver DLL\0" - VALUE "FileVersion", "11.15.8\0" + VALUE "FileVersion", "11.15.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.15.8\0" + VALUE "ProductVersion", "11.15.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 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list