From 7164c557f90bf7bcb886354049f5d946bce143b6 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Thu, 5 Dec 2019 10:33:54 +0100 Subject: [PATCH] Revert "LICENSE: merge UNLICENSE and LICENSE-MIT to please license identifiers" This reverts commit b74f2d2d1cb74406f8a2f5a6aad9c9fdb16f2cea. Reason: the merging was done to please the license detection library underlying pkg.go.dev. Since pkg.go.dev treats dual licensed projects as the intersection ("AND") of the licenses, and because the UNLICENSE is not supported per https://pkg.go.dev/license-policy revert to the usual once-license-per-file. Signed-off-by: Elias Naur --- LICENSE-MIT | 21 +++++++++++++++++++++ LICENSE => UNLICENSE | 26 -------------------------- 2 files changed, 21 insertions(+), 26 deletions(-) create mode 100644 LICENSE-MIT rename LICENSE => UNLICENSE (51%) diff --git a/LICENSE-MIT b/LICENSE-MIT new file mode 100644 index 00000000..476055e4 --- /dev/null +++ b/LICENSE-MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2019 The Gio authors + +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. diff --git a/LICENSE b/UNLICENSE similarity index 51% rename from LICENSE rename to UNLICENSE index e09be989..1915d47f 100644 --- a/LICENSE +++ b/UNLICENSE @@ -1,5 +1,3 @@ -SPDX-License-Identifier: Unlicense OR MIT - This is free and unencumbered software released into the public domain. @@ -25,27 +23,3 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. For more information, please refer to - - - -The MIT License (MIT) - -Copyright (c) 2019 The Gio authors - -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.