Changeset: 6d61c8a73476 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/6d61c8a73476 Modified Files: .hgtags MonetDB.spec cmake/monetdb-versions.cmake debian/changelog misc/packages/deb/changelog misc/packages/rpm/changelog Branch: default Log Message:
Merge with Jun2023 branch. diffs (116 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -811,3 +811,4 @@ 573511e0e7bf2f7ab11f00b45711aab5f1aff6f2 573511e0e7bf2f7ab11f00b45711aab5f1aff6f2 Jun2023_SP1_release ce63ebe9a78c52ef0cbe8fd6f2159d2637f0387c Jun2023_7 1efa83c6409769d13b2ee30e497d5f7ab42fa955 Jun2023_9 +6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_11 diff --git a/ChangeLog-Archive b/ChangeLog-Archive --- a/ChangeLog-Archive +++ b/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Fri Sep 29 2023 Sjoerd Mullender <[email protected]> - 11.47.11-20230929 +- Fixed an installation issue on Debian and Ubuntu introduced in the + last build. + * Wed Aug 30 2023 Sjoerd Mullender <[email protected]> - 11.47.7-20230925 - Do a lot more error checking, mostly for allocation failures. More is still needed, though. diff --git a/ChangeLog.Jun2023 b/ChangeLog.Jun2023 --- a/ChangeLog.Jun2023 +++ b/ChangeLog.Jun2023 @@ -1,7 +1,3 @@ # ChangeLog file for devel # This file is updated with Maddlog -* Fri Sep 29 2023 Sjoerd Mullender <[email protected]> -- Fixed an installation issue on Debian and Ubuntu introduced in the - last build. - diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -860,6 +860,13 @@ fi %endif %changelog +* Fri Sep 29 2023 Sjoerd Mullender <[email protected]> - 11.47.11-20230929 +- Rebuilt. + +* Fri Sep 29 2023 Sjoerd Mullender <[email protected]> - 11.47.11-20230929 +- MonetDB: Fixed an installation issue on Debian and Ubuntu introduced in the + last build. + * Wed Sep 27 2023 Sjoerd Mullender <[email protected]> - 11.47.9-20230927 - Rebuilt. - GH#7402: Privileges on merge table not propagated to partition tables diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake --- a/cmake/monetdb-versions.cmake +++ b/cmake/monetdb-versions.cmake @@ -42,7 +42,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M # common/options and common/utils) set(GDK_VERSION_MAJOR "27") set(GDK_VERSION_MINOR "0") -set(GDK_VERSION_PATCH "3") +set(GDK_VERSION_PATCH "4") set(GDK_VERSION "${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}") # version of the MAPI library (subdirectory clients/mapilib) diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +monetdb (11.47.11) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Fri, 29 Sep 2023 12:00:43 +0200 + +monetdb (11.47.11) unstable; urgency=low + + * MonetDB: Fixed an installation issue on Debian and Ubuntu introduced in the + last build. + + -- Sjoerd Mullender <[email protected]> Fri, 29 Sep 2023 12:00:43 +0200 + monetdb (11.47.9) unstable; urgency=low * Rebuilt. diff --git a/misc/packages/deb/changelog b/misc/packages/deb/changelog --- a/misc/packages/deb/changelog +++ b/misc/packages/deb/changelog @@ -1,3 +1,16 @@ +monetdb (11.47.11) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Fri, 29 Sep 2023 12:00:43 +0200 + +monetdb (11.47.11) unstable; urgency=low + + * MonetDB: Fixed an installation issue on Debian and Ubuntu introduced in the + last build. + + -- Sjoerd Mullender <[email protected]> Fri, 29 Sep 2023 12:00:43 +0200 + monetdb (11.47.9) unstable; urgency=low * Rebuilt. diff --git a/misc/packages/rpm/changelog b/misc/packages/rpm/changelog --- a/misc/packages/rpm/changelog +++ b/misc/packages/rpm/changelog @@ -1,3 +1,10 @@ +* Fri Sep 29 2023 Sjoerd Mullender <[email protected]> - 11.47.11-20230929 +- Rebuilt. + +* Fri Sep 29 2023 Sjoerd Mullender <[email protected]> - 11.47.11-20230929 +- MonetDB: Fixed an installation issue on Debian and Ubuntu introduced in the + last build. + * Wed Sep 27 2023 Sjoerd Mullender <[email protected]> - 11.47.9-20230927 - Rebuilt. - GH#7402: Privileges on merge table not propagated to partition tables _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
