From f2e056bf06c6e04c5d08b6b8fc5b472f7071c881 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Tue, 28 Mar 2023 10:44:58 +1300 Subject: [PATCH] License everything under the GPL version 2 --- COPYING | 35 ++--------------------------------- Makefile | 16 +++++++++++++++- README.md | 8 ++++---- esv.d | 37 +++++++++++++------------------------ main.d | 6 +++--- 5 files changed, 37 insertions(+), 65 deletions(-) diff --git a/COPYING b/COPYING index 0ed4056..f93c1b2 100644 --- a/COPYING +++ b/COPYING @@ -1,36 +1,5 @@ -All files except esv.d are licensed under the -GNU General Public License, version 3. - -The file esv.d is licensed under the -BSD 3-Clause License, which is as follows: - -The BSD 3-Clause License (BSD3) - -Copyright (c) 2023 Jeremy Baxter. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution. -3. Neither the name of the copyright holder the nor the -names of its contributors may be used to endorse or promote products -derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER ''AS IS'' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -The GNU General Public License is as follows: +This software is licensed under the GNU General Public License, version 2. +The license is as follows: GNU GENERAL PUBLIC LICENSE Version 2, June 1991 diff --git a/Makefile b/Makefile index 5be1678..0d9e3b9 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,18 @@ -### If you fail to build, run 'make deps'! ### +# The GPLv2 License (GPLv2) +# Copyright (c) 2023 Jeremy Baxter +# +# esv is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# esv is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with esv. If not, see . PROG = esv IMPORT = import diff --git a/README.md b/README.md index dafb069..c419413 100644 --- a/README.md +++ b/README.md @@ -66,12 +66,12 @@ All documentation is contained in the manual pages. To access them, you can run ## Copying -Copying, modifying and redistributing all files part of this software except esv.d is permitted -as long as your changed conform to the GNU General Public License version 2. +Copying, modifying and redistributing this software is permitted +as long as your modified version conforms to the GNU General Public License version 2. -The file esv.d is a reusable library. It is covered under the BSD 3-Clause License. +The file esv.d is a reusable library. -In both cases, the licenses are contained in the file COPYING. +The license is contained in the file COPYING. This software uses a modified version of a library named "dini". This is released under the Boost Software License version 1.0, which can be found in import/dini/LICENSE. diff --git a/esv.d b/esv.d index 13bdca1..4fc6a86 100644 --- a/esv.d +++ b/esv.d @@ -1,32 +1,21 @@ /* * esv.d: a reusable interface to the ESV HTTP API - * licensed under the BSD 3-Clause License: * - * The BSD 3-Clause License (BSD3) - * - * Copyright (c) 2023 Jeremy Baxter. All rights reserved. + * The GPLv2 License (GPLv2) + * Copyright (c) 2023 Jeremy Baxter * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder the nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. + * esv is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER ''AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * esv is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with esv. If not, see . */ import std.algorithm : filter, map; diff --git a/main.d b/main.d index d8f537a..9d6accb 100644 --- a/main.d +++ b/main.d @@ -4,18 +4,18 @@ * The GPLv2 License (GPLv2) * Copyright (c) 2023 Jeremy Baxter * - * This program is free software: you can redistribute it and/or modify + * esv is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * esv is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with esv. If not, see . */ import std.conv : to, ConvException;