Changeset: f49905982211 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f49905982211
Modified Files:
MonetDB.spec
cmake/monetdb-versions.cmake
Branch: default
Log Message:
Merge with octbugs branch.
diffs (136 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -786,3 +786,6 @@ 017e44827765fb819d31faefcdf9066dfe593f04
cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_3
017e44827765fb819d31faefcdf9066dfe593f04 Oct2020_release
cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_release
+bd91504a03736565fb2dff13cd4c94c738e81aa0 Oct2020_5
+cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_release
+bd91504a03736565fb2dff13cd4c94c738e81aa0 Oct2020_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -860,6 +860,13 @@ fi
%postun -p /sbin/ldconfig
%changelog
+* Tue Oct 13 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.5-20201013
+- Rebuilt.
+
+* Mon Oct 12 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.5-20201013
+- clients: mclient and msqldump now also look in $XDG_CONFIG_HOME for the
monetdb
+ configuration file.
+
* Fri Oct 09 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.3-20201009
- Rebuilt.
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Mon Oct 12 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.5-20201013
+- mclient and msqldump now also look in $XDG_CONFIG_HOME for the monetdb
+ configuration file.
+
* Mon Apr 20 2020 Sjoerd Mullender <sjo...@acm.org> - 11.37.1-20200511
- The monetdb-client-tools (Debian/Ubuntu) and MonetDB-client-tools
(Fedora/RH) containing the stethoscope, tachograph, and tomograph has
diff --git a/clients/ChangeLog.Oct2020 b/clients/ChangeLog.Oct2020
--- a/clients/ChangeLog.Oct2020
+++ b/clients/ChangeLog.Oct2020
@@ -1,7 +1,3 @@
# ChangeLog file for clients
# This file is updated with Maddlog
-* Mon Oct 12 2020 Sjoerd Mullender <sjo...@acm.org>
-- mclient and msqldump now also look in $XDG_CONFIG_HOME for the monetdb
- configuration file.
-
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 "1")
+set(GDK_VERSION_REVISION "2")
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}")
@@ -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 "0")
+set(MONETDB5_VERSION_REVISION "1")
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}")
@@ -78,7 +78,7 @@ set(MONETDBE_VERSION "${MONETDBE_VERSION
# version of the STREAM library (subdirectory common/stream)
set(STREAM_VERSION_CURRENT "14")
-set(STREAM_VERSION_REVISION "0")
+set(STREAM_VERSION_REVISION "1")
set(STREAM_VERSION_AGE "0")
math(EXPR STREAM_VERSION_MAJOR "${STREAM_VERSION_CURRENT} -
${STREAM_VERSION_AGE}")
set(STREAM_VERSION
"${STREAM_VERSION_MAJOR}.${STREAM_VERSION_AGE}.${STREAM_VERSION_REVISION}")
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+monetdb (11.39.5) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 13 Oct 2020 12:43:20 +0200
+
+monetdb (11.39.5) unstable; urgency=low
+
+ * clients: mclient and msqldump now also look in $XDG_CONFIG_HOME for the
monetdb
+ configuration file.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Mon, 12 Oct 2020 12:43:20 +0200
+
monetdb (11.39.3) 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.39.5) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 13 Oct 2020 12:43:20 +0200
+
+monetdb (11.39.5) unstable; urgency=low
+
+ * clients: mclient and msqldump now also look in $XDG_CONFIG_HOME for the
monetdb
+ configuration file.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Mon, 12 Oct 2020 12:43:20 +0200
+
monetdb (11.39.3) 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 @@
+* Tue Oct 13 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.5-20201013
+- Rebuilt.
+
+* Mon Oct 12 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.5-20201013
+- clients: mclient and msqldump now also look in $XDG_CONFIG_HOME for the
monetdb
+ configuration file.
+
* Fri Oct 09 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.3-20201009
- Rebuilt.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
