Changeset: 6b5030eefcb4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b5030eefcb4
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: Jul2015
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.21.0
+%define version 11.21.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,15 +566,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{5B108DEE-F274-43CF-B986-16021B022170}"
- "PackageCode" = "8:{5C32B67B-1F03-4C7A-AE0D-71C24985DCE3}"
+ "ProductCode" = "8:{B8CD791B-24F2-42A9-8391-18EE36BD15A4}"
+ "PackageCode" = "8:{BDF785DA-B6C9-4D54-800D-98656084A40F}"
"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.21.0"
+ "ProductVersion" = "8:11.21.1"
"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:{49D21FF6-D17E-4037-8EC5-CDBD58AB6738}"
- "PackageCode" = "8:{F161B791-C91B-43F4-A915-9D2FA8C59AC7}"
+ "ProductCode" = "8:{B244052B-D66F-45C2-ABDC-FB420ABF2EAD}"
+ "PackageCode" = "8:{3995386A-62AF-45CB-A774-AFC31535DBA4}"
"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.21.0"
+ "ProductVersion" = "8:11.21.1"
"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
@@ -4236,15 +4236,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{70076A01-0484-452F-BDFB-B0AABBED7978}"
- "PackageCode" = "8:{274A2C5E-EE28-4BF1-997E-C974ADF05560}"
+ "ProductCode" = "8:{2124CD62-6456-4566-9C0F-F0E9320C14EE}"
+ "PackageCode" = "8:{495734DE-DBB6-4F4A-B4D8-F1B4E16115D4}"
"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.21.0"
+ "ProductVersion" = "8:11.21.1"
"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:{0DD096EA-A791-4D97-AD3C-5EC69F2A495E}"
- "PackageCode" = "8:{B6C87B73-7277-46B8-B443-65665B5A634C}"
+ "ProductCode" = "8:{480C679F-C475-4968-897E-4D8F2D708F67}"
+ "PackageCode" = "8:{6FB9F338-EA2E-4C6C-920D-EB603CD5786E}"
"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.21.0"
+ "ProductVersion" = "8:11.21.1"
"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:{BD1A3C71-3A8E-421D-922D-2B7A19926B5C}"
- "PackageCode" = "8:{471DD1DA-9C69-4289-821D-4CC329A8BA94}"
+ "ProductCode" = "8:{7705AECC-C1A7-4875-9846-AF1970188DD3}"
+ "PackageCode" = "8:{C796ADAE-9229-4DE1-94CC-3510F0825749}"
"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.21.0"
+ "ProductVersion" = "8:11.21.1"
"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
@@ -4236,15 +4236,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{ACC32EDD-13CE-4079-A6E7-D9DD94DA42EE}"
- "PackageCode" = "8:{332EB6D8-73DD-48CA-83E7-BB1922FFE3BD}"
+ "ProductCode" = "8:{C79EA17A-CC0B-4AAC-B139-6CA861F23725}"
+ "PackageCode" = "8:{3E6C1E7C-9B8B-41E9-B8F3-2FB9EE29FE29}"
"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.21.0"
+ "ProductVersion" = "8:11.21.1"
"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
@@ -773,7 +773,7 @@
#define MONETDB5_PASSWDHASH "SHA512"
/* Release name or "unreleased" */
-#define MONETDB_RELEASE "unreleased"
+#define MONETDB_RELEASE "Jul2015"
/* Define if the oid type should use 32 bits on a 64-bit architecture */
/* #undef MONET_OID32 */
@@ -794,13 +794,13 @@
#define PACKAGE_NAME "MonetDB"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.21.0"
+#define PACKAGE_STRING "MonetDB 11.21.1"
/* 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.21.0"
+#define PACKAGE_VERSION "11.21.1"
/* 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 2008-2015 MonetDB B.V.
-VERSION=11.21.0
+VERSION=11.21.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,21,0,1
- PRODUCTVERSION 11,21,0,1
+ FILEVERSION 11,21,1,1
+ PRODUCTVERSION 11,21,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.21.0\0"
+ VALUE "FileVersion", "11.21.1\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] 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.21.0\0"
+ VALUE "ProductVersion", "11.21.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,21,0,1
- PRODUCTVERSION 11,21,0,1
+ FILEVERSION 11,21,1,1
+ PRODUCTVERSION 11,21,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.21.0\0"
+ VALUE "FileVersion", "11.21.1\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] 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.21.0\0"
+ VALUE "ProductVersion", "11.21.1\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] 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,21,0,1
- PRODUCTVERSION 11,21,0,1
+ FILEVERSION 11,21,1,1
+ PRODUCTVERSION 11,21,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.21.0"
+ VALUE "FileVersion", "11.21.1"
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2015"
VALUE "OriginalFilename", "libMonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
- VALUE "ProductVersion", "11.21.0"
+ VALUE "ProductVersion", "11.21.1"
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.21.0',
+ version='11.21.1',
description='Native MonetDB client Python API',
long_description=read('README.rst'),
author='MonetDB BV',
author_email='[email protected]',
url='http://www.monetdb.org/',
packages=['monetdb', 'monetdb.sql'],
- download_url='<will be filled in before a
release>/python2-monetdb-11.21.0.tar.gz',
+
download_url='http://dev.monetdb.org/downloads/sources/Jul2015/python2-monetdb-11.21.1.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
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
