Changeset: 0742e0bdc4cd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0742e0bdc4cd
Modified Files:
MonetDB.spec
cmake/monetdb-versions.cmake
Branch: default
Log Message:
Merge with Jul2021 branch.
diffs (196 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -808,3 +808,6 @@ 489951059c7fc87ef706d8a563cd024ebdeed108
404cb13ad1bc3469bfaf5b7696a4d2cfe5ce71f4 Jul2021_3
489951059c7fc87ef706d8a563cd024ebdeed108 Jul2021_release
404cb13ad1bc3469bfaf5b7696a4d2cfe5ce71f4 Jul2021_release
+9ab0adea978c184d895ca445792a79f26cb9d075 Jul2021_5
+404cb13ad1bc3469bfaf5b7696a4d2cfe5ce71f4 Jul2021_release
+9ab0adea978c184d895ca445792a79f26cb9d075 Jul2021_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -843,6 +843,17 @@ else
fi
%changelog
+* Tue Aug 03 2021 Sjoerd Mullender <sjo...@acm.org> - 11.41.5-20210803
+- Rebuilt.
+- GH#7161: fix priority
+
+* Tue Aug 3 2021 Sjoerd Mullender <sjo...@acm.org> - 11.41.5-20210803
+- gdk: A bug in the grouping code has been fixed.
+
+* Tue Aug 3 2021 Sjoerd Mullender <sjo...@acm.org> - 11.41.5-20210803
+- sql: The system view sys.ids has been updated to include some more system
+ IDs.
+
* Fri Jul 30 2021 Sjoerd Mullender <sjo...@acm.org> - 11.41.3-20210730
- Rebuilt.
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -53,7 +53,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
# common/options and common/utils)
set(GDK_VERSION_CURRENT "23")
set(GDK_VERSION_MINOR "0")
-set(GDK_VERSION_PATCH "1")
+set(GDK_VERSION_PATCH "2")
math(EXPR GDK_VERSION_MAJOR "${GDK_VERSION_CURRENT} - ${GDK_VERSION_MINOR}")
set(GDK_VERSION
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
@@ -67,7 +67,7 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.
# version of the MONETDB5 library (subdirectory monetdb5, not including extras
or sql)
set(MONETDB5_VERSION_CURRENT "31")
set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "1")
+set(MONETDB5_VERSION_PATCH "2")
math(EXPR MONETDB5_VERSION_MAJOR "${MONETDB5_VERSION_CURRENT} -
${MONETDB5_VERSION_MINOR}")
set(MONETDB5_VERSION
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}")
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+monetdb (11.41.5) unstable; urgency=low
+
+ * Rebuilt.
+ * GH#7161: fix priority
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 03 Aug 2021 11:13:26 +0200
+
+monetdb (11.41.5) unstable; urgency=low
+
+ * gdk: A bug in the grouping code has been fixed.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 3 Aug 2021 11:13:26 +0200
+
+monetdb (11.41.5) unstable; urgency=low
+
+ * sql: The system view sys.ids has been updated to include some more system
+ IDs.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 3 Aug 2021 11:13:26 +0200
+
monetdb (11.41.3) unstable; urgency=low
* Rebuilt.
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 9), cmake (
Standards-Version: 3.8.0
X-Python-Version: >= 2.6
-Package: libmonetdb22
+Package: libmonetdb21
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libmonetdb5-server-geom (<< ${source:Version})
@@ -34,7 +34,7 @@ Description: MonetDB core library
Package: libmonetdb-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb22, libmonetdb-stream-dev
+ libmonetdb21, libmonetdb-stream-dev
Description: MonetDB development files
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
diff --git a/debian/libmonetdb22.install b/debian/libmonetdb21.install
rename from debian/libmonetdb22.install
rename to debian/libmonetdb21.install
diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive
--- a/gdk/ChangeLog-Archive
+++ b/gdk/ChangeLog-Archive
@@ -1,6 +1,9 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Tue Aug 3 2021 Sjoerd Mullender <sjo...@acm.org> - 11.41.5-20210803
+- A bug in the grouping code has been fixed.
+
* Fri Jul 30 2021 Sjoerd Mullender <sjo...@acm.org> - 11.41.3-20210730
- Hash indexes are no longer maintained at all cost: if the number of
distinct values is too small compared to the total number of values,
diff --git a/gdk/ChangeLog.Jul2021 b/gdk/ChangeLog.Jul2021
--- a/gdk/ChangeLog.Jul2021
+++ b/gdk/ChangeLog.Jul2021
@@ -1,6 +1,3 @@
# ChangeLog file for GDK
# This file is updated with Maddlog
-* Tue Aug 3 2021 Sjoerd Mullender <sjo...@acm.org>
-- A bug in the grouping code has been fixed.
-
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,23 @@
+monetdb (11.41.5) unstable; urgency=low
+
+ * Rebuilt.
+ * GH#7161: fix priority
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 03 Aug 2021 11:13:26 +0200
+
+monetdb (11.41.5) unstable; urgency=low
+
+ * gdk: A bug in the grouping code has been fixed.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 3 Aug 2021 11:13:26 +0200
+
+monetdb (11.41.5) unstable; urgency=low
+
+ * sql: The system view sys.ids has been updated to include some more system
+ IDs.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 3 Aug 2021 11:13:26 +0200
+
monetdb (11.41.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,14 @@
+* Tue Aug 03 2021 Sjoerd Mullender <sjo...@acm.org> - 11.41.5-20210803
+- Rebuilt.
+- GH#7161: fix priority
+
+* Tue Aug 3 2021 Sjoerd Mullender <sjo...@acm.org> - 11.41.5-20210803
+- gdk: A bug in the grouping code has been fixed.
+
+* Tue Aug 3 2021 Sjoerd Mullender <sjo...@acm.org> - 11.41.5-20210803
+- sql: The system view sys.ids has been updated to include some more system
+ IDs.
+
* Fri Jul 30 2021 Sjoerd Mullender <sjo...@acm.org> - 11.41.3-20210730
- Rebuilt.
diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive
--- a/sql/ChangeLog-Archive
+++ b/sql/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Tue Aug 3 2021 Sjoerd Mullender <sjo...@acm.org> - 11.41.5-20210803
+- The system view sys.ids has been updated to include some more system
+ IDs.
+
* Fri Jul 30 2021 Sjoerd Mullender <sjo...@acm.org> - 11.41.3-20210730
- The sys.storage() function now only returns meta data, i.e. data that
can be calculated without access to the column contents.
diff --git a/sql/ChangeLog.Jul2021 b/sql/ChangeLog.Jul2021
--- a/sql/ChangeLog.Jul2021
+++ b/sql/ChangeLog.Jul2021
@@ -1,7 +1,3 @@
# ChangeLog file for sql
# This file is updated with Maddlog
-* Tue Aug 3 2021 Sjoerd Mullender <sjo...@acm.org>
-- The system view sys.ids has been updated to include some more system
- IDs.
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
