diff --git a/schema/ListedLicense.xsd b/schema/ListedLicense.xsd index a9e682c06..818a8aa54 100644 --- a/schema/ListedLicense.xsd +++ b/schema/ListedLicense.xsd @@ -42,6 +42,7 @@ + @@ -61,6 +62,7 @@ + @@ -165,6 +167,69 @@ + + + + + obsoletedBysType is a wrapper for a set of obsoletedBy entries. + + + + + + + + + + + + obsoletedByType 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: + + + Parse the license expression to extract the short identifiers. + Look up obsoletedBy entries for the short identifiers. + If any obsoletedBy has an expression attribute that matches the source, the value of that obsoletedBy is the recommended replacement for that expression. Otherwise, the value of the obsoletedBy without an expression attribute is the recommended replacement for the short identifier. + + + For example, the expression GPL-2.0+ WITH GCC-exception-2.0 could be parsed to either of the following short license identifiers: + + + + + GPL-2.0+, in which case there would be a single obsoletedBy with no expression attribute: + + + <obsoletedBy>GPL-2.0-or-later</obsoletedBy> + + + So the recommended replacement for GPL-2.0+ would be GPL-2.0-or-later. + + + + + GPL-2.0, in which case there would be two obsoletedBy elements: + + + <obsoletedBy>GPL-2.0-only</obsoletedBy> + <obsoletedBy expression="GPL-2.0+">GPL-2.0-or-later</obsoletedBy> + + + The element with expression="GPL-2.0+" matches the initial license expression, so the recommended replacement for GPL-2.0+ is GPL-2.0-or-later. + + + + + + + + + + expression is the license expression which is obsoleted by the expression contained by the element. Defaults to the bare identifier. + + + + + diff --git a/src/AGPL-1.0.xml b/src/AGPL-1.0.xml index 32aa2a643..6efe21bd1 100644 --- a/src/AGPL-1.0.xml +++ b/src/AGPL-1.0.xml @@ -3,6 +3,10 @@ + + AGPL-1.0-only + AGPL-1.0-or-later + http://www.affero.org/oagpl.html diff --git a/src/AGPL-3.0.xml b/src/AGPL-3.0.xml index 8dc0a72c6..5aa72543a 100644 --- a/src/AGPL-3.0.xml +++ b/src/AGPL-3.0.xml @@ -3,14 +3,14 @@ + + AGPL-3.0-only + AGPL-3.0-or-later + http://www.gnu.org/licenses/agpl.txt http://www.opensource.org/licenses/AGPL-3.0 - - DEPRECATED: Deprecated in lieu of more - explicit license identifier of AGPL-3.0-only - Copyright (C) [year] [name of author] 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 index 8e9a282eb..cfdce5424 100644 --- a/src/GFDL-1.1.xml +++ b/src/GFDL-1.1.xml @@ -3,13 +3,13 @@ + + GFDL-1.1-only + GFDL-1.1-or-later + http://www.gnu.org/licenses/old-licenses/fdl-1.1.txt - - DEPRECATED: Deprecated in lieu of more - explicit license identifier of GFDL-1.1-only - Copyright (c) YEAR YOUR NAME . Permission is granted to copy, distribute and/or modify this diff --git a/src/GFDL-1.2.xml b/src/GFDL-1.2.xml index 1c86619e9..76c275567 100644 --- a/src/GFDL-1.2.xml +++ b/src/GFDL-1.2.xml @@ -3,13 +3,13 @@ + + GFDL-1.2-only + GFDL-1.2-or-later + http://www.gnu.org/licenses/old-licenses/fdl-1.2.txt - - DEPRECATED: Deprecated in lieu of more - explicit license identifier of GFDL-1.2-only - Copyright (c) YEAR YOUR NAME . Permission is granted to copy, distribute and/or modify this diff --git a/src/GFDL-1.3.xml b/src/GFDL-1.3.xml index 3c1d10a9f..c91f58c0e 100644 --- a/src/GFDL-1.3.xml +++ b/src/GFDL-1.3.xml @@ -3,13 +3,13 @@ + + GFDL-1.3-only + GFDL-1.3-or-later + http://www.gnu.org/licenses/fdl-1.3.txt - - DEPRECATED: Deprecated in lieu of more - explicit license identifier of GFDL-1.3-only - Copyright (c) YEAR YOUR NAME Permission is granted to copy, distribute and/or modify this diff --git a/src/GPL-1.0+.xml b/src/GPL-1.0+.xml index 71a6134f1..5a3c107d3 100644 --- a/src/GPL-1.0+.xml +++ b/src/GPL-1.0+.xml @@ -2,10 +2,12 @@ + + GPL-1.0-or-later + http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html - DEPRECATED: Use GPL-1.0-or-later

GNU GENERAL PUBLIC LICENSE diff --git a/src/GPL-1.0.xml b/src/GPL-1.0.xml index e00c472e4..f887119f5 100644 --- a/src/GPL-1.0.xml +++ b/src/GPL-1.0.xml @@ -3,13 +3,13 @@ + + GPL-1.0-only + GPL-1.0-or-later + http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html - - DEPRECATED: Deprecated in lieu of more - explicit license identifier of GPL-1.0-only - Copyright (C) 19xx name of author

diff --git a/src/GPL-2.0+.xml b/src/GPL-2.0+.xml index c53b9ccb1..76e819593 100644 --- a/src/GPL-2.0+.xml +++ b/src/GPL-2.0+.xml @@ -2,7 +2,9 @@ - DEPRECATED: Use the license identifier GPL-2.0-or-later + + GPL-2.0-or-later + http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html http://www.opensource.org/licenses/GPL-2.0 diff --git a/src/GPL-2.0-with-GCC-exception.xml b/src/GPL-2.0-with-GCC-exception.xml index 9cca82234..b860ef5fc 100644 --- a/src/GPL-2.0-with-GCC-exception.xml +++ b/src/GPL-2.0-with-GCC-exception.xml @@ -2,10 +2,13 @@ + + GPL-2.0 WITH GCC-exception-2.0 + GPL-2.0-or-later WITH GCC-exception-2.0 + https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/libgcc1.c;h=762f5143fc6eed57b6797c82710f3538aa52b40b;hb=cb143a3ce4fb417c68f5fa2691a1b1b1053dfba9#l10 - DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.

insert GPL v2 license text here

diff --git a/src/GPL-2.0-with-autoconf-exception.xml b/src/GPL-2.0-with-autoconf-exception.xml index 82a242f4b..7497801aa 100644 --- a/src/GPL-2.0-with-autoconf-exception.xml +++ b/src/GPL-2.0-with-autoconf-exception.xml @@ -2,10 +2,13 @@ + + GPL-2.0 WITH Autoconf-exception-2.0 + GPL-2.0-or-later WITH Autoconf-exception-2.0 + http://ac-archive.sourceforge.net/doc/copyright.html - DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.

insert GPL v2 license text here

diff --git a/src/GPL-2.0-with-bison-exception.xml b/src/GPL-2.0-with-bison-exception.xml index 3b514903c..ce9ffb97a 100644 --- a/src/GPL-2.0-with-bison-exception.xml +++ b/src/GPL-2.0-with-bison-exception.xml @@ -2,10 +2,13 @@ + + GPL-2.0 WITH Bison-exception-2.2 + GPL-2.0-or-later WITH Bison-exception-2.2 + http://git.savannah.gnu.org/cgit/bison.git/tree/data/yacc.c?id=193d7c7054ba7197b0789e14965b739162319b5e#n141 - DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license. Bison Exception diff --git a/src/GPL-2.0-with-classpath-exception.xml b/src/GPL-2.0-with-classpath-exception.xml index 35624e85b..074fa7988 100644 --- a/src/GPL-2.0-with-classpath-exception.xml +++ b/src/GPL-2.0-with-classpath-exception.xml @@ -2,10 +2,13 @@ + + GPL-2.0 WITH Classpath-exception-2.0 + GPL-2.0-or-later WITH Classpath-exception-2.0 + http://www.gnu.org/software/classpath/license.html - DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.

insert GPL v2 license text here

diff --git a/src/GPL-2.0-with-font-exception.xml b/src/GPL-2.0-with-font-exception.xml index c9279eb23..0d4fee5e1 100644 --- a/src/GPL-2.0-with-font-exception.xml +++ b/src/GPL-2.0-with-font-exception.xml @@ -2,10 +2,13 @@ + + GPL-2.0 WITH Font-exception-2.0 + GPL-2.0-or-later+ WITH Font-exception-2.0 + http://www.gnu.org/licenses/gpl-faq.html#FontException - DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.

insert GPL v2 license text here

diff --git a/src/GPL-2.0.xml b/src/GPL-2.0.xml index 6556b17b7..94745ad11 100644 --- a/src/GPL-2.0.xml +++ b/src/GPL-2.0.xml @@ -3,14 +3,14 @@ + + GPL-2.0-only + GPL-2.0-or-later + http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html http://www.opensource.org/licenses/GPL-2.0 - - DEPRECATED: Deprecated in lieu of more - explicit license identifier of GPL-2.0-only - Copyright (C) yyyy name of author

diff --git a/src/GPL-3.0+.xml b/src/GPL-3.0+.xml index 29374c387..fe47a08bc 100644 --- a/src/GPL-3.0+.xml +++ b/src/GPL-3.0+.xml @@ -2,11 +2,13 @@ + + GPL-3.0-or-later + http://www.gnu.org/licenses/gpl-3.0-standalone.html http://www.opensource.org/licenses/GPL-3.0 - DEPRECATED: Use the license identifier GPL-3.0-or-later

GNU GENERAL PUBLIC LICENSE diff --git a/src/GPL-3.0-with-GCC-exception.xml b/src/GPL-3.0-with-GCC-exception.xml index 673f4eba3..d6fc3c290 100644 --- a/src/GPL-3.0-with-GCC-exception.xml +++ b/src/GPL-3.0-with-GCC-exception.xml @@ -2,7 +2,10 @@ - DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license. + + GPL-3.0 WITH GCC-exception-3.1 + GPL-3.0-or-later WITH GCC-exception-3.1 + http://www.gnu.org/licenses/gcc-exception-3.1.html diff --git a/src/GPL-3.0-with-autoconf-exception.xml b/src/GPL-3.0-with-autoconf-exception.xml index fcd8e5fef..508689b38 100644 --- a/src/GPL-3.0-with-autoconf-exception.xml +++ b/src/GPL-3.0-with-autoconf-exception.xml @@ -2,10 +2,13 @@ + + GPL-3.0 WITH Autoconf-exception-3.0 + GPL-3.0-or-later WITH Autoconf-exception-3.0 + http://www.gnu.org/licenses/autoconf-exception-3.0.html - DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.

insert GPL v3 text here

diff --git a/src/GPL-3.0.xml b/src/GPL-3.0.xml index c33e1e9ce..b0576f3ac 100644 --- a/src/GPL-3.0.xml +++ b/src/GPL-3.0.xml @@ -3,14 +3,14 @@ + + GPL-3.0-only + GPL-3.0-or-later + http://www.gnu.org/licenses/gpl-3.0-standalone.html http://www.opensource.org/licenses/GPL-3.0 - - DEPRECATED: Deprecated in lieu of more - explicit license identifier of GPL-3.0-only - Copyright (C) <year> <name of author> diff --git a/src/LGPL-2.0+.xml b/src/LGPL-2.0+.xml index c662a1b18..70e67b7ec 100644 --- a/src/LGPL-2.0+.xml +++ b/src/LGPL-2.0+.xml @@ -2,7 +2,9 @@ - DEPRECATED: Use the license identifier LGPL-2.0-or-later + + LGPL-2.0-or-later + http://www.gnu.org/licenses/old-licenses/lgpl-2.0-standalone.html diff --git a/src/LGPL-2.0.xml b/src/LGPL-2.0.xml index d17093cda..54239578f 100644 --- a/src/LGPL-2.0.xml +++ b/src/LGPL-2.0.xml @@ -3,13 +3,13 @@ + + LGPL-2.0-only + LGPL-2.0-or-later + http://www.gnu.org/licenses/old-licenses/lgpl-2.0-standalone.html - - DEPRECATED: Deprecated in lieu of more - explicit license identifier of LGPL-2.0-only - Copyright (C) year name of author 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 index ca6df532a..2b0db77ab 100644 --- a/src/LGPL-2.1+.xml +++ b/src/LGPL-2.1+.xml @@ -2,7 +2,9 @@ - DEPRECATED: Use the license identifier LGPL-2.1-or-later + + LGPL-2.1-or-later + http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html http://www.opensource.org/licenses/LGPL-2.1 diff --git a/src/LGPL-2.1.xml b/src/LGPL-2.1.xml index dc416c383..62b9c5b90 100644 --- a/src/LGPL-2.1.xml +++ b/src/LGPL-2.1.xml @@ -3,14 +3,14 @@ + + LGPL-2.1-only + LGPL-2.1-or-later + http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html http://www.opensource.org/licenses/LGPL-2.1 - - DEPRECATED: Deprecated in lieu of more - explicit license identifier of LGPL-2.1-only - Copyright (C) year name of author

diff --git a/src/LGPL-3.0+.xml b/src/LGPL-3.0+.xml index e736838b3..a0f94b472 100644 --- a/src/LGPL-3.0+.xml +++ b/src/LGPL-3.0+.xml @@ -2,7 +2,9 @@ - DEPRECATED: Use the license identifier LGPL-3.0-or-later + + LGPL-3.0-or-later + http://www.gnu.org/licenses/lgpl-3.0-standalone.html http://www.opensource.org/licenses/LGPL-3.0 diff --git a/src/LGPL-3.0.xml b/src/LGPL-3.0.xml index 6b2ad1705..cdf7edf24 100644 --- a/src/LGPL-3.0.xml +++ b/src/LGPL-3.0.xml @@ -3,14 +3,14 @@ + + LGPL-3.0-only + LGPL-3.0-or-later + http://www.gnu.org/licenses/lgpl-3.0-standalone.html http://www.opensource.org/licenses/LGPL-3.0 - - DEPRECATED: Deprecated in lieu of more - explicit license identifier of LGPL-3.0-only -

diff --git a/src/Nunit.xml b/src/Nunit.xml index dab3ee072..e6a81cfe6 100644 --- a/src/Nunit.xml +++ b/src/Nunit.xml @@ -1,10 +1,12 @@ + + zlib-acknowledgement + https://fedoraproject.org/wiki/Licensing/Nunit - DEPRECATED: This license was added twice by accident. Use short identifier: zlib-acknowledgement

Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov, Charlie Poole diff --git a/src/StandardML-NJ.xml b/src/StandardML-NJ.xml index ba556230f..524318055 100644 --- a/src/StandardML-NJ.xml +++ b/src/StandardML-NJ.xml @@ -2,7 +2,9 @@ - DEPRECATED: This license was added twice (as of v1.17 and then in v1.20) by accident. Use short identifier: SMLNJ + + SMLNJ + http://www.smlnj.org//license.html diff --git a/src/eCos-2.0.xml b/src/eCos-2.0.xml index 921049f6a..2b175841e 100644 --- a/src/eCos-2.0.xml +++ b/src/eCos-2.0.xml @@ -1,10 +1,12 @@ + + GPL-2.0-or-later WITH eCos-exception-2.0 + http://www.gnu.org/licenses/ecos-license.html - DEPRECATED: This is really GPL-2.0 or later with an exception. Use License Expression Syntax and Exceptions list to create equivalent license. The eCos license version 2.0 diff --git a/src/wxWindows.xml b/src/wxWindows.xml index 5fb7f110e..ab1f217bf 100644 --- a/src/wxWindows.xml +++ b/src/wxWindows.xml @@ -1,13 +1,12 @@ + + GPL-2.0-or-later WITH WxWindows-exception-3.1 + http://www.opensource.org/licenses/WXwindows - -

DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.

-

Typically used with GPL-2.0+.

-

EXCEPTION NOTICE