Skip to content

Commit 7b56ba9

Browse files
wkingwking
committed
eCos-2.0: Replace deprecated="true" with <obsoleted-by>
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
1 parent 84a14cd commit 7b56ba9

7 files changed

+14
-14
lines changed

‎src/GPL-2.0-with-GCC-exception.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<SPDX name="GNU General Public License v2.0 w/GCC Runtime Library exception" identifier="GPL-2.0-with-GCC-exception" deprecated="true">
2-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
1+
<SPDX name="GNU General Public License v2.0 w/GCC Runtime Library exception" identifier="GPL-2.0-with-GCC-exception">
2+
<obsoleted-by>GPL-2.0 WITH GCC-exception-2.0</obsoleted-by>
33
<license>
44
<body>
55
<p>insert GPL v2 license text here</p>

‎src/GPL-2.0-with-autoconf-exception.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<SPDX name="GNU General Public License v2.0 w/Autoconf exception" identifier="GPL-2.0-with-autoconf-exception" deprecated="true">
1+
<SPDX name="GNU General Public License v2.0 w/Autoconf exception" identifier="GPL-2.0-with-autoconf-exception">
22
<urls>
33
<url>http://ac-archive.sourceforge.net/doc/copyright.html</url>
44
</urls>
5-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
5+
<obsoleted-by>GPL-2.0 WITH Autoconf-exception-2.0</obsoleted-by>
66
<license>
77
<body>
88
<p>insert GPL v2 license text here</p>

‎src/GPL-2.0-with-bison-exception.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<SPDX name="GNU General Public License v2.0 w/Bison exception" identifier="GPL-2.0-with-bison-exception" deprecated="true">
2-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
1+
<SPDX name="GNU General Public License v2.0 w/Bison exception" identifier="GPL-2.0-with-bison-exception">
2+
<obsoleted-by>GPL-2.0 WITH Bison-exception-2.2</obsoleted-by>
33
<license>
44
<title>Bison Exception</title>
55
<body>

‎src/GPL-2.0-with-classpath-exception.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<SPDX name="GNU General Public License v2.0 w/Classpath exception" identifier="GPL-2.0-with-classpath-exception" deprecated="true">
1+
<SPDX name="GNU General Public License v2.0 w/Classpath exception" identifier="GPL-2.0-with-classpath-exception">
22
<urls>
33
<url>http://www.gnu.org/software/classpath/license.html</url>
44
</urls>
5-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
5+
<obsoleted-by>GPL-2.0 WITH Classpath-exception-2.0</obsoleted-by>
66
<license>
77
<body>
88
<p>insert GPL v2 license text here</p>

‎src/GPL-2.0-with-font-exception.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<SPDX name="GNU General Public License v2.0 w/Font exception" identifier="GPL-2.0-with-font-exception" deprecated="true">
1+
<SPDX name="GNU General Public License v2.0 w/Font exception" identifier="GPL-2.0-with-font-exception">
22
<urls>
33
<url>http://www.gnu.org/licenses/gpl-faq.html#FontException</url>
44
</urls>
5-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
5+
<obsoleted-by>GPL-2.0 WITH Font-exception-2.0</obsoleted-by>
66
<license>
77
<body>
88
<p>insert GPL v2 license text here</p>

‎src/GPL-3.0-with-autoconf-exception.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<SPDX name="GNU General Public License v3.0 w/Autoconf exception" identifier="GPL-3.0-with-autoconf-exception" deprecated="true">
1+
<SPDX name="GNU General Public License v3.0 w/Autoconf exception" identifier="GPL-3.0-with-autoconf-exception">
22
http://www.gnu.org/licenses/autoconf-exception-3.0.html
3-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
3+
<obsoleted-by>GPL-3.0 WITH Autoconf-exception-3.0</obsoleted-by>
44
<license>
55
<body>
66
<p>insert GPL v3 text here</p>

‎src/eCos-2.0.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<SPDX name="eCos license version 2.0" identifier="eCos-2.0" deprecated="true">
1+
<SPDX name="eCos license version 2.0" identifier="eCos-2.0">
22
<urls>
33
<url>http://www.gnu.org/licenses/ecos-license.html</url>
44
</urls>
5-
<notes>DEPRECATED: This is really GPL-2.0 or later with an exception. Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
5+
<obsoleted-by>GPL-2.0+ WITH eCos-exception-2.0</obsoleted-by>
66
<license>
77
<title>The eCos license version 2.0</title>
88
<body>

0 commit comments

Comments
 (0)