Skip to content

Commit b68aa58

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

27 files changed

+44
-60
lines changed

‎src/AGPL-3.0.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
<crossRef>http://www.gnu.org/licenses/agpl.txt</crossRef>
88
<crossRef>http://www.opensource.org/licenses/AGPL-3.0</crossRef>
99
</crossRefs>
10-
<notes>
11-
DEPRECATED: Deprecated in lieu of more
12-
explicit license identifier of AGPL-3.0-only
13-
</notes>
10+
<obsoletedBy>AGPL-3.0-only</obsoletedBy>
11+
<obsoletedBy expression="AGPL-3.0+">AGPL-3.0-or-later</obsoletedBy>
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
@@ -6,10 +6,8 @@
66
<crossRefs>
77
<crossRef>http://www.gnu.org/licenses/old-licenses/fdl-1.1.txt</crossRef>
88
</crossRefs>
9-
<notes>
10-
DEPRECATED: Deprecated in lieu of more
11-
explicit license identifier of GFDL-1.1-only
12-
</notes>
9+
<obsoletedBy>GFDL-1.1-only</obsoletedBy>
10+
<obsoletedBy expression="GFDL-1.1+">GFDL-1.1-or-later</obsoletedBy>
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
@@ -6,10 +6,8 @@
66
<crossRefs>
77
<crossRef>http://www.gnu.org/licenses/old-licenses/fdl-1.2.txt</crossRef>
88
</crossRefs>
9-
<notes>
10-
DEPRECATED: Deprecated in lieu of more
11-
explicit license identifier of GFDL-1.2-only
12-
</notes>
9+
<obsoletedBy>GFDL-1.2-only</obsoletedBy>
10+
<obsoletedBy expression="GFDL-1.2+">GFDL-1.2-or-later</obsoletedBy>
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
@@ -6,10 +6,8 @@
66
<crossRefs>
77
<crossRef>http://www.gnu.org/licenses/fdl-1.3.txt</crossRef>
88
</crossRefs>
9-
<notes>
10-
DEPRECATED: Deprecated in lieu of more
11-
explicit license identifier of GFDL-1.3-only
12-
</notes>
9+
<obsoletedBy>GFDL-1.3-only</obsoletedBy>
10+
<obsoletedBy expression="GFDL-1.3+">GFDL-1.3-or-later</obsoletedBy>
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
@@ -5,7 +5,7 @@
55
<crossRefs>
66
<crossRef>http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html</crossRef>
77
</crossRefs>
8-
<notes>DEPRECATED: Use GPL-1.0-or-later</notes>
8+
<obsoletedBy>GPL-1.0-or-later</obsoletedBy>
99
<standardLicenseHeader> Copyright (C)
1010
<alt match=".+" name="copyright">19xx name of author</alt>
1111
<p>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 1, or (at your option) any later version.</p>

‎src/GPL-1.0.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@
66
<crossRefs>
77
<crossRef>http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html</crossRef>
88
</crossRefs>
9-
<notes>
10-
DEPRECATED: Deprecated in lieu of more
11-
explicit license identifier of GPL-1.0-only
12-
</notes>
9+
<obsoletedBy>GPL-1.0-only</obsoletedBy>
10+
<obsoletedBy expression="GPL-1.0+">GPL-1.0-or-later</obsoletedBy>
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
@@ -5,7 +5,8 @@
55
<crossRefs>
66
<crossRef>https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/libgcc1.c;h=762f5143fc6eed57b6797c82710f3538aa52b40b;hb=cb143a3ce4fb417c68f5fa2691a1b1b1053dfba9#l10</crossRef>
77
</crossRefs>
8-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
8+
<obsoletedBy>GPL-2.0 WITH GCC-exception-2.0</obsoletedBy>
9+
<obsoletedBy expression="GPL-2.0-with-GCC-exception+">GPL-2.0-or-later WITH GCC-exception-2.0</obsoletedBy>
910

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

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

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

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

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

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

1112
<p>As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof as a parser skeleton. Alternatively, if you modify or redistribute the parser skeleton itself, you may (at your option) remove this special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception.</p>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<crossRefs>
66
<crossRef>http://www.gnu.org/software/classpath/license.html</crossRef>
77
</crossRefs>
8-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
8+
<obsoletedBy>GPL-2.0 WITH Classpath-exception-2.0</obsoletedBy>
9+
<obsoletedBy expression="GPL-2.0-with-classpath-exception+">GPL-2.0-or-later WITH Classpath-exception-2.0</obsoletedBy>
910

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

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

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

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

‎src/GPL-2.0.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
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>
99
</crossRefs>
10-
<notes>
11-
DEPRECATED: Deprecated in lieu of more
12-
explicit license identifier of GPL-2.0-only
13-
</notes>
10+
<obsoletedBy>GPL-2.0-only</obsoletedBy>
11+
<obsoletedBy expression="GPL-2.0+">GPL-2.0-or-later</obsoletedBy>
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
@@ -6,7 +6,7 @@
66
<crossRef>http://www.gnu.org/licenses/gpl-3.0-standalone.html</crossRef>
77
<crossRef>http://www.opensource.org/licenses/GPL-3.0</crossRef>
88
</crossRefs>
9-
<notes>DEPRECATED: Use the license identifier GPL-3.0-or-later</notes>
9+
<obsoletedBy>GPL-3.0-or-later</obsoletedBy>
1010
<standardLicenseHeader> Copyright (C)
1111
<alt match=".+" name="copyright">&lt;year&gt; &lt;name of author&gt;</alt>
1212
<p>

‎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
@@ -5,7 +5,8 @@
55
<crossRefs>
66
<crossRef>http://www.gnu.org/licenses/autoconf-exception-3.0.html</crossRef>
77
</crossRefs>
8-
<notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
8+
<obsoletedBy>GPL-3.0 WITH Autoconf-exception-3.0</obsoletedBy>
9+
<obsoletedBy expression="GPL-3.0-with-autoconf-exception+">GPL-3.0-or-later WITH Autoconf-exception-3.0</obsoletedBy>
910

1011
<p>insert GPL v3 text here</p>
1112
<p>AUTOCONF CONFIGURE SCRIPT EXCEPTION</p>

‎src/GPL-3.0.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
<crossRef>http://www.gnu.org/licenses/gpl-3.0-standalone.html</crossRef>
88
<crossRef>http://www.opensource.org/licenses/GPL-3.0</crossRef>
99
</crossRefs>
10-
<notes>
11-
DEPRECATED: Deprecated in lieu of more
12-
explicit license identifier of GPL-3.0-only
13-
</notes>
10+
<obsoletedBy>GPL-3.0-only</obsoletedBy>
11+
<obsoletedBy expression="GPL-3.0+">GPL-3.0-or-later</obsoletedBy>
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
@@ -6,10 +6,8 @@
66
<crossRefs>
77
<crossRef>http://www.gnu.org/licenses/old-licenses/lgpl-2.0-standalone.html</crossRef>
88
</crossRefs>
9-
<notes>
10-
DEPRECATED: Deprecated in lieu of more
11-
explicit license identifier of LGPL-2.0-only
12-
</notes>
9+
<obsoletedBy>LGPL-2.0-only</obsoletedBy>
10+
<obsoletedBy exprssion="LGPL-2.0+">LGPL-2.0-or-later</obsoletedBy>
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
@@ -7,10 +7,8 @@
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>
99
</crossRefs>
10-
<notes>
11-
DEPRECATED: Deprecated in lieu of more
12-
explicit license identifier of LGPL-2.1-only
13-
</notes>
10+
<obsoletedBy>LGPL-2.1-only</obsoletedBy>
11+
<obsoletedBy expression="LGPL-2.1+">LGPL-2.1-or-later</obsoletedBy>
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
@@ -7,10 +7,8 @@
77
<crossRef>http://www.gnu.org/licenses/lgpl-3.0-standalone.html</crossRef>
88
<crossRef>http://www.opensource.org/licenses/LGPL-3.0</crossRef>
99
</crossRefs>
10-
<notes>
11-
DEPRECATED: Deprecated in lieu of more
12-
explicit license identifier of LGPL-3.0-only
13-
</notes>
10+
<obsoletedBy>LGPL-3.0-only</obsoletedBy>
11+
<obsoletedBy expression="LGPL-3.0+">LGPL-3.0-or-later</obsoletedBy>
1412
<titleText>
1513
<p>
1614
GNU LESSER GENERAL PUBLIC LICENSE<br></br>

‎src/Nunit.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<crossRefs>
55
<crossRef>https://fedoraproject.org/wiki/Licensing/Nunit</crossRef>
66
</crossRefs>
7-
<notes>DEPRECATED: This license was added twice by accident. Use short identifier: zlib-acknowledgement </notes>
7+
<obsoletedBy>zlib-acknowledgement</obsoletedBy>
88
<copyrightText>
99
<p>Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov, Charlie Poole
1010
<br/>Copyright © 2000-2004 Philip A. Craig

‎src/StandardML-NJ.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 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>
65
<crossRefs>
76
<crossRef>http://www.smlnj.org//license.html</crossRef>
87
</crossRefs>
8+
<obsoletedBy>SMLNJ</obsoletedBy>
99
<titleText>
1010
<p>STANDARD ML OF NEW JERSEY COPYRIGHT NOTICE, LICENSE AND DISCLAIMER.</p>
1111
</titleText>

‎src/eCos-2.0.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<crossRefs>
55
<crossRef>http://www.gnu.org/licenses/ecos-license.html</crossRef>
66
</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>
7+
<obsoletedBy>GPL-2.0-or-later WITH eCos-exception-2.0</obsoletedBy>
88
<titleText>The eCos license version 2.0</titleText>
99

1010
<p>This file is part of eCos, the Embedded Configurable Operating System. Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.</p>

‎src/wxWindows.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
<crossRefs>
55
<crossRef>http://www.opensource.org/licenses/WXwindows</crossRef>
66
</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>
7+
<obsoletedBy>GPL-2.0-or-later WITH WxWindows-exception-3.1</obsoletedBy>
118
<p>EXCEPTION NOTICE</p>
129
<list>
1310
<item>

0 commit comments

Comments
 (0)