From a2124b00b81e6374d0844091e760e5bb37aa18f2 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Thu, 7 Mar 2019 19:45:29 -0700 Subject: [PATCH 01/17] add explanatory text re: -only and -or-later add explanatory text re: -only and -or-later delineation in standard license header (versus default text in full copy of license). proposed solution to #617 --- src/GPL-2.0-only.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/GPL-2.0-only.xml b/src/GPL-2.0-only.xml index f44d55179..4a8cd938b 100644 --- a/src/GPL-2.0-only.xml +++ b/src/GPL-2.0-only.xml @@ -27,8 +27,11 @@

- This license was released: June 1991 This refers to when this - GPL 2.0 only is being used (as opposed to GPLv2 or later). + This license was released: June 1991. This license identifier refers to when + GPL-2.0-only is being used as opposed to GPL-2.0-or-later. The option to use either that + version of the license only or to make it available under any later version of that license + is denoted in the standard license header. (The standard license header in the license + itself includes the default "or (at your option) any later version" language.) From 6db7f583d55d4715d2cc2d029a03139da8293d71 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Thu, 7 Mar 2019 19:50:47 -0700 Subject: [PATCH 02/17] add notes for GPL-or-later --- src/GPL-2.0-or-later.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/GPL-2.0-or-later.xml b/src/GPL-2.0-or-later.xml index 55ad6ec13..ab489d983 100644 --- a/src/GPL-2.0-or-later.xml +++ b/src/GPL-2.0-or-later.xml @@ -7,7 +7,12 @@ https://opensource.org/licenses/GPL-2.0 - This license was released: June 1991 + This license was released: June 1991. This license identifier refers to when + GPL-2.0-or-later is being used as opposed to GPL-2.0-only. The option to use either that + version of the license only or to make it available under any later version of that license + is denoted in the standard license header. (The standard license header in the license + itself includes the default "or (at your option) any later version" language.) + From 8f16771da0415298380e8f60c1f3ca30b727efb7 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Thu, 21 Mar 2019 12:24:00 -0600 Subject: [PATCH 03/17] update to Notes update to Notes as per feedback from FSF --- src/GPL-2.0-only.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/GPL-2.0-only.xml b/src/GPL-2.0-only.xml index 4a8cd938b..dfb1ece08 100644 --- a/src/GPL-2.0-only.xml +++ b/src/GPL-2.0-only.xml @@ -27,11 +27,12 @@

- This license was released: June 1991. This license identifier refers to when - GPL-2.0-only is being used as opposed to GPL-2.0-or-later. The option to use either that - version of the license only or to make it available under any later version of that license - is denoted in the standard license header. (The standard license header in the license - itself includes the default "or (at your option) any later version" language.) + This license was released: June 1991. This license identifier refers to the choice + to use the code under GPL-2.0-only, as distinguished from use of code under GPL-2.0-or-later + (i.e., GPL-2.0 or some later version such as GPL 3, a possible future GPL 4, + and so on). The license notice (usually at the head of the file) states which of these + applies to the code in the file. +

The example in the exhibit to the license shows the license notice for the "or later" approach.

 From a4c82ccf6707a16c8448ca5dcb47bee0b555a52e Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Thu, 21 Mar 2019 12:26:52 -0600 Subject: [PATCH 04/17] update Notes update Notes with feedback from FSF --- src/GPL-2.0-or-later.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/GPL-2.0-or-later.xml b/src/GPL-2.0-or-later.xml index ab489d983..215f0fcfb 100644 --- a/src/GPL-2.0-or-later.xml +++ b/src/GPL-2.0-or-later.xml @@ -7,11 +7,13 @@ https://opensource.org/licenses/GPL-2.0 - This license was released: June 1991. This license identifier refers to when - GPL-2.0-or-later is being used as opposed to GPL-2.0-only. The option to use either that - version of the license only or to make it available under any later version of that license - is denoted in the standard license header. (The standard license header in the license - itself includes the default "or (at your option) any later version" language.) + This license was released: June 1991. This license identifier refers to the + choice to use code under GPL-2.0-or-later (such as GPL 3, a possible future GPL 4, + and so on), as distinguished from use of code under GPL-2.0-only. The license + notice (usually at the head of the file) states which of these applies to the + code in the file. + +

The example in the exhibit to the license shows the license notice for the "or later" approach.

 From 8a5f5327b1eab1ac5a7782efae28a8b3f6cc6c93 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Fri, 29 Mar 2019 15:12:46 -0600 Subject: [PATCH 05/17] update notes update notes to further tighten up language --- src/GPL-2.0-only.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/GPL-2.0-only.xml b/src/GPL-2.0-only.xml index dfb1ece08..0db70e189 100644 --- a/src/GPL-2.0-only.xml +++ b/src/GPL-2.0-only.xml @@ -29,10 +29,9 @@ This license was released: June 1991. This license identifier refers to the choice to use the code under GPL-2.0-only, as distinguished from use of code under GPL-2.0-or-later - (i.e., GPL-2.0 or some later version such as GPL 3, a possible future GPL 4, - and so on). The license notice (usually at the head of the file) states which of these - applies to the code in the file. -

The example in the exhibit to the license shows the license notice for the "or later" approach.

+ (i.e., GPL-2.0 or some later version). The license notice (as seen in the Standard License + Header field below) states which of these applies to the code in the file. The example + in the exhibit to the license shows the license notice for the "or later" approach.

 From fc96e3b1f2a2666e6cfc81f7422fc82f1f808243 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Fri, 29 Mar 2019 15:15:30 -0600 Subject: [PATCH 06/17] update notes update notes to be more concise --- src/GPL-2.0-or-later.xml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/GPL-2.0-or-later.xml b/src/GPL-2.0-or-later.xml index 215f0fcfb..6bb6b1520 100644 --- a/src/GPL-2.0-or-later.xml +++ b/src/GPL-2.0-or-later.xml @@ -8,13 +8,11 @@ This license was released: June 1991. This license identifier refers to the - choice to use code under GPL-2.0-or-later (such as GPL 3, a possible future GPL 4, - and so on), as distinguished from use of code under GPL-2.0-only. The license - notice (usually at the head of the file) states which of these applies to the - code in the file. - -

The example in the exhibit to the license shows the license notice for the "or later" approach.

- + choice to use code under GPL-2.0-or-later (i.e., GPL-2.0 or some later version), + as distinguished from use of code under GPL-2.0-only. The license notice (as seen + in the Standard License Header field below) states which of these applies + the code in the file. The example in the exhibit to the license shows the license + notice for the "or later" approach. From c090938e24f053a8912b6bc697266f5426a5c04c Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Fri, 29 Mar 2019 15:18:37 -0600 Subject: [PATCH 07/17] remove extra end p tag --- src/GPL-2.0-only.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GPL-2.0-only.xml b/src/GPL-2.0-only.xml index 0db70e189..ecdb07f5f 100644 --- a/src/GPL-2.0-only.xml +++ b/src/GPL-2.0-only.xml @@ -31,7 +31,7 @@ to use the code under GPL-2.0-only, as distinguished from use of code under GPL-2.0-or-later (i.e., GPL-2.0 or some later version). The license notice (as seen in the Standard License Header field below) states which of these applies to the code in the file. The example - in the exhibit to the license shows the license notice for the "or later" approach.

+ in the exhibit to the license shows the license notice for the "or later" approach. From 3c80599a45bba36a5f4e28b6b001c94f38800e88 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Fri, 29 Mar 2019 15:19:24 -0600 Subject: [PATCH 08/17] update notes --- src/GPL-1.0-only.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/GPL-1.0-only.xml b/src/GPL-1.0-only.xml index f99700fb6..3c6376034 100644 --- a/src/GPL-1.0-only.xml +++ b/src/GPL-1.0-only.xml @@ -25,8 +25,12 @@

- This license was released: February 1989. This refers to when this GPL version - 1.0 only is being used (as opposed to "or later"). + This license was released: February 1989. This license identifier refers to the choice + to use the code under GPL-1.0-only, as distinguished from use of code under GPL-1.0-or-later + (i.e., GPL-1.0 or some later version). The license notice (as seen in the Standard License + Header field below) states which of these applies to the code in the file. The example + in the exhibit to the license shows the license notice for the "or later" approach. + From 8df6f9bc7311aa032c643e9458024a42520f2b8f Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Fri, 29 Mar 2019 15:20:05 -0600 Subject: [PATCH 09/17] update notes --- src/GPL-1.0-or-later.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/GPL-1.0-or-later.xml b/src/GPL-1.0-or-later.xml index cf3e56f57..33e5f06ec 100644 --- a/src/GPL-1.0-or-later.xml +++ b/src/GPL-1.0-or-later.xml @@ -6,8 +6,12 @@ https://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html - This license was released: February 1989. This license - has been deprecated by its authors. + This license was released: February 1989. This license identifier refers to the + choice to use code under GPL-1.0-or-later (i.e., GPL-1.0 or some later version), + as distinguished from use of code under GPL-1.0-only. The license notice (as seen + in the Standard License Header field below) states which of these applies + the code in the file. The example in the exhibit to the license shows the license + notice for the "or later" approach. From 5f34d530950cbaf1847e7ea0b8923fb366b45abc Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Fri, 29 Mar 2019 15:21:10 -0600 Subject: [PATCH 10/17] update notes --- src/GPL-3.0-only.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/GPL-3.0-only.xml b/src/GPL-3.0-only.xml index ac95c5026..d0f04ad18 100644 --- a/src/GPL-3.0-only.xml +++ b/src/GPL-3.0-only.xml @@ -27,8 +27,11 @@

- This license was released: 29 June 2007 This refers to when - this GPL 3.0 only is being used (as opposed to "or later). + This license was released: 29 June 2007. This license identifier refers to the choice + to use the code under GPL-3.0-only, as distinguished from use of code under GPL-3.0-or-later + (i.e., GPL-3.0 or some later version). The license notice (as seen in the Standard License + Header field below) states which of these applies to the code in the file. The example + in the exhibit to the license shows the license notice for the "or later" approach. From 57be7a3c205e7bb5764c1d6f2767427fdaa314f8 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Fri, 29 Mar 2019 15:27:24 -0600 Subject: [PATCH 11/17] update notes --- src/GPL-3.0-or-later.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/GPL-3.0-or-later.xml b/src/GPL-3.0-or-later.xml index 356042993..f3a628915 100644 --- a/src/GPL-3.0-or-later.xml +++ b/src/GPL-3.0-or-later.xml @@ -7,7 +7,12 @@ https://opensource.org/licenses/GPL-3.0 - This license was released: 29 June 2007 + This license was released: 29 June 2007. This license identifier refers to the + choice to use code under GPL-3.0-or-later (i.e., GPL-3.0 or some later version), + as distinguished from use of code under GPL-3.0-only. The license notice (as seen + in the Standard License Header field below) states which of these applies + the code in the file. The example in the exhibit to the license shows the license + notice for the "or later" approach. From 4429d12825f2754f645613786c963bbc1ec5f94a Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Fri, 29 Mar 2019 15:32:20 -0600 Subject: [PATCH 12/17] update notes --- src/AGPL-3.0-only.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/AGPL-3.0-only.xml b/src/AGPL-3.0-only.xml index a92826749..4eb322bfd 100644 --- a/src/AGPL-3.0-only.xml +++ b/src/AGPL-3.0-only.xml @@ -24,7 +24,11 @@ <https://www.gnu.org/licenses/>

- This version was released: 19 November 2007 + This version was released: 19 November 2007. This license identifier refers to the choice + to use the code under AGPL-3.0-only, as distinguished from use of code under AGPL-3.0-or-later + (i.e., AGPL-3.0 or some later version). The license notice (as seen in the Standard License + Header field below) states which of these applies to the code in the file. The example + in the exhibit to the license shows the license notice for the "or later" approach. From dcbd61bdda2420f524fe5966b290f9b4a07895a3 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Fri, 29 Mar 2019 15:33:00 -0600 Subject: [PATCH 13/17] update notes --- src/AGPL-3.0-or-later.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/AGPL-3.0-or-later.xml b/src/AGPL-3.0-or-later.xml index 337252b9b..653f4dc8d 100644 --- a/src/AGPL-3.0-or-later.xml +++ b/src/AGPL-3.0-or-later.xml @@ -7,7 +7,12 @@ https://opensource.org/licenses/AGPL-3.0 - This version was released: 19 November 2007 + This version was released: 19 November 2007. This license identifier refers to the + choice to use code under AGPL-3.0-or-later (i.e., AGPL-3.0 or some later version), + as distinguished from use of code under AGPL-3.0-only. The license notice (as seen + in the Standard License Header field below) states which of these applies + the code in the file. The example in the exhibit to the license shows the license + notice for the "or later" approach. From 16014932e363ead954fa8a6155fb125a4d644897 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Fri, 29 Mar 2019 15:36:59 -0600 Subject: [PATCH 14/17] update notes --- src/LGPL-2.1-only.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/LGPL-2.1-only.xml b/src/LGPL-2.1-only.xml index 26b367395..81e8c9eb2 100644 --- a/src/LGPL-2.1-only.xml +++ b/src/LGPL-2.1-only.xml @@ -26,8 +26,11 @@

- This license was released: February 1999. This refers to when - this LGPL 2.1 only is being used (as opposed to "or later). + This license was released: February 1999. This license identifier refers to the choice + to use the code under LGPL-2.1-only, as distinguished from use of code under LGPL-2.1-or-later + (i.e., LGPL-2.1 or some later version). The license notice (as seen in the Standard License + Header field below) states which of these applies to the code in the file. The example + in the exhibit to the license shows the license notice for the "or later" approach. From 83efda6fdc23c58fea7ecfcf5bb0c5a7f7cde407 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Fri, 29 Mar 2019 15:37:29 -0600 Subject: [PATCH 15/17] update notes --- src/LGPL-2.1-or-later.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/LGPL-2.1-or-later.xml b/src/LGPL-2.1-or-later.xml index ae4661ef9..b623d16b8 100644 --- a/src/LGPL-2.1-or-later.xml +++ b/src/LGPL-2.1-or-later.xml @@ -7,7 +7,12 @@ https://opensource.org/licenses/LGPL-2.1 - This license was released: February 1999. + This license was released: February 1999. This license identifier refers to the + choice to use code under LGPL-2.1-or-later (i.e., LGPL-2.1 or some later version), + as distinguished from use of code under LGPL-2.1-only. The license notice (as seen + in the Standard License Header field below) states which of these applies + the code in the file. The example in the exhibit to the license shows the license + notice for the "or later" approach. From 23977283e05390ab375f38ffaa871d3f7a089518 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Fri, 29 Mar 2019 15:39:00 -0600 Subject: [PATCH 16/17] update notes --- src/LGPL-2.0-only.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/LGPL-2.0-only.xml b/src/LGPL-2.0-only.xml index 4eac5965b..33b10c47a 100644 --- a/src/LGPL-2.0-only.xml +++ b/src/LGPL-2.0-only.xml @@ -21,8 +21,12 @@ This license was released: June 1991. This license has - been superseded by LGPL v2.1 This refers to when this - LGPL 2.0 only is being used (as opposed to "or later). + been superseded by LGPL-2.1. This license identifier refers to the + choice to use the code under LGPL-2.0-only, as distinguished from use of + code under LGPL-2.0-or-later (i.e., LGPL-2.0 or some later version). The + license notice (as seen in the Standard License Header field below) states + which of these applies to the code in the file. The example in the exhibit + to the license shows the license notice for the "or later" approach. From 07f1ff30793a159a778ea2e4ad1b279aec1aff9b Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Fri, 29 Mar 2019 15:39:28 -0600 Subject: [PATCH 17/17] update notes --- src/LGPL-2.0-or-later.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/LGPL-2.0-or-later.xml b/src/LGPL-2.0-or-later.xml index fe8b6cc83..63f6c2a23 100644 --- a/src/LGPL-2.0-or-later.xml +++ b/src/LGPL-2.0-or-later.xml @@ -7,7 +7,12 @@ This license was released: June 1991. This license has - been superseded by LGPL v2.1 + been superseded by LGPL-2.1. This license identifier refers to the + choice to use code under LGPL-2.0-or-later (i.e., LGPL-2.0 or some later version), + as distinguished from use of code under LGPL-2.0-only. The license notice (as seen + in the Standard License Header field below) states which of these applies + the code in the file. The example in the exhibit to the license shows the license + notice for the "or later" approach.