Changeset: 1daf4d93ebd1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1daf4d93ebd1
Modified Files:
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB4-XQuery-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB4-XQuery-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/libbat.rc
monetdb4/monet/libmonet.rc
monetdb5/tools/libmonetdb5.rc
pathfinder/runtime/pathfinder.mx
pathfinder/runtime/xrpc/admin/title.html.in
template/configure.ag
vertoo.data
Branch: Mar2011
Log Message:
Pre-release version number update.
diffs (truncated from 489 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.1.0
+%define version 11.1.1
%{!?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,14 +566,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{F553EDA6-208A-4F89-9783-7ADA935E014A}"
- "PackageCode" = "8:{C3CFF53E-BE5C-4C30-B071-847452592499}"
+ "ProductCode" = "8:{DD95CB0E-658B-42D8-9393-04C993331D43}"
+ "PackageCode" = "8:{1C532282-B3B6-4FF8-AD24-0D4EA3E04083}"
"UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.1.0"
+ "ProductVersion" = "8:11.1.1"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff --git a/NT/installer32/MonetDB4-XQuery-Installer.vdproj
b/NT/installer32/MonetDB4-XQuery-Installer.vdproj
--- a/NT/installer32/MonetDB4-XQuery-Installer.vdproj
+++ b/NT/installer32/MonetDB4-XQuery-Installer.vdproj
@@ -4168,14 +4168,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB4"
- "ProductCode" = "8:{92EABADC-D872-4E44-9C2C-52EDD1B2CE13}"
- "PackageCode" = "8:{0C59C568-9EF9-4F06-9E71-27C26AABAD83}"
+ "ProductCode" = "8:{2A64F068-E9E5-4CC5-9F0E-D191E975DA26}"
+ "PackageCode" = "8:{64A3C872-CA1C-4EE0-A6E4-CFA57E68B1B1}"
"UpgradeCode" = "8:{4F980AC7-863E-4C5E-A3BF-138F9DEDDB8A}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.1.0"
+ "ProductVersion" = "8:11.1.1"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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:{0EB6FD98-A8BB-4E40-A6AB-D0258F937766}"
- "PackageCode" = "8:{28CF4984-296C-4CC3-8049-9CE19CC68F1E}"
+ "ProductCode" = "8:{0827A65B-A521-4250-BCB7-04C7EE400323}"
+ "PackageCode" = "8:{C416C696-46BD-4911-A0A0-E91F95C633A8}"
"UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.1.0"
+ "ProductVersion" = "8:11.1.1"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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
@@ -2665,7 +2665,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.1.0\\dump-restore.txt"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.1.1\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3705,7 +3705,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.1.0\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.1.1\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -5109,7 +5109,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.1.0"
+ "Name" = "8:MonetDB-SQL-11.1.1"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -5151,14 +5151,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{3639864D-963F-4E5C-A087-17A25EEEC36F}"
- "PackageCode" = "8:{18713244-E915-4623-ABB4-FBA11E0CA986}"
+ "ProductCode" = "8:{660B0678-EE09-40B6-BA05-3AD845900045}"
+ "PackageCode" = "8:{C972297C-FA96-4D02-8F37-FACB1D716A90}"
"UpgradeCode" = "8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.1.0"
+ "ProductVersion" = "8:11.1.1"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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,14 +566,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{BCA28DEE-33C4-4897-85D5-98DA9747054A}"
- "PackageCode" = "8:{D107C833-4867-4471-B5E7-36C3A5C26F2E}"
+ "ProductCode" = "8:{3850B0D3-70AF-4677-B2EA-E947BE2673FB}"
+ "PackageCode" = "8:{8DE2298B-4BEA-4453-A5FB-4DCAEB6EF4A1}"
"UpgradeCode" = "8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.1.0"
+ "ProductVersion" = "8:11.1.1"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff --git a/NT/installer64/MonetDB4-XQuery-Installer.vdproj
b/NT/installer64/MonetDB4-XQuery-Installer.vdproj
--- a/NT/installer64/MonetDB4-XQuery-Installer.vdproj
+++ b/NT/installer64/MonetDB4-XQuery-Installer.vdproj
@@ -4168,14 +4168,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB4"
- "ProductCode" = "8:{EB9DAD8E-B4D6-4100-B250-E1D231DC326B}"
- "PackageCode" = "8:{3A650591-F096-4B1D-B878-06DD15202F1B}"
+ "ProductCode" = "8:{94E1C712-5CBE-4317-8FEE-89B461393178}"
+ "PackageCode" = "8:{530F1FB9-DC19-47C8-8B55-4FBB90518827}"
"UpgradeCode" = "8:{AE963DBC-EE5D-4FCB-AAFD-37FED2302241}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.1.0"
+ "ProductVersion" = "8:11.1.1"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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:{ED180113-0260-405D-BE84-051345482E57}"
- "PackageCode" = "8:{7B8FF815-E532-4549-A621-10E9481DEED9}"
+ "ProductCode" = "8:{CB78E46D-4BE6-474C-9054-3BB65FC6D717}"
+ "PackageCode" = "8:{2FA2A15E-D9C9-4D07-A04E-B6EB556F332D}"
"UpgradeCode" = "8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.1.0"
+ "ProductVersion" = "8:11.1.1"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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
@@ -2665,7 +2665,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.1.0\\dump-restore.txt"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.1.1\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3705,7 +3705,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.1.0\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.1.1\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -5109,7 +5109,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.1.0"
+ "Name" = "8:MonetDB-SQL-11.1.1"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -5151,14 +5151,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{B90D913B-5C67-4BC7-9FB9-0157309A096D}"
- "PackageCode" = "8:{70EC6B53-5D37-4A97-931B-2EA93C126810}"
+ "ProductCode" = "8:{7112B366-9FCE-414C-95BF-DF586BDBEE32}"
+ "PackageCode" = "8:{6E5D0712-6066-4D8C-ACCA-653C8DF472BD}"
"UpgradeCode" = "8:{839D3C90-B578-41E2-A004-431440F9E899}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.1.0"
+ "ProductVersion" = "8:11.1.1"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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-2011 MonetDB B.V.
# All Rights Reserved.
-VERSION=11.1.0
+VERSION=11.1.1
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] 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,1,0,1
- PRODUCTVERSION 11,1,0,1
+ FILEVERSION 11,1,1,1
+ PRODUCTVERSION 11,1,1,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@
VALUE "Comments", "\0"
VALUE "CompanyName", "CWI\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", "11.1.0\0"
+ VALUE "FileVersion", "11.1.1\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] for details and/or
assistance.
@@ -28,7 +28,7 @@
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", "11.1.0\0"
+ VALUE "ProductVersion", "11.1.1\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] 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,1,0,1
- PRODUCTVERSION 11,1,0,1
+ FILEVERSION 11,1,1,1
+ PRODUCTVERSION 11,1,1,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@
VALUE "Comments", "\0"
VALUE "CompanyName", "CWI\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", "11.1.0\0"
+ VALUE "FileVersion", "11.1.1\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] for details and/or
assistance.
@@ -28,7 +28,7 @@
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
