From 1a9425ed517fcf89c68093f85c116b61f9c4b269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Bayo=C3=A1n=20Santiago=20Calder=C3=B3n?= Date: Wed, 4 Sep 2019 16:33:14 -0400 Subject: [PATCH 1/5] Use OSI standard license text Uses the OSI standard license text. --- LICENSE.md | 27 ++++++--------------------- README.md | 2 ++ 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index e530ff5..71bafee 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,22 +1,7 @@ -The Example.jl package is licensed under the MIT "Expat" License: +Copyright 2013 Stefan Karpinski, Iain Dunning, and other contributors. -> Copyright (c) 2013-2014: Stefan Karpinski, Iain Dunning, _et al._ -> -> 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. +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/README.md b/README.md index 0bbd6a6..798c359 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ Example Julia package repo. +[![License: MIT - Permissive License](https://img.shields.io/badge/License-MIT-blue.svg)](https://img.shields.io/github/license/JuliaLang/Example.jl) + [![](https://img.shields.io/badge/docs-stable-blue.svg)](https://JuliaLang.github.io/Example.jl/stable) [![](https://img.shields.io/badge/docs-dev-blue.svg)](https://JuliaLang.github.io/Example.jl/dev) From 5b27382989330e3cbc54b19cbafcd67ec753eb1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Bayo=C3=A1n=20Santiago=20Calder=C3=B3n?= Date: Mon, 9 Sep 2019 10:51:53 -0400 Subject: [PATCH 2/5] Remove License shield The shield is more cross remote hosting platform, but since most of the infrastructure is meant to be used with GitHub I think it would be redundant. --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 798c359..0bbd6a6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ Example Julia package repo. -[![License: MIT - Permissive License](https://img.shields.io/badge/License-MIT-blue.svg)](https://img.shields.io/github/license/JuliaLang/Example.jl) - [![](https://img.shields.io/badge/docs-stable-blue.svg)](https://JuliaLang.github.io/Example.jl/stable) [![](https://img.shields.io/badge/docs-dev-blue.svg)](https://JuliaLang.github.io/Example.jl/dev) From 68b80c11bbcd010852d8a60f8c2e8bc4b4cc0a7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Bayo=C3=A1n=20Santiago=20Calder=C3=B3n?= Date: Mon, 9 Sep 2019 12:02:13 -0400 Subject: [PATCH 3/5] Update LICENSE.md Using the Choose a License version which is still machine readable and the only difference is a license name header. --- LICENSE.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 71bafee..9cb941c 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,6 @@ -Copyright 2013 Stefan Karpinski, Iain Dunning, and other contributors. +MIT License + +Copyright (c) 2013 Stefan Karpinski, Iain Dunning, and other contributors. 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: From 6aae6df72ff18bb20c15cdd6e5808aa84e8266c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Bayo=C3=A1n=20Santiago=20Calder=C3=B3n?= Date: Wed, 25 Sep 2019 10:19:15 -0400 Subject: [PATCH 4/5] Added line breaks --- LICENSE.md | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 9cb941c..d8f8495 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,9 +1,21 @@ MIT License -Copyright (c) 2013 Stefan Karpinski, Iain Dunning, and other contributors. +Copyright (c) 2013-2014 Stefan Karpinski, Iain Dunning, Et al. -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: +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 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. +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 59bbd5d5e12aacdf795cce9d97395dfafa0ca387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Bayo=C3=A1n=20Santiago=20Calder=C3=B3n?= Date: Wed, 25 Sep 2019 10:35:37 -0400 Subject: [PATCH 5/5] Update LICENSE.md Co-Authored-By: Milan Bouchet-Valat --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index d8f8495..5c1a536 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2013-2014 Stefan Karpinski, Iain Dunning, Et al. +Copyright (c) 2013-2014 Stefan Karpinski, Iain Dunning, et al. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal