Changeset: a3437f3b1fb8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a3437f3b1fb8
Added Files:
buildtools/ChangeLog.Jun2016
clients/ChangeLog.Jun2016
clients/mapilib/ChangeLog.Jun2016
clients/python2/ChangeLog.Jun2016
clients/python3/ChangeLog.Jun2016
common/stream/ChangeLog.Jun2016
gdk/ChangeLog.Jun2016
geom/ChangeLog.Jun2016
java/ChangeLog.Jun2016
monetdb5/ChangeLog.Jun2016
sql/ChangeLog.Jun2016
testing/ChangeLog.Jun2016
tools/merovingian/ChangeLog.Jun2016
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
buildtools/ChangeLog
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/ChangeLog
gdk/libbat.rc
geom/ChangeLog
java/ChangeLog
monetdb5/ChangeLog
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog
vertoo.data
Branch: default
Log Message:
Step two towards a new stable branch "Jun2016".
Increment version numbers.
>From now on, *all* bug fixes, and *only* bug fixes, *must* go to the
stable branch with the name "Jun2016".
diffs (truncated from 627 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.22.0
+%define version 11.24.0
%{!?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
@@ -574,7 +574,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.22.0"
+ "ProductVersion" = "8:11.24.0"
"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
@@ -439,7 +439,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.22.0"
+ "ProductVersion" = "8:11.24.0"
"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
@@ -4270,7 +4270,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.22.0"
+ "ProductVersion" = "8:11.24.0"
"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
@@ -574,7 +574,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.22.0"
+ "ProductVersion" = "8:11.24.0"
"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
@@ -439,7 +439,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.22.0"
+ "ProductVersion" = "8:11.24.0"
"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
@@ -4270,7 +4270,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.22.0"
+ "ProductVersion" = "8:11.24.0"
"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
@@ -813,13 +813,13 @@
#define PACKAGE_NAME "MonetDB"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.22.0"
+#define PACKAGE_STRING "MonetDB 11.24.0"
/* 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.22.0"
+#define PACKAGE_VERSION "11.24.0"
/* 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.22.0
+VERSION=11.24.0
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog
--- a/buildtools/ChangeLog
+++ b/buildtools/ChangeLog
@@ -1,11 +1,3 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
-* Fri Feb 26 2016 Sjoerd Mullender <[email protected]>
-- A new package MonetDB-lidar (Fedora) or libmonetdb5-server-lidar
- (Debian/Ubuntu) has been created to work with LiDAR data.
-
-* Sat Jan 23 2016 Sjoerd Mullender <[email protected]>
-- Implemented a systemd configuration file for a monetdbd.service
- on Fedora.
-
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog.Jun2016
copy from buildtools/ChangeLog
copy to buildtools/ChangeLog.Jun2016
diff --git a/clients/ChangeLog b/clients/ChangeLog.Jun2016
copy from clients/ChangeLog
copy to clients/ChangeLog.Jun2016
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Jun2016
copy from clients/mapilib/ChangeLog
copy to clients/mapilib/ChangeLog.Jun2016
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,22,0,1
- PRODUCTVERSION 11,22,0,1
+ FILEVERSION 11,24,0,1
+ PRODUCTVERSION 11,24,0,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.22.0\0"
+ VALUE "FileVersion", "11.24.0\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.22.0\0"
+ VALUE "ProductVersion", "11.24.0\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,22,0,1
- PRODUCTVERSION 11,22,0,1
+ FILEVERSION 11,24,0,1
+ PRODUCTVERSION 11,24,0,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.22.0\0"
+ VALUE "FileVersion", "11.24.0\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.22.0\0"
+ VALUE "ProductVersion", "11.24.0\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,22,0,1
- PRODUCTVERSION 11,22,0,1
+ FILEVERSION 11,24,0,1
+ PRODUCTVERSION 11,24,0,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.22.0"
+ VALUE "FileVersion", "11.24.0"
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2015"
VALUE "OriginalFilename", "libMonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
- VALUE "ProductVersion", "11.22.0"
+ VALUE "ProductVersion", "11.24.0"
END
END
BLOCK "VarFileInfo"
diff --git a/clients/python2/ChangeLog b/clients/python2/ChangeLog.Jun2016
copy from clients/python2/ChangeLog
copy to clients/python2/ChangeLog.Jun2016
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.22.0',
+ version='11.24.0',
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.22.0.tar.gz',
+ download_url='<will be filled in before a
release>/python2-monetdb-11.24.0.tar.gz',
classifiers=[
"Topic :: Database",
"Topic :: Database :: Database Engines/Servers",
diff --git a/clients/python3/ChangeLog b/clients/python3/ChangeLog.Jun2016
copy from clients/python3/ChangeLog
copy to clients/python3/ChangeLog.Jun2016
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()
setup(name='python-monetdb',
- version='11.22.0',
+ version='11.24.0',
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>/python3-monetdb-11.22.0.tar.gz',
+ download_url='<will be filled in before a
release>/python3-monetdb-11.24.0.tar.gz',
classifiers=[
"Topic :: Database",
"Topic :: Database :: Database Engines/Servers",
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Jun2016
copy from common/stream/ChangeLog
copy to common/stream/ChangeLog.Jun2016
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -10,7 +10,7 @@ dnl Copyright 1997 - July 2008 CWI, Augu
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.60)
-AC_INIT([MonetDB], [11.22.0], [[email protected]], [MonetDB],
[http://www.monetdb.org/])
+AC_INIT([MonetDB], [11.24.0], [[email protected]], [MonetDB],
[http://www.monetdb.org/])
AC_CONFIG_AUX_DIR([buildtools/conf])
AC_CONFIG_MACRO_DIR([buildtools/conf])
AC_CANONICAL_HOST
diff --git a/gdk/ChangeLog b/gdk/ChangeLog
--- a/gdk/ChangeLog
+++ b/gdk/ChangeLog
@@ -1,78 +1,3 @@
# ChangeLog file for MonetDB
# This file is updated with Maddlog
-* Thu Jan 14 2016 Sjoerd Mullender <[email protected]>
-- Removed BATmmap. It was no longer used.
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
