Skip to content

Commit 9ba7946

Browse files
wkingwking
committed
*: Add obsoletedBy to obsolete licenses
Taking advantage of the schema change from the previous commit.
1 parent c78a736 commit 9ba7946

28 files changed

+46
-60
lines changed

‎src/AGPL-1.0.xml

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

‎src/AGPL-3.0.xml

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

‎src/GFDL-1.1.xml

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

‎src/GFDL-1.2.xml

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

‎src/GFDL-1.3.xml

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

‎src/GPL-1.0+.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
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+
<obsoletedBy>GPL-1.0-or-later</obsoletedBy>
56
<crossRefs>
67
<crossRef>http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html</crossRef>
78
</crossRefs>
8-
<notes>DEPRECATED: Use GPL-1.0-or-later</notes>
99
<text>
1010
<titleText>
1111
<p>GNU GENERAL PUBLIC LICENSE

‎src/GPL-1.0.xml

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

‎src/GPL-2.0+.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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+
<obsoletedBy>GPL-2.0-or-later</obsoletedBy>
66
<crossRefs>
77
<crossRef>http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html</crossRef>
88
<crossRef>http://www.opensource.org/licenses/GPL-2.0</crossRef>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
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+
<obsoletedBy>GPL-2.0 WITH GCC-exception-2.0</obsoletedBy>
6+
<obsoletedBy expression="GPL-2.0-with-GCC-exception+">GPL-2.0-or-later WITH GCC-exception-2.0</obsoletedBy>
57
<crossRefs>
68
<crossRef>https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/libgcc1.c;h=762f5143fc6eed57b6797c82710f3538aa52b40b;hb=cb143a3ce4fb417c68f5fa2691a1b1b1053dfba9#l10</crossRef>
79
</crossRefs>
8-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
910

1011
<text>
1112
<p>insert GPL v2 license text here</p>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
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+
<obsoletedBy>GPL-2.0 WITH Autoconf-exception-2.0</obsoletedBy>
6+
<obsoletedBy expression="GPL-2.0-with-autoconf-exception+">GPL-2.0-or-later WITH Autoconf-exception-2.0</obsoletedBy>
57
<crossRefs>
68
<crossRef>http://ac-archive.sourceforge.net/doc/copyright.html</crossRef>
79
</crossRefs>
8-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
910

1011
<text>
1112
<p>insert GPL v2 license text here</p>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
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+
<obsoletedBy>GPL-2.0 WITH Bison-exception-2.2</obsoletedBy>
6+
<obsoletedBy expression="GPL-2.0-with-bison-exception+">GPL-2.0-or-later WITH Bison-exception-2.2</obsoletedBy>
57
<crossRefs>
68
<crossRef>http://git.savannah.gnu.org/cgit/bison.git/tree/data/yacc.c?id=193d7c7054ba7197b0789e14965b739162319b5e#n141</crossRef>
79
</crossRefs>
8-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
910
<text>
1011
<titleText>Bison Exception</titleText>
1112

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
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+
<obsoletedBy>GPL-2.0 WITH Classpath-exception-2.0</obsoletedBy>
6+
<obsoletedBy expression="GPL-2.0-with-classpath-exception+">GPL-2.0-or-later WITH Classpath-exception-2.0</obsoletedBy>
57
<crossRefs>
68
<crossRef>http://www.gnu.org/software/classpath/license.html</crossRef>
79
</crossRefs>
8-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
910

1011
<text>
1112
<p>insert GPL v2 license text here</p>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
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+
<obsoletedBy>GPL-2.0 WITH Font-exception-2.0</obsoletedBy>
6+
<obsoletedBy expression="GPL-2.0-with-font-exception+">GPL-2.0-or-later+ WITH Font-exception-2.0</obsoletedBy>
57
<crossRefs>
68
<crossRef>http://www.gnu.org/licenses/gpl-faq.html#FontException</crossRef>
79
</crossRefs>
8-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
910

1011
<text>
1112
<p>insert GPL v2 license text here</p>

‎src/GPL-2.0.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
<license licenseId="GPL-2.0" isOsiApproved="true"
44
name="GNU General Public License v2.0 only"
55
isDeprecated="true" deprecatedVersion="3.0">
6+
<obsoletedBy>GPL-2.0-only</obsoletedBy>
7+
<obsoletedBy expression="GPL-2.0+">GPL-2.0-or-later</obsoletedBy>
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>
911
</crossRefs>
10-
<notes>
11-
DEPRECATED: Deprecated in lieu of more
12-
explicit license identifier of GPL-2.0-only
13-
</notes>
1412
<standardLicenseHeader>
1513
Copyright (C) <alt name="copyright" match=".+">yyyy name of author</alt>
1614
<p>

‎src/GPL-3.0+.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
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+
<obsoletedBy>GPL-3.0-or-later</obsoletedBy>
56
<crossRefs>
67
<crossRef>http://www.gnu.org/licenses/gpl-3.0-standalone.html</crossRef>
78
<crossRef>http://www.opensource.org/licenses/GPL-3.0</crossRef>
89
</crossRefs>
9-
<notes>DEPRECATED: Use the license identifier GPL-3.0-or-later</notes>
1010
<text>
1111
<titleText>
1212
<p>GNU GENERAL PUBLIC LICENSE

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
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+
<obsoletedBy>GPL-3.0 WITH GCC-exception-3.1</obsoletedBy>
6+
<obsoletedBy expression="GPL-3.0-with-GCC-exception+">GPL-3.0-or-later WITH GCC-exception-3.1</obsoletedBy>
67
<crossRefs>
78
<crossRef>http://www.gnu.org/licenses/gcc-exception-3.1.html</crossRef>
89
</crossRefs>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
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+
<obsoletedBy>GPL-3.0 WITH Autoconf-exception-3.0</obsoletedBy>
6+
<obsoletedBy expression="GPL-3.0-with-autoconf-exception+">GPL-3.0-or-later WITH Autoconf-exception-3.0</obsoletedBy>
57
<crossRefs>
68
<crossRef>http://www.gnu.org/licenses/autoconf-exception-3.0.html</crossRef>
79
</crossRefs>
8-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
910

1011
<text>
1112
<p>insert GPL v3 text here</p>

‎src/GPL-3.0.xml

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

‎src/LGPL-2.0+.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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+
<obsoletedBy>LGPL-2.0-or-later</obsoletedBy>
66
<crossRefs>
77
<crossRef>http://www.gnu.org/licenses/old-licenses/lgpl-2.0-standalone.html</crossRef>
88
</crossRefs>

‎src/LGPL-2.0.xml

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

‎src/LGPL-2.1+.xml

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

‎src/LGPL-2.1.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
<license licenseId="LGPL-2.1" isOsiApproved="true"
44
name="GNU Lesser General Public License v2.1 only"
55
isDeprecated="true" deprecatedVersion="3.0">
6+
<obsoletedBy>LGPL-2.1-only</obsoletedBy>
7+
<obsoletedBy expression="LGPL-2.1+">LGPL-2.1-or-later</obsoletedBy>
68
<crossRefs>
79
<crossRef>http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html</crossRef>
810
<crossRef>http://www.opensource.org/licenses/LGPL-2.1</crossRef>
911
</crossRefs>
10-
<notes>
11-
DEPRECATED: Deprecated in lieu of more
12-
explicit license identifier of LGPL-2.1-only
13-
</notes>
1412
<standardLicenseHeader>
1513
Copyright (C) <alt name="copyright" match=".+">year name of author</alt>
1614
<p>

‎src/LGPL-3.0+.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
33
<license isOsiApproved="true" licenseId="LGPL-3.0+" isDeprecated="true" deprecatedVersion="2.0rc2"
44
name="GNU Lesser General Public License v3.0 or later">
5-
<notes>DEPRECATED: Use the license identifier LGPL-3.0-or-later</notes>
5+
<obsoletedBy>LGPL-3.0-or-later</obsoletedBy>
66
<crossRefs>
77
<crossRef>http://www.gnu.org/licenses/lgpl-3.0-standalone.html</crossRef>
88
<crossRef>http://www.opensource.org/licenses/LGPL-3.0</crossRef>

‎src/LGPL-3.0.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
<license licenseId="LGPL-3.0" isOsiApproved="true"
44
name="GNU Lesser General Public License v3.0 only"
55
isDeprecated="true" deprecatedVersion="3.0">
6+
<obsoletedBy>LGPL-3.0-only</obsoletedBy>
7+
<obsoletedBy expression="LGPL-3.0+">LGPL-3.0-or-later</obsoletedBy>
68
<crossRefs>
79
<crossRef>http://www.gnu.org/licenses/lgpl-3.0-standalone.html</crossRef>
810
<crossRef>http://www.opensource.org/licenses/LGPL-3.0</crossRef>
911
</crossRefs>
10-
<notes>
11-
DEPRECATED: Deprecated in lieu of more
12-
explicit license identifier of LGPL-3.0-only
13-
</notes>
1412
<text>
1513
<titleText>
1614
<p>

‎src/Nunit.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
33
<license isDeprecated="true" deprecatedVersion="3.0" licenseId="Nunit" name="Nunit License">
4+
<obsoletedBy>zlib-acknowledgement</obsoletedBy>
45
<crossRefs>
56
<crossRef>https://fedoraproject.org/wiki/Licensing/Nunit</crossRef>
67
</crossRefs>
7-
<notes>DEPRECATED: This license was added twice by accident. Use short identifier: zlib-acknowledgement </notes>
88
<text>
99
<copyrightText>
1010
<p>Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov, Charlie Poole

‎src/StandardML-NJ.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
33
<license isOsiApproved="false" licenseId="StandardML-NJ" isDeprecated="true" deprecatedVersion="2.0rc2"
44
name="Standard ML of New Jersey License">
5-
<notes>DEPRECATED: This license was added twice (as of v1.17 and then in v1.20) by accident. Use short identifier: SMLNJ</notes>
5+
<obsoletedBy>SMLNJ</obsoletedBy>
66
<crossRefs>
77
<crossRef>http://www.smlnj.org//license.html</crossRef>
88
</crossRefs>

‎src/eCos-2.0.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
33
<license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="eCos-2.0" name="eCos license version 2.0">
4+
<obsoletedBy>GPL-2.0-or-later WITH eCos-exception-2.0</obsoletedBy>
45
<crossRefs>
56
<crossRef>http://www.gnu.org/licenses/ecos-license.html</crossRef>
67
</crossRefs>
7-
<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>
88
<text>
99
<titleText>The eCos license version 2.0</titleText>
1010

‎src/wxWindows.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
33
<license licenseId="wxWindows" name="wxWindows Library License" isDeprecated="true" deprecatedVersion="2.0rc2">
4+
<obsoletedBy>GPL-2.0-or-later WITH WxWindows-exception-3.1</obsoletedBy>
45
<crossRefs>
56
<crossRef>http://www.opensource.org/licenses/WXwindows</crossRef>
67
</crossRefs>
7-
<notes>
8-
<p>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</p>
9-
<p>Typically used with GPL-2.0+.</p>
10-
</notes>
118
<text>
129
<p>EXCEPTION NOTICE</p>
1310
<list>

0 commit comments

Comments
 (0)