Skip to content

Commit 0699915

Browse files
goneallgoneall
authored
Merge pull request #392 from wking/obsoleted-by
Add <obsoletedBy> to licenses and exceptions
2 parents 7fa29e2 + a6df410 commit 0699915

29 files changed

+167
-60
lines changed

‎schema/ListedLicense.xsd

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
</documentation>
4343
</annotation>
4444
<all>
45+
<element name="obsoletedBys" type="tns:obsoletedBysType" minOccurs="0" maxOccurs="1" />
4546
<element name="crossRefs" type="tns:crossRefsType" minOccurs="0" maxOccurs="1"/>
4647
<element name="notes" type="tns:formattedFixedTextType" minOccurs="0" maxOccurs="1"/>
4748
<element name="text" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
@@ -61,6 +62,7 @@
6162
</documentation>
6263
</annotation>
6364
<all>
65+
<element name="obsoletedBys" type="tns:obsoletedBysType" minOccurs="0" maxOccurs="1" />
6466
<element name="crossRefs" type="tns:crossRefsType" minOccurs="0" maxOccurs="1"/>
6567
<element name="notes" type="tns:formattedFixedTextType" minOccurs="0" maxOccurs="1">
6668
<annotation>
@@ -165,6 +167,69 @@
165167
</element>
166168
</sequence>
167169
</complexType>
170+
<complexType name="obsoletedBysType">
171+
<annotation>
172+
<documentation xml:lang="en">
173+
<xhtml:p>
174+
<xhtml:code>obsoletedBysType</xhtml:code> is a wrapper for a set of <xhtml:code>obsoletedBy</xhtml:code> entries.
175+
</xhtml:p>
176+
</documentation>
177+
</annotation>
178+
<sequence>
179+
<element name="obsoletedBy" type="tns:obsoletedByType" minOccurs="1" maxOccurs="unbounded" />
180+
</sequence>
181+
</complexType>
182+
<complexType name="obsoletedByType" mixed="true">
183+
<annotation>
184+
<documentation xml:lang="en">
185+
<xhtml:p>
186+
<xhtml:code>obsoletedByType</xhtml:code> represents a recommended replacement for license expressions containing a given license or exception. The algorithm for determining the recommended replacement in the context of a given license expression is:
187+
</xhtml:p>
188+
<xhtml:ol>
189+
<xhtml:li>Parse the license expression to extract the short identifiers.</xhtml:li>
190+
<xhtml:li>Look up <xhtml:code>obsoletedBy</xhtml:code> entries for the short identifiers.</xhtml:li>
191+
<xhtml:li>If any <xhtml:code>obsoletedBy</xhtml:code> has an <xhtml:code>expression</xhtml:code> attribute that matches the source, the value of that <xhtml:code>obsoletedBy</xhtml:code> is the recommended replacement for that expression. Otherwise, the value of the <xhtml:code>obsoletedBy</xhtml:code> without an expression attribute is the recommended replacement for the short identifier.</xhtml:li>
192+
</xhtml:ol>
193+
<xhtml:p>
194+
For example, the expression <xhtml:code>GPL-2.0+ WITH GCC-exception-2.0</xhtml:code> could be parsed to either of the following short license identifiers:
195+
</xhtml:p>
196+
<xhtml:ul>
197+
<xhtml:li>
198+
<xhtml:p>
199+
<xhtml:code>GPL-2.0+</xhtml:code>, in which case there would be a single <xhtml:code>obsoletedBy</xhtml:code> with no <xhtml:code>expression</xhtml:code> attribute:
200+
</xhtml:p>
201+
<xhtml:p>
202+
<xhtml:code>&lt;obsoletedBy&gt;GPL-2.0-or-later&lt;/obsoletedBy&gt;</xhtml:code>
203+
</xhtml:p>
204+
<xhtml:p>
205+
So the recommended replacement for <xhtml:code>GPL-2.0+</xhtml:code> would be <xhtml:code>GPL-2.0-or-later</xhtml:code>.
206+
</xhtml:p>
207+
</xhtml:li>
208+
<xhtml:li>
209+
<xhtml:p>
210+
<xhtml:code>GPL-2.0</xhtml:code>, in which case there would be two <xhtml:code>obsoletedBy</xhtml:code> elements:
211+
</xhtml:p>
212+
<xhtml:p>
213+
<xhtml:code>&lt;obsoletedBy&gt;GPL-2.0-only&lt;/obsoletedBy&gt;</xhtml:code><xhtml:br/>
214+
<xhtml:code>&lt;obsoletedBy expression="GPL-2.0+"&gt;GPL-2.0-or-later&lt;/obsoletedBy&gt;</xhtml:code>
215+
</xhtml:p>
216+
<xhtml:p>
217+
The element with <xhtml:code>expression="GPL-2.0+"</xhtml:code> matches the initial license expression, so the recommended replacement for <xhtml:code>GPL-2.0+</xhtml:code> is <xhtml:code>GPL-2.0-or-later</xhtml:code>.
218+
</xhtml:p>
219+
</xhtml:li>
220+
</xhtml:ul>
221+
</documentation>
222+
</annotation>
223+
<attribute name="expression" type="string">
224+
<annotation>
225+
<documentation xml:lang="en">
226+
<xhtml:p>
227+
<xhtml:code>expression</xhtml:code> is the license expression which is obsoleted by the expression contained by the element. Defaults to the bare identifier.
228+
</xhtml:p>
229+
</documentation>
230+
</annotation>
231+
</attribute>
232+
</complexType>
168233
<complexType name="altType" mixed="true">
169234
<annotation>
170235
<documentation xml:lang="en">

‎src/AGPL-1.0.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
<license isOsiApproved="false" licenseId="AGPL-1.0"
44
name="Affero General Public License v1.0"
55
isDeprecated="true" deprecatedVersion="3.1">
6+
<obsoletedBys>
7+
<obsoletedBy>AGPL-1.0-only</obsoletedBy>
8+
<obsoletedBy expression="AGPL-1.0+">AGPL-1.0-or-later</obsoletedBy>
9+
</obsoletedBys>
610
<crossRefs>
711
<crossRef>http://www.affero.org/oagpl.html</crossRef>
812
</crossRefs>

‎src/AGPL-3.0.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<license licenseId="AGPL-3.0" isOsiApproved="true"
44
name="GNU Affero General Public License v3.0"
55
isDeprecated="true" deprecatedVersion="3.0">
6+
<obsoletedBys>
7+
<obsoletedBy>AGPL-3.0-only</obsoletedBy>
8+
<obsoletedBy expression="AGPL-3.0+">AGPL-3.0-or-later</obsoletedBy>
9+
</obsoletedBys>
610
<crossRefs>
711
<crossRef>http://www.gnu.org/licenses/agpl.txt</crossRef>
812
<crossRef>http://www.opensource.org/licenses/AGPL-3.0</crossRef>
913
</crossRefs>
10-
<notes>
11-
DEPRECATED: Deprecated in lieu of more
12-
explicit license identifier of AGPL-3.0-only
13-
</notes>
1414
<standardLicenseHeader>
1515
Copyright (C) <alt name="copyright" match=".+">[year] [name of author]</alt>
1616
This program is free software: you can redistribute it and/or modify it

‎src/GFDL-1.1.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<license licenseId="GFDL-1.1" isOsiApproved="false"
44
name="GNU Free Documentation License v1.1"
55
isDeprecated="true" deprecatedVersion="3.0">
6+
<obsoletedBys>
7+
<obsoletedBy>GFDL-1.1-only</obsoletedBy>
8+
<obsoletedBy expression="GFDL-1.1+">GFDL-1.1-or-later</obsoletedBy>
9+
</obsoletedBys>
610
<crossRefs>
711
<crossRef>http://www.gnu.org/licenses/old-licenses/fdl-1.1.txt</crossRef>
812
</crossRefs>
9-
<notes>
10-
DEPRECATED: Deprecated in lieu of more
11-
explicit license identifier of GFDL-1.1-only
12-
</notes>
1313
<standardLicenseHeader>
1414
Copyright (c) <alt name="copyright" match=".+">YEAR YOUR NAME</alt>
1515
. Permission is granted to copy, distribute and/or modify this

‎src/GFDL-1.2.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<license licenseId="GFDL-1.2" isOsiApproved="false"
44
name="GNU Free Documentation License v1.2"
55
isDeprecated="true" deprecatedVersion="3.0">
6+
<obsoletedBys>
7+
<obsoletedBy>GFDL-1.2-only</obsoletedBy>
8+
<obsoletedBy expression="GFDL-1.2+">GFDL-1.2-or-later</obsoletedBy>
9+
</obsoletedBys>
610
<crossRefs>
711
<crossRef>http://www.gnu.org/licenses/old-licenses/fdl-1.2.txt</crossRef>
812
</crossRefs>
9-
<notes>
10-
DEPRECATED: Deprecated in lieu of more
11-
explicit license identifier of GFDL-1.2-only
12-
</notes>
1313
<standardLicenseHeader>
1414
Copyright (c) <alt name="copyright" match=".+">YEAR YOUR NAME</alt>
1515
. Permission is granted to copy, distribute and/or modify this

‎src/GFDL-1.3.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<license licenseId="GFDL-1.3" isOsiApproved="false"
44
name="GNU Free Documentation License v1.3"
55
isDeprecated="true" deprecatedVersion="3.0">
6+
<obsoletedBys>
7+
<obsoletedBy>GFDL-1.3-only</obsoletedBy>
8+
<obsoletedBy expression="GFDL-1.3+">GFDL-1.3-or-later</obsoletedBy>
9+
</obsoletedBys>
610
<crossRefs>
711
<crossRef>http://www.gnu.org/licenses/fdl-1.3.txt</crossRef>
812
</crossRefs>
9-
<notes>
10-
DEPRECATED: Deprecated in lieu of more
11-
explicit license identifier of GFDL-1.3-only
12-
</notes>
1313
<standardLicenseHeader>
1414
Copyright (c) <alt name="copyright" match=".+">YEAR YOUR NAME</alt>
1515
Permission is granted to copy, distribute and/or modify this

‎src/GPL-1.0+.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
33
<license isDeprecated="true" deprecatedVersion="2.0rc2" isOsiApproved="false" licenseId="GPL-1.0+"
44
name="GNU General Public License v1.0 or later">
5+
<obsoletedBys>
6+
<obsoletedBy>GPL-1.0-or-later</obsoletedBy>
7+
</obsoletedBys>
58
<crossRefs>
69
<crossRef>http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html</crossRef>
710
</crossRefs>
8-
<notes>DEPRECATED: Use GPL-1.0-or-later</notes>
911
<text>
1012
<titleText>
1113
<p>GNU GENERAL PUBLIC LICENSE

‎src/GPL-1.0.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<license licenseId="GPL-1.0" isOsiApproved="false"
44
name="GNU General Public License v1.0 only"
55
isDeprecated="true" deprecatedVersion="3.0">
6+
<obsoletedBys>
7+
<obsoletedBy>GPL-1.0-only</obsoletedBy>
8+
<obsoletedBy expression="GPL-1.0+">GPL-1.0-or-later</obsoletedBy>
9+
</obsoletedBys>
610
<crossRefs>
711
<crossRef>http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html</crossRef>
812
</crossRefs>
9-
<notes>
10-
DEPRECATED: Deprecated in lieu of more
11-
explicit license identifier of GPL-1.0-only
12-
</notes>
1313
<standardLicenseHeader>
1414
Copyright (C) <alt name="copyright" match=".+">19xx name of author</alt>
1515
<p>

‎src/GPL-2.0+.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
33
<license isOsiApproved="true" licenseId="GPL-2.0+" isDeprecated="true" deprecatedVersion="2.0rc2"
44
name="GNU General Public License v2.0 or later">
5-
<notes>DEPRECATED: Use the license identifier GPL-2.0-or-later</notes>
5+
<obsoletedBys>
6+
<obsoletedBy>GPL-2.0-or-later</obsoletedBy>
7+
</obsoletedBys>
68
<crossRefs>
79
<crossRef>http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html</crossRef>
810
<crossRef>http://www.opensource.org/licenses/GPL-2.0</crossRef>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
33
<license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="GPL-2.0-with-GCC-exception"
44
name="GNU General Public License v2.0 w/GCC Runtime Library exception">
5+
<obsoletedBys>
6+
<obsoletedBy>GPL-2.0 WITH GCC-exception-2.0</obsoletedBy>
7+
<obsoletedBy expression="GPL-2.0-with-GCC-exception+">GPL-2.0-or-later WITH GCC-exception-2.0</obsoletedBy>
8+
</obsoletedBys>
59
<crossRefs>
610
<crossRef>https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/libgcc1.c;h=762f5143fc6eed57b6797c82710f3538aa52b40b;hb=cb143a3ce4fb417c68f5fa2691a1b1b1053dfba9#l10</crossRef>
711
</crossRefs>
8-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
912

1013
<text>
1114
<p>insert GPL v2 license text here</p>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
33
<license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="GPL-2.0-with-autoconf-exception"
44
name="GNU General Public License v2.0 w/Autoconf exception">
5+
<obsoletedBys>
6+
<obsoletedBy>GPL-2.0 WITH Autoconf-exception-2.0</obsoletedBy>
7+
<obsoletedBy expression="GPL-2.0-with-autoconf-exception+">GPL-2.0-or-later WITH Autoconf-exception-2.0</obsoletedBy>
8+
</obsoletedBys>
59
<crossRefs>
610
<crossRef>http://ac-archive.sourceforge.net/doc/copyright.html</crossRef>
711
</crossRefs>
8-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
912

1013
<text>
1114
<p>insert GPL v2 license text here</p>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
33
<license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="GPL-2.0-with-bison-exception"
44
name="GNU General Public License v2.0 w/Bison exception">
5+
<obsoletedBys>
6+
<obsoletedBy>GPL-2.0 WITH Bison-exception-2.2</obsoletedBy>
7+
<obsoletedBy expression="GPL-2.0-with-bison-exception+">GPL-2.0-or-later WITH Bison-exception-2.2</obsoletedBy>
8+
</obsoletedBys>
59
<crossRefs>
610
<crossRef>http://git.savannah.gnu.org/cgit/bison.git/tree/data/yacc.c?id=193d7c7054ba7197b0789e14965b739162319b5e#n141</crossRef>
711
</crossRefs>
8-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
912
<text>
1013
<titleText>Bison Exception</titleText>
1114

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
33
<license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="GPL-2.0-with-classpath-exception"
44
name="GNU General Public License v2.0 w/Classpath exception">
5+
<obsoletedBys>
6+
<obsoletedBy>GPL-2.0 WITH Classpath-exception-2.0</obsoletedBy>
7+
<obsoletedBy expression="GPL-2.0-with-classpath-exception+">GPL-2.0-or-later WITH Classpath-exception-2.0</obsoletedBy>
8+
</obsoletedBys>
59
<crossRefs>
610
<crossRef>http://www.gnu.org/software/classpath/license.html</crossRef>
711
</crossRefs>
8-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
912

1013
<text>
1114
<p>insert GPL v2 license text here</p>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
33
<license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="GPL-2.0-with-font-exception"
44
name="GNU General Public License v2.0 w/Font exception">
5+
<obsoletedBys>
6+
<obsoletedBy>GPL-2.0 WITH Font-exception-2.0</obsoletedBy>
7+
<obsoletedBy expression="GPL-2.0-with-font-exception+">GPL-2.0-or-later+ WITH Font-exception-2.0</obsoletedBy>
8+
</obsoletedBys>
59
<crossRefs>
610
<crossRef>http://www.gnu.org/licenses/gpl-faq.html#FontException</crossRef>
711
</crossRefs>
8-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
912

1013
<text>
1114
<p>insert GPL v2 license text here</p>

‎src/GPL-2.0.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<license licenseId="GPL-2.0" isOsiApproved="true"
44
name="GNU General Public License v2.0 only"
55
isDeprecated="true" deprecatedVersion="3.0">
6+
<obsoletedBys>
7+
<obsoletedBy>GPL-2.0-only</obsoletedBy>
8+
<obsoletedBy expression="GPL-2.0+">GPL-2.0-or-later</obsoletedBy>
9+
</obsoletedBys>
610
<crossRefs>
711
<crossRef>http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html</crossRef>
812
<crossRef>http://www.opensource.org/licenses/GPL-2.0</crossRef>
913
</crossRefs>
10-
<notes>
11-
DEPRECATED: Deprecated in lieu of more
12-
explicit license identifier of GPL-2.0-only
13-
</notes>
1414
<standardLicenseHeader>
1515
Copyright (C) <alt name="copyright" match=".+">yyyy name of author</alt>
1616
<p>

‎src/GPL-3.0+.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
33
<license isOsiApproved="true" licenseId="GPL-3.0+" isDeprecated="true" deprecatedVersion="2.0rc2"
44
name="GNU General Public License v3.0 or later">
5+
<obsoletedBys>
6+
<obsoletedBy>GPL-3.0-or-later</obsoletedBy>
7+
</obsoletedBys>
58
<crossRefs>
69
<crossRef>http://www.gnu.org/licenses/gpl-3.0-standalone.html</crossRef>
710
<crossRef>http://www.opensource.org/licenses/GPL-3.0</crossRef>
811
</crossRefs>
9-
<notes>DEPRECATED: Use the license identifier GPL-3.0-or-later</notes>
1012
<text>
1113
<titleText>
1214
<p>GNU GENERAL PUBLIC LICENSE

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
33
<license isOsiApproved="true" licenseId="GPL-3.0-with-GCC-exception" isDeprecated="true" deprecatedVersion="2.0rc2"
44
name="GNU General Public License v3.0 w/GCC Runtime Library exception">
5-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
5+
<obsoletedBys>
6+
<obsoletedBy>GPL-3.0 WITH GCC-exception-3.1</obsoletedBy>
7+
<obsoletedBy expression="GPL-3.0-with-GCC-exception+">GPL-3.0-or-later WITH GCC-exception-3.1</obsoletedBy>
8+
</obsoletedBys>
69
<crossRefs>
710
<crossRef>http://www.gnu.org/licenses/gcc-exception-3.1.html</crossRef>
811
</crossRefs>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
33
<license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="GPL-3.0-with-autoconf-exception"
44
name="GNU General Public License v3.0 w/Autoconf exception">
5+
<obsoletedBys>
6+
<obsoletedBy>GPL-3.0 WITH Autoconf-exception-3.0</obsoletedBy>
7+
<obsoletedBy expression="GPL-3.0-with-autoconf-exception+">GPL-3.0-or-later WITH Autoconf-exception-3.0</obsoletedBy>
8+
</obsoletedBys>
59
<crossRefs>
610
<crossRef>http://www.gnu.org/licenses/autoconf-exception-3.0.html</crossRef>
711
</crossRefs>
8-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
912

1013
<text>
1114
<p>insert GPL v3 text here</p>

‎src/GPL-3.0.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<license licenseId="GPL-3.0" isOsiApproved="true"
44
name="GNU General Public License v3.0 only"
55
isDeprecated="true" deprecatedVersion="3.0">
6+
<obsoletedBys>
7+
<obsoletedBy>GPL-3.0-only</obsoletedBy>
8+
<obsoletedBy expression="GPL-3.0+">GPL-3.0-or-later</obsoletedBy>
9+
</obsoletedBys>
610
<crossRefs>
711
<crossRef>http://www.gnu.org/licenses/gpl-3.0-standalone.html</crossRef>
812
<crossRef>http://www.opensource.org/licenses/GPL-3.0</crossRef>
913
</crossRefs>
10-
<notes>
11-
DEPRECATED: Deprecated in lieu of more
12-
explicit license identifier of GPL-3.0-only
13-
</notes>
1414
<standardLicenseHeader>
1515
Copyright (C) <alt name="copyright"
1616
match=".+">&lt;year&gt; &lt;name of author&gt;</alt>

‎src/LGPL-2.0+.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
33
<license isOsiApproved="true" licenseId="LGPL-2.0+" isDeprecated="true" deprecatedVersion="2.0rc2"
44
name="GNU Library General Public License v2 or later">
5-
<notes>DEPRECATED: Use the license identifier LGPL-2.0-or-later</notes>
5+
<obsoletedBys>
6+
<obsoletedBy>LGPL-2.0-or-later</obsoletedBy>
7+
</obsoletedBys>
68
<crossRefs>
79
<crossRef>http://www.gnu.org/licenses/old-licenses/lgpl-2.0-standalone.html</crossRef>
810
</crossRefs>

‎src/LGPL-2.0.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<license licenseId="LGPL-2.0" isOsiApproved="true"
44
name="GNU Library General Public License v2 only"
55
isDeprecated="true" deprecatedVersion="3.0">
6+
<obsoletedBys>
7+
<obsoletedBy>LGPL-2.0-only</obsoletedBy>
8+
<obsoletedBy expression="LGPL-2.0+">LGPL-2.0-or-later</obsoletedBy>
9+
</obsoletedBys>
610
<crossRefs>
711
<crossRef>http://www.gnu.org/licenses/old-licenses/lgpl-2.0-standalone.html</crossRef>
812
</crossRefs>
9-
<notes>
10-
DEPRECATED: Deprecated in lieu of more
11-
explicit license identifier of LGPL-2.0-only
12-
</notes>
1313
<standardLicenseHeader>
1414
Copyright (C) <alt name="copyright" match=".+">year name of author</alt>
1515
This library is free software; you can redistribute it and/or modify it

0 commit comments

Comments
 (0)