Changeset: 4ea7f15c36f0 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4ea7f15c36f0 Modified Files: MonetDB.spec cmake/monetdb-versions.cmake Branch: default Log Message:
Merge with octbugs branch. diffs (71 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -783,3 +783,6 @@ bb157905ecb86908dcfb112d102a8c6152557b5d 94231c85384d893701beeeb69996f57c70fade4d Oct2020_root 017e44827765fb819d31faefcdf9066dfe593f04 Oct2020_1 017e44827765fb819d31faefcdf9066dfe593f04 Oct2020_release +cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_3 +017e44827765fb819d31faefcdf9066dfe593f04 Oct2020_release +cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -860,6 +860,9 @@ fi %postun -p /sbin/ldconfig %changelog +* Fri Oct 09 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.3-20201009 +- Rebuilt. + * Tue Oct 06 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.1-20201006 - Rebuilt. - BZ#3553: All schema access to ubiquitous functions 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 "21") -set(GDK_VERSION_REVISION "0") +set(GDK_VERSION_REVISION "1") set(GDK_VERSION_AGE "0") math(EXPR GDK_VERSION_MAJOR "${GDK_VERSION_CURRENT} - ${GDK_VERSION_AGE}") set(GDK_VERSION "${GDK_VERSION_MAJOR}.${GDK_VERSION_AGE}.${GDK_VERSION_REVISION}") diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +monetdb (11.39.3) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 09 Oct 2020 09:48:30 +0200 + monetdb (11.39.1) 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,9 @@ +monetdb (11.39.3) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 09 Oct 2020 09:48:30 +0200 + monetdb (11.39.1) 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,6 @@ +* Fri Oct 09 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.3-20201009 +- Rebuilt. + * Tue Oct 06 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.1-20201006 - Rebuilt. - BZ#3553: All schema access to ubiquitous functions _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list