*: Add obsoletedBy to obsolete licenses

Taking advantage of the schema change from the previous commit.
spdx · Jan 12, 2018 · a7bef17 · a7bef17
1 parent d1936d4
commit a7bef17
Show file tree

Hide file tree

Showing 27 changed files with 44 additions and 60 deletions.
diff --git a/src/AGPL-3.0.xml b/src/AGPL-3.0.xml
@@ -7,10 +7,8 @@
       <crossRef>http://www.gnu.org/licenses/agpl.txt</crossRef>
       <crossRef>http://www.opensource.org/licenses/AGPL-3.0</crossRef>
     </crossRefs>
-    <notes>
-      DEPRECATED: Deprecated in lieu of more
-      explicit license identifier of AGPL-3.0-only
-    </notes>
+    <obsoletedBy>AGPL-3.0-only</obsoletedBy>
+    <obsoletedBy expression="AGPL-3.0+">AGPL-3.0-or-later</obsoletedBy>
     <standardLicenseHeader>
       Copyright (C)<alt name="copyright" match=".+">[year] [name of author]</alt>
       This program is free software: you can redistribute it and/or modify it

diff --git a/src/GFDL-1.1.xml b/src/GFDL-1.1.xml
@@ -6,10 +6,8 @@
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/old-licenses/fdl-1.1.txt</crossRef>
     </crossRefs>
-    <notes>
-      DEPRECATED: Deprecated in lieu of more
-      explicit license identifier of GFDL-1.1-only
-    </notes>
+    <obsoletedBy>GFDL-1.1-only</obsoletedBy>
+    <obsoletedBy expression="GFDL-1.1+">GFDL-1.1-or-later</obsoletedBy>
     <standardLicenseHeader>
       Copyright (c) <alt name="copyright" match=".+">YEAR YOUR NAME</alt>
       . Permission is granted to copy, distribute and/or modify this

diff --git a/src/GFDL-1.2.xml b/src/GFDL-1.2.xml
@@ -6,10 +6,8 @@
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/old-licenses/fdl-1.2.txt</crossRef>
     </crossRefs>
-    <notes>
-      DEPRECATED: Deprecated in lieu of more
-      explicit license identifier of GFDL-1.2-only
-    </notes>
+    <obsoletedBy>GFDL-1.2-only</obsoletedBy>
+    <obsoletedBy expression="GFDL-1.2+">GFDL-1.2-or-later</obsoletedBy>
     <standardLicenseHeader>
       Copyright (c)<alt name="copyright" match=".+">YEAR YOUR NAME</alt>
       . Permission is granted to copy, distribute and/or modify this

diff --git a/src/GFDL-1.3.xml b/src/GFDL-1.3.xml
@@ -6,10 +6,8 @@
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/fdl-1.3.txt</crossRef>
     </crossRefs>
-    <notes>
-      DEPRECATED: Deprecated in lieu of more
-      explicit license identifier of GFDL-1.3-only
-    </notes>
+    <obsoletedBy>GFDL-1.3-only</obsoletedBy>
+    <obsoletedBy expression="GFDL-1.3+">GFDL-1.3-or-later</obsoletedBy>
     <standardLicenseHeader>
       Copyright (c)<alt name="copyright" match=".+">YEAR YOUR NAME</alt>
       Permission is granted to copy, distribute and/or modify this

diff --git a/src/GPL-1.0+.xml b/src/GPL-1.0+.xml
@@ -5,7 +5,7 @@
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html</crossRef>
       </crossRefs>
-      <notes>DEPRECATED: Use GPL-1.0-or-later</notes>
+      <obsoletedBy>GPL-1.0-or-later</obsoletedBy>
       <standardLicenseHeader> Copyright (C) 
     <alt match=".+" name="copyright">19xx name of author</alt> 
          <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> 

diff --git a/src/GPL-1.0.xml b/src/GPL-1.0.xml
@@ -6,10 +6,8 @@
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html</crossRef>
     </crossRefs>
-    <notes>
-      DEPRECATED: Deprecated in lieu of more
-      explicit license identifier of GPL-1.0-only
-    </notes>
+    <obsoletedBy>GPL-1.0-only</obsoletedBy>
+    <obsoletedBy expression="GPL-1.0+">GPL-1.0-or-later</obsoletedBy>
     <standardLicenseHeader>
       Copyright (C)<alt name="copyright" match=".+">19xx name of author</alt>
       <p>

diff --git a/src/GPL-2.0+.xml b/src/GPL-2.0+.xml
@@ -2,7 +2,7 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isOsiApproved="true" licenseId="GPL-2.0+" isDeprecated="true" deprecatedVersion="2.0rc2"
             name="GNU General Public License v2.0 or later">
-	  <notes>DEPRECATED: Use the license identifier GPL-2.0-or-later</notes>
+      <obsoletedBy>GPL-2.0-or-later</obsoletedBy>
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html</crossRef>
          <crossRef>http://www.opensource.org/licenses/GPL-2.0</crossRef>

diff --git a/src/GPL-2.0-with-GCC-exception.xml b/src/GPL-2.0-with-GCC-exception.xml
@@ -5,7 +5,8 @@
       <crossRefs>
          <crossRef>https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/libgcc1.c;h=762f5143fc6eed57b6797c82710f3538aa52b40b;hb=cb143a3ce4fb417c68f5fa2691a1b1b1053dfba9#l10</crossRef>
       </crossRefs>
-      <notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
+      <obsoletedBy>GPL-2.0 WITH GCC-exception-2.0</obsoletedBy>
+      <obsoletedBy expression="GPL-2.0-with-GCC-exception+">GPL-2.0-or-later WITH GCC-exception-2.0</obsoletedBy>
 
 	     <p>insert GPL v2 license text here</p>
 	     <p>GCC Linking Exception </p>

diff --git a/src/GPL-2.0-with-autoconf-exception.xml b/src/GPL-2.0-with-autoconf-exception.xml
@@ -5,7 +5,8 @@
       <crossRefs>
          <crossRef>http://ac-archive.sourceforge.net/doc/copyright.html</crossRef>
       </crossRefs>
-      <notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
+      <obsoletedBy>GPL-2.0 WITH Autoconf-exception-2.0</obsoletedBy>
+      <obsoletedBy expression="GPL-2.0-with-autoconf-exception+">GPL-2.0-or-later WITH Autoconf-exception-2.0</obsoletedBy>
 
 	     <p>insert GPL v2 license text here</p>
 	     <p>Autoconf Exception</p>

diff --git a/src/GPL-2.0-with-bison-exception.xml b/src/GPL-2.0-with-bison-exception.xml
@@ -5,7 +5,8 @@
       <crossRefs>
          <crossRef>http://git.savannah.gnu.org/cgit/bison.git/tree/data/yacc.c?id=193d7c7054ba7197b0789e14965b739162319b5e#n141</crossRef>
       </crossRefs>
-      <notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
+      <obsoletedBy>GPL-2.0 WITH Bison-exception-2.2</obsoletedBy>
+      <obsoletedBy expression="GPL-2.0-with-bison-exception+">GPL-2.0-or-later WITH Bison-exception-2.2</obsoletedBy>
 	     <titleText>Bison Exception</titleText>
 
 	     <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>

diff --git a/src/GPL-2.0-with-classpath-exception.xml b/src/GPL-2.0-with-classpath-exception.xml
@@ -5,7 +5,8 @@
       <crossRefs>
          <crossRef>http://www.gnu.org/software/classpath/license.html</crossRef>
       </crossRefs>
-      <notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
+      <obsoletedBy>GPL-2.0 WITH Classpath-exception-2.0</obsoletedBy>
+      <obsoletedBy expression="GPL-2.0-with-classpath-exception+">GPL-2.0-or-later WITH Classpath-exception-2.0</obsoletedBy>
 
 	     <p>insert GPL v2 license text here</p>
 	     <p>Class Path Exception</p>

diff --git a/src/GPL-2.0-with-font-exception.xml b/src/GPL-2.0-with-font-exception.xml
@@ -5,7 +5,8 @@
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/gpl-faq.html#FontException</crossRef>
       </crossRefs>
-      <notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
+      <obsoletedBy>GPL-2.0 WITH Font-exception-2.0</obsoletedBy>
+      <obsoletedBy expression="GPL-2.0-with-font-exception+">GPL-2.0-or-later+ WITH Font-exception-2.0</obsoletedBy>
 
 	     <p>insert GPL v2 license text here</p>
 	     <p>Font Exception</p>

diff --git a/src/GPL-2.0.xml b/src/GPL-2.0.xml
@@ -7,10 +7,8 @@
       <crossRef>http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html</crossRef>
       <crossRef>http://www.opensource.org/licenses/GPL-2.0</crossRef>
     </crossRefs>
-    <notes>
-      DEPRECATED: Deprecated in lieu of more
-      explicit license identifier of GPL-2.0-only
-    </notes>
+    <obsoletedBy>GPL-2.0-only</obsoletedBy>
+    <obsoletedBy expression="GPL-2.0+">GPL-2.0-or-later</obsoletedBy>
     <standardLicenseHeader>
       Copyright (C)<alt name="copyright" match=".+">yyyy name of author</alt>
       <p>

diff --git a/src/GPL-3.0+.xml b/src/GPL-3.0+.xml
@@ -6,7 +6,7 @@
          <crossRef>http://www.gnu.org/licenses/gpl-3.0-standalone.html</crossRef>
          <crossRef>http://www.opensource.org/licenses/GPL-3.0</crossRef>
       </crossRefs>
-	  <notes>DEPRECATED: Use the license identifier GPL-3.0-or-later</notes>
+      <obsoletedBy>GPL-3.0-or-later</obsoletedBy>
       <standardLicenseHeader> Copyright (C) 
     <alt match=".+" name="copyright">&lt;year&gt; &lt;name of author&gt;</alt>
       <p>

diff --git a/src/GPL-3.0-with-GCC-exception.xml b/src/GPL-3.0-with-GCC-exception.xml
@@ -2,7 +2,8 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isOsiApproved="true" licenseId="GPL-3.0-with-GCC-exception" isDeprecated="true" deprecatedVersion="2.0rc2"
             name="GNU General Public License v3.0 w/GCC Runtime Library exception">
-	  <notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
+      <obsoletedBy>GPL-3.0 WITH GCC-exception-3.1</obsoletedBy>
+      <obsoletedBy expression="GPL-3.0-with-GCC-exception+">GPL-3.0-or-later WITH GCC-exception-3.1</obsoletedBy>
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/gcc-exception-3.1.html</crossRef>
       </crossRefs>

diff --git a/src/GPL-3.0-with-autoconf-exception.xml b/src/GPL-3.0-with-autoconf-exception.xml
@@ -5,7 +5,8 @@
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/autoconf-exception-3.0.html</crossRef>
       </crossRefs>
-      <notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
+      <obsoletedBy>GPL-3.0 WITH Autoconf-exception-3.0</obsoletedBy>
+      <obsoletedBy expression="GPL-3.0-with-autoconf-exception+">GPL-3.0-or-later WITH Autoconf-exception-3.0</obsoletedBy>
 
 	     <p>insert GPL v3 text here</p>
 	     <p>AUTOCONF CONFIGURE SCRIPT EXCEPTION</p>

diff --git a/src/GPL-3.0.xml b/src/GPL-3.0.xml
@@ -7,10 +7,8 @@
       <crossRef>http://www.gnu.org/licenses/gpl-3.0-standalone.html</crossRef>
       <crossRef>http://www.opensource.org/licenses/GPL-3.0</crossRef>
     </crossRefs>
-    <notes>
-      DEPRECATED: Deprecated in lieu of more
-      explicit license identifier of GPL-3.0-only
-    </notes>
+    <obsoletedBy>GPL-3.0-only</obsoletedBy>
+    <obsoletedBy expression="GPL-3.0+">GPL-3.0-or-later</obsoletedBy>
     <standardLicenseHeader>
       Copyright (C)<alt name="copyright"
       match=".+">&lt;year&gt; &lt;name of author&gt;</alt>

diff --git a/src/LGPL-2.0+.xml b/src/LGPL-2.0+.xml
@@ -2,7 +2,7 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isOsiApproved="true" licenseId="LGPL-2.0+" isDeprecated="true" deprecatedVersion="2.0rc2"
             name="GNU Library General Public License v2 or later">
-	  <notes>DEPRECATED: Use the license identifier LGPL-2.0-or-later</notes>
+      <obsoletedBy>LGPL-2.0-or-later</obsoletedBy>
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/old-licenses/lgpl-2.0-standalone.html</crossRef>
       </crossRefs>

diff --git a/src/LGPL-2.0.xml b/src/LGPL-2.0.xml
@@ -6,10 +6,8 @@
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/old-licenses/lgpl-2.0-standalone.html</crossRef>
     </crossRefs>
-    <notes>
-      DEPRECATED: Deprecated in lieu of more
-      explicit license identifier of LGPL-2.0-only
-    </notes>
+    <obsoletedBy>LGPL-2.0-only</obsoletedBy>
+    <obsoletedBy expression="LGPL-2.0+">LGPL-2.0-or-later</obsoletedBy>
     <standardLicenseHeader>
       Copyright (C)<alt name="copyright" match=".+">year name of author</alt>
       This library is free software; you can redistribute it and/or modify it

diff --git a/src/LGPL-2.1+.xml b/src/LGPL-2.1+.xml
@@ -2,7 +2,7 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isOsiApproved="true" licenseId="LGPL-2.1+"  isDeprecated="true" deprecatedVersion="2.0rc2"
             name="GNU Library General Public License v2.1 or later">
-	  <notes>DEPRECATED: Use the license identifier LGPL-2.1-or-later</notes>
+      <obsoletedBy>LGPL-2.1-or-later</obsoletedBy>
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html</crossRef>
          <crossRef>http://www.opensource.org/licenses/LGPL-2.1</crossRef>

diff --git a/src/LGPL-2.1.xml b/src/LGPL-2.1.xml
@@ -7,10 +7,8 @@
       <crossRef>http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html</crossRef>
       <crossRef>http://www.opensource.org/licenses/LGPL-2.1</crossRef>
     </crossRefs>
-    <notes>
-      DEPRECATED: Deprecated in lieu of more
-      explicit license identifier of LGPL-2.1-only
-    </notes>
+    <obsoletedBy>LGPL-2.1-only</obsoletedBy>
+    <obsoletedBy expression="LGPL-2.1+">LGPL-2.1-or-later</obsoletedBy>
     <standardLicenseHeader>
       Copyright (C)<alt name="copyright" match=".+">year name of author</alt>
       <p>

diff --git a/src/LGPL-3.0+.xml b/src/LGPL-3.0+.xml
@@ -2,7 +2,7 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isOsiApproved="true" licenseId="LGPL-3.0+"  isDeprecated="true" deprecatedVersion="2.0rc2"
             name="GNU Lesser General Public License v3.0 or later">
-	  <notes>DEPRECATED: Use the license identifier LGPL-3.0-or-later</notes>
+      <obsoletedBy>LGPL-3.0-or-later</obsoletedBy>
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/lgpl-3.0-standalone.html</crossRef>
          <crossRef>http://www.opensource.org/licenses/LGPL-3.0</crossRef>

diff --git a/src/LGPL-3.0.xml b/src/LGPL-3.0.xml
@@ -7,10 +7,8 @@
       <crossRef>http://www.gnu.org/licenses/lgpl-3.0-standalone.html</crossRef>
       <crossRef>http://www.opensource.org/licenses/LGPL-3.0</crossRef>
     </crossRefs>
-    <notes>
-      DEPRECATED: Deprecated in lieu of more
-      explicit license identifier of LGPL-3.0-only
-    </notes>
+    <obsoletedBy>LGPL-3.0-only</obsoletedBy>
+    <obsoletedBy expression="LGPL-3.0+">LGPL-3.0-or-later</obsoletedBy>
     <titleText>
       <p>
         GNU LESSER GENERAL PUBLIC LICENSE<br></br>

diff --git a/src/Nunit.xml b/src/Nunit.xml
@@ -4,7 +4,7 @@
       <crossRefs>
          <crossRef>https://fedoraproject.org/wiki/Licensing/Nunit</crossRef>
       </crossRefs>
-      <notes>DEPRECATED: This license was added twice by accident. Use short identifier: zlib-acknowledgement </notes>
+      <obsoletedBy>zlib-acknowledgement</obsoletedBy>
       <copyrightText>
          <p>Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov, Charlie Poole 
         <br/>Copyright © 2000-2004 Philip A. Craig 

diff --git a/src/StandardML-NJ.xml b/src/StandardML-NJ.xml
@@ -2,10 +2,10 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isOsiApproved="false" licenseId="StandardML-NJ" isDeprecated="true" deprecatedVersion="2.0rc2"
             name="Standard ML of New Jersey License">
-	  <notes>DEPRECATED: This license was added twice (as of v1.17 and then in v1.20) by accident. Use short identifier: SMLNJ</notes>
       <crossRefs>
          <crossRef>http://www.smlnj.org//license.html</crossRef>
       </crossRefs>
+      <obsoletedBy>SMLNJ</obsoletedBy>
       <titleText>
          <p>STANDARD ML OF NEW JERSEY COPYRIGHT NOTICE, LICENSE AND DISCLAIMER.</p>
       </titleText>

diff --git a/src/eCos-2.0.xml b/src/eCos-2.0.xml
@@ -4,7 +4,7 @@
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/ecos-license.html</crossRef>
       </crossRefs>
-      <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>
+      <obsoletedBy>GPL-2.0-or-later WITH eCos-exception-2.0</obsoletedBy>
       <titleText>The eCos license version 2.0</titleText>
 
 	     <p>This file is part of eCos, the Embedded Configurable Operating System. Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.</p>

diff --git a/src/wxWindows.xml b/src/wxWindows.xml
@@ -4,10 +4,7 @@
       <crossRefs>
          <crossRef>http://www.opensource.org/licenses/WXwindows</crossRef>
       </crossRefs>
-   <notes>
-     <p>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</p>
-     <p>Typically used with GPL-2.0+.</p>
-  </notes>
+      <obsoletedBy>GPL-2.0-or-later WITH WxWindows-exception-3.1</obsoletedBy>
       <p>EXCEPTION NOTICE</p>
       <list>
         <item>