diff options
| -rw-r--r-- | .clang-format | 2 | ||||
| -rw-r--r-- | .gitattributes | 2 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .reuse/dep5 | 4 | ||||
| -rw-r--r-- | LICENSES/0BSD.txt | 12 | ||||
| -rw-r--r-- | LICENSES/CC0-1.0.txt | 121 | ||||
| -rw-r--r-- | doc/_static/meson.build | 2 | ||||
| -rw-r--r-- | doc/c/Doxyfile.in | 2 | ||||
| -rw-r--r-- | doc/c/api/meson.build | 2 | ||||
| -rw-r--r-- | doc/c/meson.build | 2 | ||||
| -rw-r--r-- | doc/c/xml/meson.build | 2 | ||||
| -rw-r--r-- | doc/meson.build | 2 | ||||
| -rw-r--r-- | include/.clang-tidy | 2 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | meson/library/meson.build | 2 | ||||
| -rw-r--r-- | meson/suppressions/meson.build | 2 | ||||
| -rw-r--r-- | meson/warnings/meson.build | 2 | ||||
| -rw-r--r-- | meson_options.txt | 2 | ||||
| -rw-r--r-- | src/.clang-tidy | 2 | ||||
| -rw-r--r-- | test/.clang-tidy | 2 | ||||
| -rw-r--r-- | test/meson.build | 2 |
22 files changed, 33 insertions, 142 deletions
diff --git a/.clang-format b/.clang-format index 9999285c..4ff6f72e 100644 --- a/.clang-format +++ b/.clang-format @@ -1,5 +1,5 @@ # Copyright 2020-2021 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: CC0-1.0 OR ISC +# SPDX-License-Identifier: 0BSD OR ISC --- AlignConsecutiveAssignments: true diff --git a/.gitattributes b/.gitattributes index ab4d2bf5..6a1e5baa 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,5 @@ # Copyright 2020 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: CC0-1.0 OR ISC +# SPDX-License-Identifier: 0BSD OR ISC *.nq -text *.nt -text @@ -1,5 +1,5 @@ # Copyright 2017-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: CC0-1.0 OR ISC +# SPDX-License-Identifier: 0BSD OR ISC build/** __pycache__ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f92a9c5..85679227 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ # Copyright 2018-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: CC0-1.0 OR ISC +# SPDX-License-Identifier: 0BSD OR ISC stages: [build, deploy] diff --git a/.reuse/dep5 b/.reuse/dep5 index 43a1fcc5..239debe5 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -16,12 +16,12 @@ License: BSD-3-Clause OR ISC Files: AUTHORS NEWS serd.ttl Copyright: 2011-2022 David Robillard <d@drobilla.net> Comment: Contributed to the Commons as a representation of simple facts -License: CC0-1.0 OR ISC +License: 0BSD OR ISC Files: doc/.stylelintrc.json Copyright: 2022 David Robillard <d@drobilla.net> Comment: Contributed to the Commons as a tool configuration -License: CC0-1.0 OR ISC +License: 0BSD OR ISC Files: doc/_static/serd.svg doc/serdi-*.svg doc/serdi-*.txt Copyright: 2011-2022 David Robillard <d@drobilla.net> diff --git a/LICENSES/0BSD.txt b/LICENSES/0BSD.txt new file mode 100644 index 00000000..b3e8cfd9 --- /dev/null +++ b/LICENSES/0BSD.txt @@ -0,0 +1,12 @@ +Copyright 2011-2022 David Robillard <d@drobilla.net> + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. diff --git a/LICENSES/CC0-1.0.txt b/LICENSES/CC0-1.0.txt deleted file mode 100644 index 0e259d42..00000000 --- a/LICENSES/CC0-1.0.txt +++ /dev/null @@ -1,121 +0,0 @@ -Creative Commons Legal Code - -CC0 1.0 Universal - - CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE - LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN - ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS - INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES - REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS - PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM - THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED - HEREUNDER. - -Statement of Purpose - -The laws of most jurisdictions throughout the world automatically confer -exclusive Copyright and Related Rights (defined below) upon the creator -and subsequent owner(s) (each and all, an "owner") of an original work of -authorship and/or a database (each, a "Work"). - -Certain owners wish to permanently relinquish those rights to a Work for -the purpose of contributing to a commons of creative, cultural and -scientific works ("Commons") that the public can reliably and without fear -of later claims of infringement build upon, modify, incorporate in other -works, reuse and redistribute as freely as possible in any form whatsoever -and for any purposes, including without limitation commercial purposes. -These owners may contribute to the Commons to promote the ideal of a free -culture and the further production of creative, cultural and scientific -works, or to gain reputation or greater distribution for their Work in -part through the use and efforts of others. - -For these and/or other purposes and motivations, and without any -expectation of additional consideration or compensation, the person -associating CC0 with a Work (the "Affirmer"), to the extent that he or she -is an owner of Copyright and Related Rights in the Work, voluntarily -elects to apply CC0 to the Work and publicly distribute the Work under its -terms, with knowledge of his or her Copyright and Related Rights in the -Work and the meaning and intended legal effect of CC0 on those rights. - -1. Copyright and Related Rights. A Work made available under CC0 may be -protected by copyright and related or neighboring rights ("Copyright and -Related Rights"). Copyright and Related Rights include, but are not -limited to, the following: - - i. the right to reproduce, adapt, distribute, perform, display, - communicate, and translate a Work; - ii. moral rights retained by the original author(s) and/or performer(s); -iii. publicity and privacy rights pertaining to a person's image or - likeness depicted in a Work; - iv. rights protecting against unfair competition in regards to a Work, - subject to the limitations in paragraph 4(a), below; - v. rights protecting the extraction, dissemination, use and reuse of data - in a Work; - vi. database rights (such as those arising under Directive 96/9/EC of the - European Parliament and of the Council of 11 March 1996 on the legal - protection of databases, and under any national implementation - thereof, including any amended or successor version of such - directive); and -vii. other similar, equivalent or corresponding rights throughout the - world based on applicable law or treaty, and any national - implementations thereof. - -2. Waiver. To the greatest extent permitted by, but not in contravention -of, applicable law, Affirmer hereby overtly, fully, permanently, -irrevocably and unconditionally waives, abandons, and surrenders all of -Affirmer's Copyright and Related Rights and associated claims and causes -of action, whether now known or unknown (including existing as well as -future claims and causes of action), in the Work (i) in all territories -worldwide, (ii) for the maximum duration provided by applicable law or -treaty (including future time extensions), (iii) in any current or future -medium and for any number of copies, and (iv) for any purpose whatsoever, -including without limitation commercial, advertising or promotional -purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each -member of the public at large and to the detriment of Affirmer's heirs and -successors, fully intending that such Waiver shall not be subject to -revocation, rescission, cancellation, termination, or any other legal or -equitable action to disrupt the quiet enjoyment of the Work by the public -as contemplated by Affirmer's express Statement of Purpose. - -3. Public License Fallback. Should any part of the Waiver for any reason -be judged legally invalid or ineffective under applicable law, then the -Waiver shall be preserved to the maximum extent permitted taking into -account Affirmer's express Statement of Purpose. In addition, to the -extent the Waiver is so judged Affirmer hereby grants to each affected -person a royalty-free, non transferable, non sublicensable, non exclusive, -irrevocable and unconditional license to exercise Affirmer's Copyright and -Related Rights in the Work (i) in all territories worldwide, (ii) for the -maximum duration provided by applicable law or treaty (including future -time extensions), (iii) in any current or future medium and for any number -of copies, and (iv) for any purpose whatsoever, including without -limitation commercial, advertising or promotional purposes (the -"License"). The License shall be deemed effective as of the date CC0 was -applied by Affirmer to the Work. Should any part of the License for any -reason be judged legally invalid or ineffective under applicable law, such -partial invalidity or ineffectiveness shall not invalidate the remainder -of the License, and in such case Affirmer hereby affirms that he or she -will not (i) exercise any of his or her remaining Copyright and Related -Rights in the Work or (ii) assert any associated claims and causes of -action with respect to the Work, in either case contrary to Affirmer's -express Statement of Purpose. - -4. Limitations and Disclaimers. - - a. No trademark or patent rights held by Affirmer are waived, abandoned, - surrendered, licensed or otherwise affected by this document. - b. Affirmer offers the Work as-is and makes no representations or - warranties of any kind concerning the Work, express, implied, - statutory or otherwise, including without limitation warranties of - title, merchantability, fitness for a particular purpose, non - infringement, or the absence of latent or other defects, accuracy, or - the present or absence of errors, whether or not discoverable, all to - the greatest extent permissible under applicable law. - c. Affirmer disclaims responsibility for clearing rights of other persons - that may apply to the Work or any use thereof, including without - limitation any person's Copyright and Related Rights in the Work. - Further, Affirmer disclaims responsibility for obtaining any necessary - consents, permissions or other rights required for any use of the - Work. - d. Affirmer understands and acknowledges that Creative Commons is not a - party to this document and has no duty or obligation with respect to - this CC0 or use of the Work. diff --git a/doc/_static/meson.build b/doc/_static/meson.build index 1d7d7306..3ddb2100 100644 --- a/doc/_static/meson.build +++ b/doc/_static/meson.build @@ -1,4 +1,4 @@ # Copyright 2020-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: CC0-1.0 OR ISC +# SPDX-License-Identifier: 0BSD OR ISC configure_file(copy: true, input: '../../resources/serd.svg', output: 'serd.svg') diff --git a/doc/c/Doxyfile.in b/doc/c/Doxyfile.in index 6290a224..a33ec7c4 100644 --- a/doc/c/Doxyfile.in +++ b/doc/c/Doxyfile.in @@ -1,5 +1,5 @@ # Copyright 2021-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: CC0-1.0 OR ISC +# SPDX-License-Identifier: 0BSD OR ISC PROJECT_NAME = Serd PROJECT_BRIEF = "A lightweight C library for working with RDF data" diff --git a/doc/c/api/meson.build b/doc/c/api/meson.build index fcf67919..377cb2b4 100644 --- a/doc/c/api/meson.build +++ b/doc/c/api/meson.build @@ -1,5 +1,5 @@ # Copyright 2020-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: CC0-1.0 OR ISC +# SPDX-License-Identifier: 0BSD OR ISC c_serd_rst = custom_target( 'serd.rst', diff --git a/doc/c/meson.build b/doc/c/meson.build index d31733f7..a2f7eaa5 100644 --- a/doc/c/meson.build +++ b/doc/c/meson.build @@ -1,5 +1,5 @@ # Copyright 2020-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: CC0-1.0 OR ISC +# SPDX-License-Identifier: 0BSD OR ISC config = configuration_data() config.set('SERD_VERSION', meson.project_version()) diff --git a/doc/c/xml/meson.build b/doc/c/xml/meson.build index dee40d6c..34852719 100644 --- a/doc/c/xml/meson.build +++ b/doc/c/xml/meson.build @@ -1,5 +1,5 @@ # Copyright 2020-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: CC0-1.0 OR ISC +# SPDX-License-Identifier: 0BSD OR ISC doxygen = find_program('doxygen') diff --git a/doc/meson.build b/doc/meson.build index 85e18a97..b97ba610 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -1,5 +1,5 @@ # Copyright 2020-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: CC0-1.0 OR ISC +# SPDX-License-Identifier: 0BSD OR ISC docdir = get_option('datadir') / 'doc' diff --git a/include/.clang-tidy b/include/.clang-tidy index 93d47f1c..a2f9d2b0 100644 --- a/include/.clang-tidy +++ b/include/.clang-tidy @@ -1,5 +1,5 @@ # Copyright 2020-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: CC0-1.0 OR ISC +# SPDX-License-Identifier: 0BSD OR ISC Checks: > *, -*-uppercase-literal-suffix, diff --git a/meson.build b/meson.build index 08710ee6..a3c81cb7 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ # Copyright 2021-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: CC0-1.0 OR ISC +# SPDX-License-Identifier: 0BSD OR ISC project('serd', ['c'], version: '0.30.15', diff --git a/meson/library/meson.build b/meson/library/meson.build index fffc8310..756a222c 100644 --- a/meson/library/meson.build +++ b/meson/library/meson.build @@ -1,5 +1,5 @@ # Copyright 2020-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: CC0-1.0 OR ISC +# SPDX-License-Identifier: 0BSD OR ISC # General definitions for building libraries. # diff --git a/meson/suppressions/meson.build b/meson/suppressions/meson.build index 20410def..f722ebe0 100644 --- a/meson/suppressions/meson.build +++ b/meson/suppressions/meson.build @@ -1,5 +1,5 @@ # Copyright 2020-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: CC0-1.0 OR ISC +# SPDX-License-Identifier: 0BSD OR ISC # Project-specific warning suppressions. # diff --git a/meson/warnings/meson.build b/meson/warnings/meson.build index 4d23ad36..80d57749 100644 --- a/meson/warnings/meson.build +++ b/meson/warnings/meson.build @@ -1,5 +1,5 @@ # Copyright 2020-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: CC0-1.0 OR ISC +# SPDX-License-Identifier: 0BSD OR ISC # General code to enable approximately all warnings in GCC 12, clang, and MSVC. # diff --git a/meson_options.txt b/meson_options.txt index 11cfca3b..38bc94e3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,5 +1,5 @@ # Copyright 2021-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: CC0-1.0 OR ISC +# SPDX-License-Identifier: 0BSD OR ISC option('docs', type: 'feature', value: 'auto', yield: true, description: 'Build documentation') diff --git a/src/.clang-tidy b/src/.clang-tidy index 197df00a..58879c35 100644 --- a/src/.clang-tidy +++ b/src/.clang-tidy @@ -1,5 +1,5 @@ # Copyright 2020-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: CC0-1.0 OR ISC +# SPDX-License-Identifier: 0BSD OR ISC Checks: > *, diff --git a/test/.clang-tidy b/test/.clang-tidy index 2a9fd8bc..007a0847 100644 --- a/test/.clang-tidy +++ b/test/.clang-tidy @@ -1,5 +1,5 @@ # Copyright 2020-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: CC0-1.0 OR ISC +# SPDX-License-Identifier: 0BSD OR ISC Checks: > *, -*-magic-numbers, diff --git a/test/meson.build b/test/meson.build index 1aaa7183..eaf8fff3 100644 --- a/test/meson.build +++ b/test/meson.build @@ -1,5 +1,5 @@ # Copyright 2020-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: CC0-1.0 OR ISC +# SPDX-License-Identifier: 0BSD OR ISC run_test_suite = files('run_test_suite.py') |