Changeset: 9b1c9fb95694 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/9b1c9fb95694 Modified Files: gdk/gdk.h gdk/gdk_bbp.c gdk/gdk_private.h gdk/gdk_utils.c Branch: multi-cachelock Log Message:
merge with default diffs (truncated from 28052 to 300 lines): diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,11 @@ #[[ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V. #]] cmake_minimum_required(VERSION 3.12) diff --git a/Config.cmake.in b/Config.cmake.in --- a/Config.cmake.in +++ b/Config.cmake.in @@ -1,9 +1,11 @@ #[[ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V. #]] @PACKAGE_INIT@ diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1,8 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V. %global name MonetDB %global version 11.46.0 @@ -84,7 +86,7 @@ Summary: MonetDB - Monet Database Manage Vendor: MonetDB BV <[email protected]> Group: Applications/Databases -License: MPLv2.0 +License: MPL-2.0 URL: https://www.monetdb.org/ BugURL: https://bugs.monetdb.org/ Source: https://www.monetdb.org/downloads/sources/Sep2022-SP1/%{name}-%{version}.tar.bz2 @@ -128,6 +130,7 @@ BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(liblz4) >= 1.8 %if %{with py3integration} BuildRequires: pkgconfig(python3) >= 3.5 +# cannot use python3dist(numpy) because of CentOS 7 BuildRequires: python3-numpy %endif %if %{with rintegration} @@ -343,7 +346,6 @@ Recommends: perl-DBD-monetdb >= 1.0 Recommends: php-monetdb >= 1.0 %endif Requires: MonetDB5-server%{?_isa} = %{version}-%{release} -Requires: python3-pymonetdb >= 1.0.6 %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} > 7 Recommends: python3dist(lz4) Recommends: python3dist(scipy) @@ -690,6 +692,7 @@ package. You probably don't need this, Summary: MonetDB - Monet Database Management System Group: Applications/Databases Requires: %{name}-client-tests = %{version}-%{release} +Requires: python3dist(pymonetdb) >= 1.0.6 BuildArch: noarch %description testing-python diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py --- a/NT/mkodbcwxs.py +++ b/NT/mkodbcwxs.py @@ -1,8 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V. # python mkodbcwxs.py VERSION BITS PREFIX > PREFIX/MonetDB-ODBC-Installer.wxs # "c:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe" -nologo -arch x64/x86 PREFIX/MonetDB-ODBC-Installer.wxs diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py --- a/NT/mksqlwxs.py +++ b/NT/mksqlwxs.py @@ -1,8 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V. # python mksqlwxs.py VERSION BITS PREFIX > PREFIX/MonetDB5-SQL-Installer.wxs # "c:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe" -nologo -arch x64/x86 PREFIX/MonetDB5-SQL-Installer.wxs diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -141,8 +141,10 @@ Please note that we do not accept github Copyright Notice ================ +SPDX-License-Identifier: MPL-2.0 + This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. -Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. +Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V. diff --git a/buildtools/CMakeLists.txt b/buildtools/CMakeLists.txt --- a/buildtools/CMakeLists.txt +++ b/buildtools/CMakeLists.txt @@ -1,9 +1,11 @@ #[[ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V. #]] add_subdirectory(conf) diff --git a/buildtools/conf/CMakeLists.txt b/buildtools/conf/CMakeLists.txt --- a/buildtools/conf/CMakeLists.txt +++ b/buildtools/conf/CMakeLists.txt @@ -1,9 +1,11 @@ #[[ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V. #]] if(WIN32) diff --git a/buildtools/conf/Maddlog b/buildtools/conf/Maddlog --- a/buildtools/conf/Maddlog +++ b/buildtools/conf/Maddlog @@ -1,11 +1,13 @@ #!/usr/bin/env bash # -*-shell-script-*- +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V. usage() { cat >&2 <<-EOF diff --git a/buildtools/conf/website.html b/buildtools/conf/website.html --- a/buildtools/conf/website.html +++ b/buildtools/conf/website.html @@ -1,9 +1,11 @@ <!-- +SPDX-License-Identifier: MPL-2.0 + This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. -Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. +Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V. --> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> diff --git a/buildtools/coverity_model.c b/buildtools/coverity_model.c --- a/buildtools/coverity_model.c +++ b/buildtools/coverity_model.c @@ -1,9 +1,11 @@ /* + * SPDX-License-Identifier: MPL-2.0 + * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V. */ /* diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt --- a/clients/CMakeLists.txt +++ b/clients/CMakeLists.txt @@ -1,9 +1,11 @@ #[[ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V. #]] add_subdirectory(mapiclient) diff --git a/clients/NT/CMakeLists.txt b/clients/NT/CMakeLists.txt --- a/clients/NT/CMakeLists.txt +++ b/clients/NT/CMakeLists.txt @@ -1,9 +1,11 @@ #[[ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V. #]] # These files have to be installed in the root of the project. But you diff --git a/clients/NT/mclient.bat b/clients/NT/mclient.bat --- a/clients/NT/mclient.bat +++ b/clients/NT/mclient.bat @@ -1,8 +1,10 @@ +@REM SPDX-License-Identifier: MPL-2.0 +@REM @REM This Source Code Form is subject to the terms of the Mozilla Public @REM License, v. 2.0. If a copy of the MPL was not distributed with this @REM file, You can obtain one at http://mozilla.org/MPL/2.0/. @REM -@REM Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. +@REM Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V. @echo off rem figure out the folder name diff --git a/clients/NT/msqldump.bat b/clients/NT/msqldump.bat --- a/clients/NT/msqldump.bat +++ b/clients/NT/msqldump.bat @@ -1,8 +1,10 @@ +@REM SPDX-License-Identifier: MPL-2.0 +@REM @REM This Source Code Form is subject to the terms of the Mozilla Public @REM License, v. 2.0. If a copy of the MPL was not distributed with this @REM file, You can obtain one at http://mozilla.org/MPL/2.0/. @REM -@REM Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. +@REM Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V. @rem figure out the folder name @set MONETDB=%~dp0 diff --git a/clients/Tests/MAL-signatures-hge.test b/clients/Tests/MAL-signatures-hge.test --- a/clients/Tests/MAL-signatures-hge.test +++ b/clients/Tests/MAL-signatures-hge.test @@ -44832,7 +44832,7 @@ geom Length command geom.Length(X_0:wkb):dbl wkbLength; -Returns the cartesian 2D length of the geometry if it is a linestrin or multilinestring +Returns the cartesian 2D length of the geometry if it is a linestring or multilinestring geom LineFromText command geom.LineFromText(X_0:str):wkb diff --git a/clients/Tests/MAL-signatures.test b/clients/Tests/MAL-signatures.test --- a/clients/Tests/MAL-signatures.test +++ b/clients/Tests/MAL-signatures.test @@ -33282,7 +33282,7 @@ geom Length command geom.Length(X_0:wkb):dbl wkbLength; -Returns the cartesian 2D length of the geometry if it is a linestrin or multilinestring +Returns the cartesian 2D length of the geometry if it is a linestring or multilinestring geom LineFromText command geom.LineFromText(X_0:str):wkb diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -736,7 +736,6 @@ str AUTHinitTables(void); str AUTHrequireAdmin(Client c); str AUTHunlockVault(const char *password); str AUTHverifyPassword(const char *passwd); _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
