From 7b56ba972c6f8c3276ada57c3c531382cd954116 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Mon, 20 Feb 2017 15:56:11 -0800 Subject: [PATCH] eCos-2.0: Replace deprecated="true" with From [1]: As a result, a number of licenses formerly included in the SPDX License List have been deprecated as licenses, and correct usage employs the License Expression Syntax as of v2.0. So the sole reason for the deprecations seems to be "there's a better way to say that now". Telling people "use an expression instead" is less useful than saying "use this expression instead: $SOME_EXPRESSION". This commit updates the eCos license (the only deprecated license currently in this repository) to do that, using the WITH exception syntax [2] and the eCos exception label from [3] defined in SPDX 2.1 (and possibly in earlier versions). It also makes similar updates to the other licenses which had set deprecated="true". [1]: https://spdx.org/licenses/ [2]: https://spdx.org/spdx-specification-21-web-version#h.jxpfx0ykyb60 Appendix IV: SPDX License Expressions [3]: https://spdx.org/spdx-specification-21-web-version#h.ruv3yl8g6czd I.2 Exceptions List --- src/GPL-2.0-with-GCC-exception.xml | 4 ++-- src/GPL-2.0-with-autoconf-exception.xml | 4 ++-- src/GPL-2.0-with-bison-exception.xml | 4 ++-- src/GPL-2.0-with-classpath-exception.xml | 4 ++-- src/GPL-2.0-with-font-exception.xml | 4 ++-- src/GPL-3.0-with-autoconf-exception.xml | 4 ++-- src/eCos-2.0.xml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/GPL-2.0-with-GCC-exception.xml b/src/GPL-2.0-with-GCC-exception.xml index 521a72d77..0395674a4 100644 --- a/src/GPL-2.0-with-GCC-exception.xml +++ b/src/GPL-2.0-with-GCC-exception.xml @@ -1,5 +1,5 @@ - - DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license. + + GPL-2.0 WITH GCC-exception-2.0

insert GPL v2 license text here

diff --git a/src/GPL-2.0-with-autoconf-exception.xml b/src/GPL-2.0-with-autoconf-exception.xml index 5c54bbfb5..483c2492c 100644 --- a/src/GPL-2.0-with-autoconf-exception.xml +++ b/src/GPL-2.0-with-autoconf-exception.xml @@ -1,8 +1,8 @@ - + http://ac-archive.sourceforge.net/doc/copyright.html - DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license. + GPL-2.0 WITH Autoconf-exception-2.0

insert GPL v2 license text here

diff --git a/src/GPL-2.0-with-bison-exception.xml b/src/GPL-2.0-with-bison-exception.xml index 4e865fde0..45abe8606 100644 --- a/src/GPL-2.0-with-bison-exception.xml +++ b/src/GPL-2.0-with-bison-exception.xml @@ -1,5 +1,5 @@ - - DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license. + + GPL-2.0 WITH Bison-exception-2.2 Bison Exception diff --git a/src/GPL-2.0-with-classpath-exception.xml b/src/GPL-2.0-with-classpath-exception.xml index 8b37318a9..93a052275 100644 --- a/src/GPL-2.0-with-classpath-exception.xml +++ b/src/GPL-2.0-with-classpath-exception.xml @@ -1,8 +1,8 @@ - + http://www.gnu.org/software/classpath/license.html - DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license. + GPL-2.0 WITH Classpath-exception-2.0

insert GPL v2 license text here

diff --git a/src/GPL-2.0-with-font-exception.xml b/src/GPL-2.0-with-font-exception.xml index b62473239..d64a228d2 100644 --- a/src/GPL-2.0-with-font-exception.xml +++ b/src/GPL-2.0-with-font-exception.xml @@ -1,8 +1,8 @@ - + http://www.gnu.org/licenses/gpl-faq.html#FontException - DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license. + GPL-2.0 WITH Font-exception-2.0

insert GPL v2 license text here

diff --git a/src/GPL-3.0-with-autoconf-exception.xml b/src/GPL-3.0-with-autoconf-exception.xml index 41b58c793..306e1615c 100644 --- a/src/GPL-3.0-with-autoconf-exception.xml +++ b/src/GPL-3.0-with-autoconf-exception.xml @@ -1,6 +1,6 @@ - + http://www.gnu.org/licenses/autoconf-exception-3.0.html - DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license. + GPL-3.0 WITH Autoconf-exception-3.0

insert GPL v3 text here

diff --git a/src/eCos-2.0.xml b/src/eCos-2.0.xml index 7663a2c80..aad2b1ed3 100644 --- a/src/eCos-2.0.xml +++ b/src/eCos-2.0.xml @@ -1,8 +1,8 @@ - + http://www.gnu.org/licenses/ecos-license.html - DEPRECATED: This is really GPL-2.0 or later with an exception. Use License Expression Syntax and Exceptions list to create equivalent license. + GPL-2.0+ WITH eCos-exception-2.0 The eCos license version 2.0