[PATCH 07/73] Add the list of contributors agreeing to LGPL licensing

* List of contributors, with short explanation
* added LGPLv3 license text as COPYING-LGPL
* moved GPLv3 license text to COPYING-GPL
* COPYING still contains the GPLv3, but with an explanation that new
  code is LGPL
* updated the contribution guide
* Removed the GPL license header from Readme, added explanation.

Signed-off-by: Marcus Müller <marcus@hostalia.de>
Gbp-Pq: Name 0007-Add-the-list-of-contributors-agreeing-to-LGPL-licens.patch

diff --git a/AUTHORS_GRANTING_LGPL_LICENSE.txt b/AUTHORS_GRANTING_LGPL_LICENSE.txt
new file mode 100644 (file)
index 0000000..7205328
--- /dev/null
+++ b/AUTHORS_GRANTING_LGPL_LICENSE.txt
@@ -0,0 +1,15 @@
+VOLK is going to migrating from GPLv3 (GNU General Public license version 3.0)
+to LGPLv3 (GNU Lesser General Public License version 3.0).
+
+This file is a list of the authors who agreed to grant an LGPL license to the
+code they contributed to this repository. In case the affected code is currently
+licensed differently (GPLv3), this gives the right to use the current
+contributions under both LGPLv3 and that other license. Future contributions by
+these authors are, however, licensed under LGPLv3, unless explicitly stated
+otherwise.
+
+Together with the date of agreement, these authors are:
+
+| Date | Author (as used in commits) |
+|------+-----------------------------|
+|      |                             |

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bfbbad7177e8040e64e28ae1a5015f120f52a87f..87dffdef8fb21e6f12da23865c58d3d4ca956a46 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,10 +21,10 @@ code.
 
 ## DCO Signed?
 
-Any code contributions going into VOLK will become part of a GPL-licensed,
-open source repository. It is therefore imperative that code submissions belong
-to the authors, and that submitters have the authority to merge that code into
-the public VOLK codebase.
+Any code contributions going into VOLK will become part of an LPGPL-licensed
+(former contributions are GPL-licensed), open source repository. It is therefore
+imperative that code submissions belong to the authors, and that submitters have
+the authority to merge that code into the public VOLK codebase.
 
 For that purpose, we use the [Developer's Certificate of Origin](DCO.txt). It
 is the same document used by other projects. Signing the DCO states that there

diff --git a/COPYING b/COPYING
index 94a9ed024d3859793618152ea559a168bbcbb5e2..6c1874b19b68f12db1985f41acb1e66b54ba1189 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,13 @@
+Files in this code repository are to be licensed under the LGPLv3, which you'll
+find in the file COPYING-LGPL
+
+However, you'll find some files that carry a license header that assigns them as
+GPLv3, which was the default license for VOLK up to version 3. You can find the
+full license text of the GPLv3 below.
+
+================================================================================
+
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 

diff --git a/COPYING-GPL b/COPYING-GPL
new file mode 120000 (symlink)
index 0000000..d24842f
--- /dev/null
+++ b/COPYING-GPL
@@ -0,0 +1 @@
+COPYING
\ No newline at end of file

diff --git a/COPYING-LGPL b/COPYING-LGPL
new file mode 100644 (file)
index 0000000..21ca013
--- /dev/null
+++ b/COPYING-LGPL
@@ -0,0 +1,175 @@
+Files in this code repository are to be licensed under the LGPLv3, which you'll
+find below.
+
+However, you'll find some files that carry a license header that assigns them as
+GPLv3, which was the default license for VOLK up to version 3. You can find the
+full license text of the GPLv3 in the file COPYING-GPL.
+
+================================================================================
+
+
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

diff --git a/README.md b/README.md
index 8152b603216164e494a64f8e1a165c5587c90099..013a9ae9f2bddb804074d4524fc45738a9a4132e 100644 (file)
--- a/README.md
+++ b/README.md
@@ -98,23 +98,9 @@ We want to make sure VOLK compiles on a wide variety of compilers. Thus, we targ
 
 ## License
 
->
-> Copyright 2015 Free Software Foundation, Inc.
->
-> This file is part of VOLK
->
-> VOLK 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 3, or (at your option)
-> any later version.
->
-> VOLK 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 GNU Radio; see the file COPYING.  If not, write to
-> the Free Software Foundation, Inc., 51 Franklin Street,
-> Boston, MA 02110-1301, USA.
->
+VOLK is moving from the GNU General Public License version 3.0 (GPLv3) to the
+GNU Lesser General Public License version 3.0 (LGPLv3). At this point in time,
+much of the code in the repository is still GPL-licensed, but new contributors
+are asked to use the LGPLv3 for their code contributions. Existing contributors
+are very kindly requested to also allow LPGL-licensing by adding their name to
+the file `AUTHORS_GRANTING_LGPL_LICENSE.txt`.