From b74f2d2d1cb74406f8a2f5a6aad9c9fdb16f2cea Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Tue, 3 Sep 2019 19:11:52 +0200 Subject: [PATCH] LICENSE: merge UNLICENSE and LICENSE-MIT to please license identifiers Apparently github.com/google/licenseclassifier/tools/identify_license doesn't like that LICENSE is missing. Merging the two separate license files makes one less file, and by adding the SPDX identifier at the top I believe there is even less ambiguity that Gio is covered by the UNLICENSE as well as the MIT license, as described in the README.md file. Signed-off-by: Elias Naur --- UNLICENSE => LICENSE | 26 ++++++++++++++++++++++++++ LICENSE-MIT | 21 --------------------- 2 files changed, 26 insertions(+), 21 deletions(-) rename UNLICENSE => LICENSE (51%) delete mode 100644 LICENSE-MIT diff --git a/UNLICENSE b/LICENSE similarity index 51% rename from UNLICENSE rename to LICENSE index 9f2b4198..09ea7b2b 100644 --- a/UNLICENSE +++ b/LICENSE @@ -1,3 +1,5 @@ +SPDX-License-Identifier: Unlicense OR MIT + This is free and unencumbered software released into the public domain. @@ -23,3 +25,27 @@ 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. diff --git a/LICENSE-MIT b/LICENSE-MIT deleted file mode 100644 index 404585ba..00000000 --- a/LICENSE-MIT +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2019 Elias Naur - -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.