Changeset: ad8625ed769d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/ad8625ed769d Added Files: ChangeLog.Aug2024 clients/ChangeLog.Aug2024 clients/mapilib/ChangeLog.Aug2024 clients/odbc/ChangeLog.Aug2024 common/stream/ChangeLog.Aug2024 gdk/ChangeLog.Aug2024 geom/ChangeLog.Aug2024 misc/ChangeLog.Aug2024 monetdb5/ChangeLog.Aug2024 sql/ChangeLog.Aug2024 testing/ChangeLog.Aug2024 tools/merovingian/ChangeLog.Aug2024 Removed Files: ChangeLog clients/ChangeLog clients/mapilib/ChangeLog clients/odbc/ChangeLog common/stream/ChangeLog gdk/ChangeLog geom/ChangeLog misc/ChangeLog monetdb5/ChangeLog sql/ChangeLog testing/ChangeLog tools/merovingian/ChangeLog Modified Files: .bumpversion.cfg MonetDB.spec clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc cmake/monetdb-versions.cmake debian/control gdk/libbat.rc monetdb5/tools/libmonetdb5.rc sql/backends/monet5/sql_upgrades.c Branch: Aug2024 Log Message:
Step one towards a new stable branch "Aug2024". Incremented version numbers. Moved ChangeLog file to ChangeLog.Aug2024. The root of the stable branch is "Aug2024_root". diffs (256 lines): diff --git a/.bumpversion.cfg b/.bumpversion.cfg --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 11.50.0 +current_version = 11.51.0 commit = False tag = False diff --git a/ChangeLog b/ChangeLog.Aug2024 rename from ChangeLog rename to ChangeLog.Aug2024 diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -8,7 +8,7 @@ # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. -%global version 11.50.0 +%global version 11.51.0 %bcond_with compat diff --git a/clients/ChangeLog b/clients/ChangeLog.Aug2024 rename from clients/ChangeLog rename to clients/ChangeLog.Aug2024 diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Aug2024 rename from clients/mapilib/ChangeLog rename to clients/mapilib/ChangeLog.Aug2024 diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc --- a/clients/mapilib/mapi.rc +++ b/clients/mapilib/mapi.rc @@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U #define sversion(major,minor,patch) #major "." #minor "." #patch "\0" 1 VERSIONINFO - FILEVERSION version(11,50,0) - PRODUCTVERSION version(11,50,0) + FILEVERSION version(11,51,0) + PRODUCTVERSION version(11,51,0) FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -21,14 +21,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "MonetDB Foundation\0" VALUE "FileDescription", "MonetDB Application Interface DLL\0" - VALUE "FileVersion", sversion(11,50,0) + VALUE "FileVersion", sversion(11,51,0) VALUE "InternalName", "Mapi\0" VALUE "LegalCopyright", "Copyright (c) 2024 MonetDB Foundation\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "Mapi.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB Client Libraries\0" - VALUE "ProductVersion", sversion(11,50,0) + VALUE "ProductVersion", sversion(11,51,0) VALUE "SpecialBuild", "\0" END END diff --git a/clients/odbc/ChangeLog b/clients/odbc/ChangeLog.Aug2024 rename from clients/odbc/ChangeLog rename to clients/odbc/ChangeLog.Aug2024 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 @@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U #define sversion(major,minor,patch) #major "." #minor "." #patch "\0" 1 VERSIONINFO - FILEVERSION version(11,50,0) - PRODUCTVERSION version(11,50,0) + FILEVERSION version(11,51,0) + PRODUCTVERSION version(11,51,0) FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -21,14 +21,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "MonetDB Foundation\0" VALUE "FileDescription", "MonetDB ODBC Driver DLL\0" - VALUE "FileVersion", sversion(11,50,0) + VALUE "FileVersion", sversion(11,51,0) VALUE "InternalName", "MonetODBC\0" VALUE "LegalCopyright", "Copyright (c) 2024 MonetDB Foundation\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "MonetODBC.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB SQL Server\0" - VALUE "ProductVersion", sversion(11,50,0) + VALUE "ProductVersion", sversion(11,51,0) VALUE "SpecialBuild", "\0" END END 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 @@ -65,8 +65,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION version(11,50,0) - PRODUCTVERSION version(11,50,0) + FILEVERSION version(11,51,0) + PRODUCTVERSION version(11,51,0) FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -83,12 +83,12 @@ BEGIN BEGIN VALUE "CompanyName", "MonetDB Foundation" VALUE "FileDescription", "MonetDB ODBC Setup DLL" - VALUE "FileVersion", sversion(11,50,0) + VALUE "FileVersion", sversion(11,51,0) VALUE "InternalName", "MonetODBCs.dll" VALUE "LegalCopyright", "Copyright (c) 2024 MonetDB Foundation" VALUE "OriginalFilename", "MonetODBCs.dll" VALUE "ProductName", "MonetDB SQL Server" - VALUE "ProductVersion", sversion(11,50,0) + VALUE "ProductVersion", sversion(11,51,0) END END BLOCK "VarFileInfo" diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake --- a/cmake/monetdb-versions.cmake +++ b/cmake/monetdb-versions.cmake @@ -11,7 +11,7 @@ #]] set(MONETDB_VERSION_MAJOR "11") -set(MONETDB_VERSION_MINOR "50") +set(MONETDB_VERSION_MINOR "51") set(MONETDB_VERSION_PATCH "0") if(RELEASE_VERSION) diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Aug2024 rename from common/stream/ChangeLog rename to common/stream/ChangeLog.Aug2024 diff --git a/debian/control b/debian/control --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: MonetDB Foundation <i...@monetdb.org> Homepage: https://www.monetdb.org/ Vcs-Browser: https://dev.monetdb.org/hg/MonetDB/ -Vcs-Hg: https://dev.monetdb.org/hg/MonetDB/ -b default +Vcs-Hg: https://dev.monetdb.org/hg/MonetDB/ -b Aug2024 Build-Depends: debhelper-compat (= 12), cmake (>= 3.12), bison, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.10.0), libpcre3-dev, libreadline-dev, liblzma-dev, liblz4-dev (>= 1.8.0), diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Aug2024 rename from gdk/ChangeLog rename to gdk/ChangeLog.Aug2024 diff --git a/gdk/libbat.rc b/gdk/libbat.rc --- a/gdk/libbat.rc +++ b/gdk/libbat.rc @@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U #define sversion(major,minor,patch) #major "." #minor "." #patch "\0" 1 VERSIONINFO - FILEVERSION version(11,50,0) - PRODUCTVERSION version(11,50,0) + FILEVERSION version(11,51,0) + PRODUCTVERSION version(11,51,0) FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -21,14 +21,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "MonetDB Foundation\0" VALUE "FileDescription", "MonetDB Goblin Database Kernel DLL\0" - VALUE "FileVersion", sversion(11,50,0) + VALUE "FileVersion", sversion(11,51,0) VALUE "InternalName", "libbat\0" VALUE "LegalCopyright", "Copyright (c) 2024 MonetDB Foundation\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "libbat.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB Common Libraries\0" - VALUE "ProductVersion", sversion(11,50,0) + VALUE "ProductVersion", sversion(11,51,0) VALUE "SpecialBuild", "\0" END END diff --git a/geom/ChangeLog b/geom/ChangeLog.Aug2024 rename from geom/ChangeLog rename to geom/ChangeLog.Aug2024 diff --git a/misc/ChangeLog b/misc/ChangeLog.Aug2024 rename from misc/ChangeLog rename to misc/ChangeLog.Aug2024 diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog.Aug2024 rename from monetdb5/ChangeLog rename to monetdb5/ChangeLog.Aug2024 diff --git a/monetdb5/tools/libmonetdb5.rc b/monetdb5/tools/libmonetdb5.rc --- a/monetdb5/tools/libmonetdb5.rc +++ b/monetdb5/tools/libmonetdb5.rc @@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U #define sversion(major,minor,patch) #major "." #minor "." #patch "\0" 1 VERSIONINFO - FILEVERSION version(11,50,0) - PRODUCTVERSION version(11,50,0) + FILEVERSION version(11,51,0) + PRODUCTVERSION version(11,51,0) FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -21,14 +21,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "MonetDB Foundation\0" VALUE "FileDescription", "MonetDB5 Library DLL\0" - VALUE "FileVersion", sversion(11,50,0) + VALUE "FileVersion", sversion(11,51,0) VALUE "InternalName", "libmonetdb5\0" VALUE "LegalCopyright", "Copyright (c) 2024 MonetDB Foundation\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "libmonetdb5.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB5 Server\0" - VALUE "ProductVersion", sversion(11,50,0) + VALUE "ProductVersion", sversion(11,51,0) VALUE "SpecialBuild", "\0" END END diff --git a/sql/ChangeLog b/sql/ChangeLog.Aug2024 rename from sql/ChangeLog rename to sql/ChangeLog.Aug2024 diff --git a/sql/backends/monet5/sql_upgrades.c b/sql/backends/monet5/sql_upgrades.c --- a/sql/backends/monet5/sql_upgrades.c +++ b/sql/backends/monet5/sql_upgrades.c @@ -6643,7 +6643,7 @@ sql_update_dec2023_sp4(Client c, mvc *sq } static str -sql_update_default(Client c, mvc *sql, sql_schema *s) +sql_update_aug2024(Client c, mvc *sql, sql_schema *s) { char *err; res_table *output; @@ -7352,7 +7352,7 @@ SQLupgrades(Client c, mvc *m) goto handle_error; } - if ((err = sql_update_default(c, m, s)) != NULL) { + if ((err = sql_update_aug2024(c, m, s)) != NULL) { TRC_CRITICAL(SQL_PARSER, "%s\n", err); goto handle_error; } diff --git a/testing/ChangeLog b/testing/ChangeLog.Aug2024 rename from testing/ChangeLog rename to testing/ChangeLog.Aug2024 diff --git a/tools/merovingian/ChangeLog b/tools/merovingian/ChangeLog.Aug2024 rename from tools/merovingian/ChangeLog rename to tools/merovingian/ChangeLog.Aug2024 _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org