Changeset: 1e1bf7ad1e1b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1e1bf7ad1e1b Modified Files: .hgtags MonetDB.spec cmake/monetdb-versions.cmake Branch: default Log Message:
Merge with Oct2020 branch. diffs (92 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -796,3 +796,5 @@ 929f5e280bc1532a2bfaab127ca7915dc3b69a33 742b7847cfdcea39a6c19ab29eb35471d46bb2bb Oct2020_11 929f5e280bc1532a2bfaab127ca7915dc3b69a33 Oct2020_SP2_release 742b7847cfdcea39a6c19ab29eb35471d46bb2bb Oct2020_SP2_release +17d27ad30941c81e4bc700300912e84e9b9a8c37 Oct2020_13 +17d27ad30941c81e4bc700300912e84e9b9a8c37 Oct2020_SP3_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -84,7 +84,7 @@ Group: Applications/Databases License: MPLv2.0 URL: https://www.monetdb.org/ BugURL: https://bugs.monetdb.org/ -Source: https://www.monetdb.org/downloads/sources/Oct2020-SP2/%{name}-%{version}.tar.bz2 +Source: https://www.monetdb.org/downloads/sources/Oct2020-SP3/%{name}-%{version}.tar.bz2 # The Fedora packaging document says we need systemd-rpm-macros for # the _unitdir and _tmpfilesdir macros to exist; however on RHEL 7 @@ -828,6 +828,10 @@ else fi %changelog +* Thu Feb 11 2021 Sjoerd Mullender <sjo...@acm.org> - 11.39.13-20210211 +- Rebuilt. +- GH#7049: Implement DISTINCT for GROUP_CONCAT + * Mon Jan 18 2021 Sjoerd Mullender <sjo...@acm.org> - 11.39.11-20210118 - Rebuilt. - GH#3772: Any user can grant a role. diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake --- a/cmake/monetdb-versions.cmake +++ b/cmake/monetdb-versions.cmake @@ -50,7 +50,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M # version of the GDK library (subdirectory gdk; also includes # common/options and common/utils) set(GDK_VERSION_CURRENT "22") -set(GDK_VERSION_REVISION "1") +set(GDK_VERSION_REVISION "2") set(GDK_VERSION_AGE "1") math(EXPR GDK_VERSION_MAJOR "${GDK_VERSION_CURRENT} - ${GDK_VERSION_AGE}") set(GDK_VERSION "${GDK_VERSION_MAJOR}.${GDK_VERSION_AGE}.${GDK_VERSION_REVISION}") @@ -64,7 +64,7 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}. # version of the MONETDB5 library (subdirectory monetdb5, not including extras or sql) set(MONETDB5_VERSION_CURRENT "30") -set(MONETDB5_VERSION_REVISION "4") +set(MONETDB5_VERSION_REVISION "5") set(MONETDB5_VERSION_AGE "0") math(EXPR MONETDB5_VERSION_MAJOR "${MONETDB5_VERSION_CURRENT} - ${MONETDB5_VERSION_AGE}") set(MONETDB5_VERSION "${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_AGE}.${MONETDB5_VERSION_REVISION}") diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +monetdb (11.39.13) unstable; urgency=low + + * Rebuilt. + * GH#7049: Implement DISTINCT for GROUP_CONCAT + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 11 Feb 2021 10:59:33 +0100 + monetdb (11.39.11) 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,10 @@ +monetdb (11.39.13) unstable; urgency=low + + * Rebuilt. + * GH#7049: Implement DISTINCT for GROUP_CONCAT + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 11 Feb 2021 10:59:33 +0100 + monetdb (11.39.11) 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,7 @@ +* Thu Feb 11 2021 Sjoerd Mullender <sjo...@acm.org> - 11.39.13-20210211 +- Rebuilt. +- GH#7049: Implement DISTINCT for GROUP_CONCAT + * Mon Jan 18 2021 Sjoerd Mullender <sjo...@acm.org> - 11.39.11-20210118 - Rebuilt. - GH#3772: Any user can grant a role. _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
