use dual license GPLv3 and LGPLv3

aconchillo · May 23, 2018 · 455be85 · 455be85
1 parent 3061e2f
commit 455be85
Show file tree

Hide file tree

Showing 10 changed files with 255 additions and 242 deletions.
diff --git a/INSTALL b/INSTALL
diff --git a/Makefile.am b/Makefile.am
@@ -1,24 +1,26 @@
 #
 # Makefile.am
 #
-# Copyright (C) 2013 Aleix Conchillo Flaque <aconchillo@gmail.com>
+# Copyright (C) 2013-2018 Aleix Conchillo Flaque <aconchillo@gmail.com>
 #
 # This file is part of guile-json.
 #
 # guile-json is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 3 of the License, or (at your option) any later version.
+# modify it under the terms of the GNU General Public License and
+# the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
 #
 # guile-json 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
-# Lesser General Public License for more details.
+# General Public License and the GNU Lesser General Public License
+# for more details.
 #
-# You should have received a copy of the GNU Lesser General Public
-# License along with guile-json; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
+# You should have received a copy of the GNU General Public License
+# and the GNU Lesser General Public License along with guile-json;
+# if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #
 
 SUBDIRS = json

diff --git a/README.org b/README.org
@@ -3,21 +3,20 @@
 
 guile-json is a JSON module for Guile. It supports parsing and
 building JSON documents according to the http://json.org
-specification. These are the main features:
+specification.
 
-- Mostly complies with http://json.org specification (see UTF-8 below).
+- Complies with http://json.org specification.
 
-- Build JSON documents programmatically using scheme data types.
-
-- Supports UTF-8 (doesn't fully support unicode hexadecimal digits).
+- Builds JSON documents programmatically using scheme data types.
 
 - Allows JSON pretty printing.
 
 
 * Installation
 
-guile-json is freely available for download under the terms of the GNU
-Lesser General Public License version 3 (LGPLv3+).
+guile-json is freely available for download under the terms of the GNU General
+Public License version 3 (GPLv3) as well as the GNU Lesser General Public
+License version 3 (LGPLv3).
 
 Download the latest tarball and untar it:
 
@@ -123,7 +122,7 @@ port (calling /port-line/ or /port-column/ on the port).
 
 - Build the string "hello world":
 
-    : scheme@(guile-user)> (scm->json "hello world")
+    : scheme@(guile-user)> (scm->json "hello world ")
     : "hello world"
 
 - Build the [1, 2, 3] array:

diff --git a/configure.ac b/configure.ac
@@ -1,24 +1,26 @@
 #
 # configure.ac
 #
-# Copyright (C) 2013-2017 Aleix Conchillo Flaque <aconchillo@gmail.com>
+# Copyright (C) 2013-2018 Aleix Conchillo Flaque <aconchillo@gmail.com>
 #
 # This file is part of guile-json.
 #
 # guile-json is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 3 of the License, or (at your option) any later version.
+# modify it under the terms of the GNU General Public License and
+# the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
 #
 # guile-json 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
-# Lesser General Public License for more details.
+# General Public License and the GNU Lesser General Public License
+# for more details.
 #
-# You should have received a copy of the GNU Lesser General Public
-# License along with guile-json; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
+# You should have received a copy of the GNU General Public License
+# and the GNU Lesser General Public License along with guile-json;
+# if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #
 
 AC_INIT([guile-json], [0.6.0], [aconchillo@gmail.com])

diff --git a/json.scm b/json.scm
@@ -1,23 +1,25 @@
 ;;; (json) --- Guile JSON implementation.
 
-;; Copyright (C) 2013 Aleix Conchillo Flaque <aconchillo@gmail.com>
+;; Copyright (C) 2013-2018 Aleix Conchillo Flaque <aconchillo@gmail.com>
 ;;
 ;; This file is part of guile-json.
 ;;
 ;; guile-json is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 3 of the License, or (at your option) any later version.
+;; modify it under the terms of the GNU General Public License and
+;; the GNU Lesser General Public License as published by the Free
+;; Software Foundation; either version 3 of the License, or (at your
+;; option) any later version.
 ;;
 ;; guile-json 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
-;; Lesser General Public License for more details.
+;; General Public License and the GNU Lesser General Public License
+;; for more details.
 ;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with guile-json; if not, write to the Free Software
-;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-;; 02110-1301 USA
+;; You should have received a copy of the GNU General Public License
+;; and the GNU Lesser General Public License along with guile-json;
+;; if not, write to the Free Software Foundation, Inc.,
+;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 ;;; Commentary:
 

diff --git a/json/Makefile.am b/json/Makefile.am
@@ -1,24 +1,26 @@
 #
 # Makefile.am
 #
-# Copyright (C) 2013 Aleix Conchillo Flaque <aconchillo@gmail.com>
+# Copyright (C) 2013-2018 Aleix Conchillo Flaque <aconchillo@gmail.com>
 #
 # This file is part of guile-json.
 #
 # guile-json is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 3 of the License, or (at your option) any later version.
+# modify it under the terms of the GNU General Public License and
+# the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
 #
 # guile-json 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
-# Lesser General Public License for more details.
+# General Public License and the GNU Lesser General Public License
+# for more details.
 #
-# You should have received a copy of the GNU Lesser General Public
-# License along with guile-json; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
+# You should have received a copy of the GNU General Public License
+# and the GNU Lesser General Public License along with guile-json;
+# if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #
 
 moddir=$(prefix)/share/guile/site/json

diff --git a/json/builder.scm b/json/builder.scm
@@ -1,24 +1,26 @@
 ;;; (json builder) --- Guile JSON implementation.
 
-;; Copyright (C) 2013 Aleix Conchillo Flaque <aconchillo@gmail.com>
+;; Copyright (C) 2013-2018 Aleix Conchillo Flaque <aconchillo@gmail.com>
 ;; Copyright (C) 2015,2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;
 ;; This file is part of guile-json.
 ;;
 ;; guile-json is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 3 of the License, or (at your option) any later version.
+;; modify it under the terms of the GNU General Public License and
+;; the GNU Lesser General Public License as published by the Free
+;; Software Foundation; either version 3 of the License, or (at your
+;; option) any later version.
 ;;
 ;; guile-json 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
-;; Lesser General Public License for more details.
+;; General Public License and the GNU Lesser General Public License
+;; for more details.
 ;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with guile-json; if not, write to the Free Software
-;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-;; 02110-1301 USA
+;; You should have received a copy of the GNU General Public License
+;; and the GNU Lesser General Public License along with guile-json;
+;; if not, write to the Free Software Foundation, Inc.,
+;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 ;;; Commentary:
 

diff --git a/json/parser.scm b/json/parser.scm
@@ -1,23 +1,25 @@
 ;;; (json parser) --- Guile JSON implementation.
 
-;; Copyright (C) 2013 Aleix Conchillo Flaque <aconchillo@gmail.com>
+;; Copyright (C) 2013-2018 Aleix Conchillo Flaque <aconchillo@gmail.com>
 ;;
 ;; This file is part of guile-json.
 ;;
 ;; guile-json is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 3 of the License, or (at your option) any later version.
+;; modify it under the terms of the GNU General Public License and
+;; the GNU Lesser General Public License as published by the Free
+;; Software Foundation; either version 3 of the License, or (at your
+;; option) any later version.
 ;;
 ;; guile-json 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
-;; Lesser General Public License for more details.
+;; General Public License and the GNU Lesser General Public License
+;; for more details.
 ;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with guile-json; if not, write to the Free Software
-;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-;; 02110-1301 USA
+;; You should have received a copy of the GNU General Public License
+;; and the GNU Lesser General Public License along with guile-json;
+;; if not, write to the Free Software Foundation, Inc.,
+;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 ;;; Commentary:
 

diff --git a/json/syntax.scm b/json/syntax.scm
@@ -1,23 +1,25 @@
 ;;; (json syntax) --- Guile JSON implementation.
 
-;; Copyright (C) 2013-2017 Aleix Conchillo Flaque <aconchillo@gmail.com>
+;; Copyright (C) 2013-2018 Aleix Conchillo Flaque <aconchillo@gmail.com>
 ;;
 ;; This file is part of guile-json.
 ;;
 ;; guile-json is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 3 of the License, or (at your option) any later version.
+;; modify it under the terms of the GNU General Public License and
+;; the GNU Lesser General Public License as published by the Free
+;; Software Foundation; either version 3 of the License, or (at your
+;; option) any later version.
 ;;
 ;; guile-json 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
-;; Lesser General Public License for more details.
+;; General Public License and the GNU Lesser General Public License
+;; for more details.
 ;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with guile-json; if not, write to the Free Software
-;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-;; 02110-1301 USA
+;; You should have received a copy of the GNU General Public License
+;; and the GNU Lesser General Public License along with guile-json;
+;; if not, write to the Free Software Foundation, Inc.,
+;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 ;;; Commentary:
 

diff --git a/pkg-list.scm.in b/pkg-list.scm.in
@@ -1,22 +1,24 @@
 ;;
-;; Copyright (C) 2013 Aleix Conchillo Flaque <aconchillo@gmail.com>
+;; Copyright (C) 2013-2018 Aleix Conchillo Flaque <aconchillo@gmail.com>
 ;;
 ;; This file is part of guile-json.
 ;;
 ;; guile-json is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 3 of the License, or (at your option) any later version.
+;; modify it under the terms of the GNU General Public License and
+;; the GNU Lesser General Public License as published by the Free
+;; Software Foundation; either version 3 of the License, or (at your
+;; option) any later version.
 ;;
 ;; guile-json 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
-;; Lesser General Public License for more details.
+;; General Public License and the GNU Lesser General Public License
+;; for more details.
 ;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with guile-json; if not, write to the Free Software
-;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-;; 02110-1301 USA
+;; You should have received a copy of the GNU General Public License
+;; and the GNU Lesser General Public License along with guile-json;
+;; if not, write to the Free Software Foundation, Inc.,
+;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;;
 
 (package (json (%VERSION%))
@@ -25,7 +27,7 @@
   (description
    "guile-json supports the parsing and writing of JSON from Guile."
    "It aims to be fully compliant with the json.org specification, and"
-   "is released under the LGPLv3.")
+   "is released under the GPLv3 and the LGPLv3.")
   (homepage "https://github.com/aconchillo/guile-json")
   (libraries "json.scm" "json")
   (documentation "README" "COPYING" "COPYING.LESSER"))