From 014835cedab6eb4c461b89882f22220abf71265d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 7 Jan 2020 19:23:43 +0000 Subject: [PATCH] Better licensing This frees the Makefile and default.nix, adds SPDX headers, and creates a LICENSES directory where files are named by SPDX identifier, because with three licenses it starts getting excessive to have them all in the root. --- COPYING.CC-BY-SA => LICENSES/CC-BY-SA-4.0 | 0 COPYING.GFDL => LICENSES/GFDL-1.3 | 0 LICENSES/MIT | 17 +++++++++++++++++ Makefile | 2 ++ default.nix | 2 ++ developer-manual.adoc | 2 ++ 6 files changed, 23 insertions(+) rename COPYING.CC-BY-SA => LICENSES/CC-BY-SA-4.0 (100%) rename COPYING.GFDL => LICENSES/GFDL-1.3 (100%) create mode 100644 LICENSES/MIT diff --git a/COPYING.CC-BY-SA b/LICENSES/CC-BY-SA-4.0 similarity index 100% rename from COPYING.CC-BY-SA rename to LICENSES/CC-BY-SA-4.0 diff --git a/COPYING.GFDL b/LICENSES/GFDL-1.3 similarity index 100% rename from COPYING.GFDL rename to LICENSES/GFDL-1.3 diff --git a/LICENSES/MIT b/LICENSES/MIT new file mode 100644 index 0000000..7215f69 --- /dev/null +++ b/LICENSES/MIT @@ -0,0 +1,17 @@ +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. \ No newline at end of file diff --git a/Makefile b/Makefile index 40acd00..b923b17 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: MIT + ASCIIDOCTOR = asciidoctor %.html: %.adoc diff --git a/default.nix b/default.nix index 6b05783..3f3b4aa 100644 --- a/default.nix +++ b/default.nix @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: MIT + with import {}; stdenv.mkDerivation { diff --git a/developer-manual.adoc b/developer-manual.adoc index 60d0276..078fdb2 100644 --- a/developer-manual.adoc +++ b/developer-manual.adoc @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GFDL-1.3-or-later OR CC-BY-SA-4.0 + = Spectrum Developers' Guide Alyssa Ross :toc: left -- git format-patch -1 --stdout -C 014835cedab6eb4c461b89882f22220abf71265d