From 167bbd23ff841ad152db507f157137d46eb73729 Mon Sep 17 00:00:00 2001 From: "Moritz Tim W." <90388353+moritztim@users.noreply.github.com> Date: Tue, 12 Nov 2024 20:50:39 +0100 Subject: [PATCH 1/6] rename license file --- MIT => LICENSE | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename MIT => LICENSE (100%) diff --git a/MIT b/LICENSE similarity index 100% rename from MIT rename to LICENSE From cfb815b29987bebb107de0842ceb6ff7efd17404 Mon Sep 17 00:00:00 2001 From: "Moritz Tim W." <90388353+moritztim@users.noreply.github.com> Date: Tue, 12 Nov 2024 21:10:15 +0100 Subject: [PATCH 2/6] Use SPDX License Expression The dilemma of two license choices can be solved with the disjunctive "OR" operator defined by SPDX. See https://spdx.github.io/spdx-spec/v3.0.1/annexes/spdx-license-expressions/ --- LICENSE | 22 +--------------------- APACHE2.0 => LICENSES/APACHE-2.0 | 0 LICENSES/MIT | 21 +++++++++++++++++++++ 3 files changed, 22 insertions(+), 21 deletions(-) rename APACHE2.0 => LICENSES/APACHE-2.0 (100%) create mode 100644 LICENSES/MIT diff --git a/LICENSE b/LICENSE index 92d4f52..364b773 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1 @@ -MIT License - -Copyright (c) 2021 rp-rs organization - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +MIT OR Apache-2.0 \ No newline at end of file diff --git a/APACHE2.0 b/LICENSES/APACHE-2.0 similarity index 100% rename from APACHE2.0 rename to LICENSES/APACHE-2.0 diff --git a/LICENSES/MIT b/LICENSES/MIT new file mode 100644 index 0000000..92d4f52 --- /dev/null +++ b/LICENSES/MIT @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 rp-rs organization + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 3b13b18b6ce9263f54f2ce03e43225ee2a188fe7 Mon Sep 17 00:00:00 2001 From: "Moritz Tim W." <90388353+moritztim@users.noreply.github.com> Date: Tue, 12 Nov 2024 21:16:54 +0100 Subject: [PATCH 3/6] rename license options to be recognizable by tools --- LICENSES/{APACHE-2.0 => LICENSE.APACHE-2.0} | 0 LICENSES/{MIT => LICENSE.MIT} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename LICENSES/{APACHE-2.0 => LICENSE.APACHE-2.0} (100%) rename LICENSES/{MIT => LICENSE.MIT} (100%) diff --git a/LICENSES/APACHE-2.0 b/LICENSES/LICENSE.APACHE-2.0 similarity index 100% rename from LICENSES/APACHE-2.0 rename to LICENSES/LICENSE.APACHE-2.0 diff --git a/LICENSES/MIT b/LICENSES/LICENSE.MIT similarity index 100% rename from LICENSES/MIT rename to LICENSES/LICENSE.MIT From 5c9e32650db4a75ae37cbcdc9eda9571af0316d5 Mon Sep 17 00:00:00 2001 From: "Moritz Tim W." <90388353+moritztim@users.noreply.github.com> Date: Tue, 12 Nov 2024 21:17:58 +0100 Subject: [PATCH 4/6] move licenses back to root --- LICENSES/LICENSE.APACHE-2.0 => LICENSE.APACHE-2.0 | 0 LICENSES/LICENSE.MIT => LICENSE.MIT | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename LICENSES/LICENSE.APACHE-2.0 => LICENSE.APACHE-2.0 (100%) rename LICENSES/LICENSE.MIT => LICENSE.MIT (100%) diff --git a/LICENSES/LICENSE.APACHE-2.0 b/LICENSE.APACHE-2.0 similarity index 100% rename from LICENSES/LICENSE.APACHE-2.0 rename to LICENSE.APACHE-2.0 diff --git a/LICENSES/LICENSE.MIT b/LICENSE.MIT similarity index 100% rename from LICENSES/LICENSE.MIT rename to LICENSE.MIT From 08978253530ed005f7890dc60551f8d5c6e5a712 Mon Sep 17 00:00:00 2001 From: "Moritz Tim W." <90388353+moritztim@users.noreply.github.com> Date: Tue, 12 Nov 2024 21:36:39 +0100 Subject: [PATCH 5/6] Use hyphen instead of dot --- LICENSE.APACHE-2.0 => LICENSE-APACHE-2.0 | 0 LICENSE.MIT => LICENSE-MIT | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename LICENSE.APACHE-2.0 => LICENSE-APACHE-2.0 (100%) rename LICENSE.MIT => LICENSE-MIT (100%) diff --git a/LICENSE.APACHE-2.0 b/LICENSE-APACHE-2.0 similarity index 100% rename from LICENSE.APACHE-2.0 rename to LICENSE-APACHE-2.0 diff --git a/LICENSE.MIT b/LICENSE-MIT similarity index 100% rename from LICENSE.MIT rename to LICENSE-MIT From cb0706eceb80f925572b1db1289d90e562a7c340 Mon Sep 17 00:00:00 2001 From: "Moritz Tim W." <90388353+moritztim@users.noreply.github.com> Date: Tue, 12 Nov 2024 22:46:36 +0100 Subject: [PATCH 6/6] Update references --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2ad72eb..0ce816a 100644 --- a/README.md +++ b/README.md @@ -277,9 +277,9 @@ to intervene to uphold that code of conduct. ## License -The contents of this repository are dual-licensed under the _MIT OR Apache -2.0_ License. That means you can chose either the MIT licence or the -Apache-2.0 licence when you re-use this code. See `MIT` or `APACHE2.0` for more +The contents of this repository are dual-licensed under the [_MIT OR Apache +2.0_ License](LICENSE). That means you can chose either the MIT licence or the +Apache-2.0 licence when you re-use this code. See [`LICENSE-MIT`](LICENSE-MIT) or [`LICENSE-APACHE-2.0`](LICENSE-APACHE-2.0) for more information on each specific licence. Any submissions to this project (e.g. as Pull Requests) must be made available