From e7135fbdd0e48891460b7d3cd463d5bd54593aef Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 12 Jan 2018 10:59:32 -0800 Subject: [PATCH 1/3] schema/ListedLicense: Add obsoletedBy to licenses and exceptions From [1]: As a result, a number of licenses formerly included in the SPDX License List have been deprecated as licenses, and correct usage employs the License Expression Syntax as of v2.0. So the sole reason for the deprecations seems to be "there's a better way to say that now". Telling people "use an expression instead" is less useful than saying "use this expression instead: $SOME_EXPRESSION". This commit updates the schema to allow us to recommend replacements. The recommended consumer algorithm is documented in the schema annotation. The maxOccurs="unbounded" value shows up in an XSD 1.1 spec example [2], and both minOccurs and maxOccurs must be set explicitly for obsoletedBy to override the defaults (1 for both attributes [3]). The presence of an obsoletedBy element is sufficient to mark a license/expression obsolete (as is the presence of an deprecatedVersion attribute), so I'm in favor of dropping isDeprecated to stay DRY. However, removing isDeprecated (from this repository, we would still supply it in license-list-data) has proven contentious for reasons I don't understand. This commit punts on the removal for now [4]. [1]: https://github.com/spdx/license-list-XML/pull/392#issuecomment-357314284 [2]: https://www.w3.org/TR/xmlschema11-1/#all-mg [3]: https://www.w3.org/TR/xmlschema11-1/#declare-element [4]: https://github.com/spdx/license-list-XML/pull/392#issuecomment-357314284 --- schema/ListedLicense.xsd | 53 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/schema/ListedLicense.xsd b/schema/ListedLicense.xsd index a9e682c06..5e5e74319 100644 --- a/schema/ListedLicense.xsd +++ b/schema/ListedLicense.xsd @@ -42,6 +42,7 @@ + @@ -61,6 +62,7 @@ + @@ -165,6 +167,57 @@ + + + + + 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. + + + + + From a5ef633fb6b69711917bdf03daeae31e7dd89746 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Mon, 20 Feb 2017 15:56:11 -0800 Subject: [PATCH 2/3] *: Add obsoletedBy to obsolete licenses Taking advantage of the schema change from the previous commit. --- src/AGPL-1.0.xml | 2 ++ src/AGPL-3.0.xml | 6 ++---- src/GFDL-1.1.xml | 6 ++---- src/GFDL-1.2.xml | 6 ++---- src/GFDL-1.3.xml | 6 ++---- src/GPL-1.0+.xml | 2 +- src/GPL-1.0.xml | 6 ++---- src/GPL-2.0+.xml | 2 +- src/GPL-2.0-with-GCC-exception.xml | 3 ++- src/GPL-2.0-with-autoconf-exception.xml | 3 ++- src/GPL-2.0-with-bison-exception.xml | 3 ++- src/GPL-2.0-with-classpath-exception.xml | 3 ++- src/GPL-2.0-with-font-exception.xml | 3 ++- src/GPL-2.0.xml | 6 ++---- src/GPL-3.0+.xml | 2 +- src/GPL-3.0-with-GCC-exception.xml | 3 ++- src/GPL-3.0-with-autoconf-exception.xml | 3 ++- src/GPL-3.0.xml | 6 ++---- src/LGPL-2.0+.xml | 2 +- src/LGPL-2.0.xml | 6 ++---- src/LGPL-2.1+.xml | 2 +- src/LGPL-2.1.xml | 6 ++---- src/LGPL-3.0+.xml | 2 +- src/LGPL-3.0.xml | 6 ++---- src/Nunit.xml | 2 +- src/StandardML-NJ.xml | 2 +- src/eCos-2.0.xml | 2 +- src/wxWindows.xml | 5 +---- 28 files changed, 46 insertions(+), 60 deletions(-) diff --git a/src/AGPL-1.0.xml b/src/AGPL-1.0.xml index 32aa2a643..437cc49de 100644 --- a/src/AGPL-1.0.xml +++ b/src/AGPL-1.0.xml @@ -3,6 +3,8 @@ + 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..5aef006d6 100644 --- a/src/AGPL-3.0.xml +++ b/src/AGPL-3.0.xml @@ -3,14 +3,12 @@ + 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..a54b7fc68 100644 --- a/src/GFDL-1.1.xml +++ b/src/GFDL-1.1.xml @@ -3,13 +3,11 @@ + 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..05e7e6369 100644 --- a/src/GFDL-1.2.xml +++ b/src/GFDL-1.2.xml @@ -3,13 +3,11 @@ + 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..7743fde73 100644 --- a/src/GFDL-1.3.xml +++ b/src/GFDL-1.3.xml @@ -3,13 +3,11 @@ + 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..7b349566f 100644 --- a/src/GPL-1.0+.xml +++ b/src/GPL-1.0+.xml @@ -2,10 +2,10 @@ + 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..13ab181da 100644 --- a/src/GPL-1.0.xml +++ b/src/GPL-1.0.xml @@ -3,13 +3,11 @@ + 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..0a2fbd61d 100644 --- a/src/GPL-2.0+.xml +++ b/src/GPL-2.0+.xml @@ -2,7 +2,7 @@ - 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..d2dcbc07c 100644 --- a/src/GPL-2.0-with-GCC-exception.xml +++ b/src/GPL-2.0-with-GCC-exception.xml @@ -2,10 +2,11 @@ + 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..497beb93b 100644 --- a/src/GPL-2.0-with-autoconf-exception.xml +++ b/src/GPL-2.0-with-autoconf-exception.xml @@ -2,10 +2,11 @@ + 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..9bf7c1a65 100644 --- a/src/GPL-2.0-with-bison-exception.xml +++ b/src/GPL-2.0-with-bison-exception.xml @@ -2,10 +2,11 @@ + 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..b94563dbd 100644 --- a/src/GPL-2.0-with-classpath-exception.xml +++ b/src/GPL-2.0-with-classpath-exception.xml @@ -2,10 +2,11 @@ + 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..72c32529c 100644 --- a/src/GPL-2.0-with-font-exception.xml +++ b/src/GPL-2.0-with-font-exception.xml @@ -2,10 +2,11 @@ + 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..e2bafdba6 100644 --- a/src/GPL-2.0.xml +++ b/src/GPL-2.0.xml @@ -3,14 +3,12 @@ + 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..f6e27a144 100644 --- a/src/GPL-3.0+.xml +++ b/src/GPL-3.0+.xml @@ -2,11 +2,11 @@ + 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..1166f04cb 100644 --- a/src/GPL-3.0-with-GCC-exception.xml +++ b/src/GPL-3.0-with-GCC-exception.xml @@ -2,7 +2,8 @@ - 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..46741293e 100644 --- a/src/GPL-3.0-with-autoconf-exception.xml +++ b/src/GPL-3.0-with-autoconf-exception.xml @@ -2,10 +2,11 @@ + 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..7cce22c9b 100644 --- a/src/GPL-3.0.xml +++ b/src/GPL-3.0.xml @@ -3,14 +3,12 @@ + 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..84c5ba077 100644 --- a/src/LGPL-2.0+.xml +++ b/src/LGPL-2.0+.xml @@ -2,7 +2,7 @@ - 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..ee92c2cee 100644 --- a/src/LGPL-2.0.xml +++ b/src/LGPL-2.0.xml @@ -3,13 +3,11 @@ + 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..f2ad46ccc 100644 --- a/src/LGPL-2.1+.xml +++ b/src/LGPL-2.1+.xml @@ -2,7 +2,7 @@ - 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..0b0f8f794 100644 --- a/src/LGPL-2.1.xml +++ b/src/LGPL-2.1.xml @@ -3,14 +3,12 @@ + 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..10ad92a68 100644 --- a/src/LGPL-3.0+.xml +++ b/src/LGPL-3.0+.xml @@ -2,7 +2,7 @@ - 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..852876f69 100644 --- a/src/LGPL-3.0.xml +++ b/src/LGPL-3.0.xml @@ -3,14 +3,12 @@ + 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..5afd60acb 100644 --- a/src/Nunit.xml +++ b/src/Nunit.xml @@ -1,10 +1,10 @@ + 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..21dda913a 100644 --- a/src/StandardML-NJ.xml +++ b/src/StandardML-NJ.xml @@ -2,7 +2,7 @@ - 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..aa0d7e9c9 100644 --- a/src/eCos-2.0.xml +++ b/src/eCos-2.0.xml @@ -1,10 +1,10 @@ + 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..359a1935d 100644 --- a/src/wxWindows.xml +++ b/src/wxWindows.xml @@ -1,13 +1,10 @@ + 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

From a6df41017f76ee31e180b168bec2eee1e51017c0 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 23 Mar 2018 21:24:44 -0700 Subject: [PATCH 3/3] *: Add wrapping The Node tests were choking with: Entity: line 65: element element: Schemas parser error : Element '{http://www.w3.org/2001/XMLSchema}element': Invalid value for maxOccurs (must be 0 or 1). which is mentioned in [1]. Despite unbounded being in the 1.0 spec, maxOccurs was restricted to 1 inside in XSD 1.0. The restriction was lifted in 1.1 [2]. The backing libxml issue is [3]. This commit works around the limitation by adding a wrapping to mirror our existing wrapping . In both cases, the wrapper adds no useful semantics, but we need it to get the tests passing until we can find an XSD 1.1 validator. [1]: https://github.com/albanm/node-libxml-xsd/issues/12 [2]: https://www.w3.org/TR/xmlschema11-1/#ch_models [3]: https://bugzilla.gnome.org/show_bug.cgi?id=765936 --- schema/ListedLicense.xsd | 16 ++++++++++++++-- src/AGPL-1.0.xml | 6 ++++-- src/AGPL-3.0.xml | 6 ++++-- src/GFDL-1.1.xml | 6 ++++-- src/GFDL-1.2.xml | 6 ++++-- src/GFDL-1.3.xml | 6 ++++-- src/GPL-1.0+.xml | 4 +++- src/GPL-1.0.xml | 6 ++++-- src/GPL-2.0+.xml | 4 +++- src/GPL-2.0-with-GCC-exception.xml | 6 ++++-- src/GPL-2.0-with-autoconf-exception.xml | 6 ++++-- src/GPL-2.0-with-bison-exception.xml | 6 ++++-- src/GPL-2.0-with-classpath-exception.xml | 6 ++++-- src/GPL-2.0-with-font-exception.xml | 6 ++++-- src/GPL-2.0.xml | 6 ++++-- src/GPL-3.0+.xml | 4 +++- src/GPL-3.0-with-GCC-exception.xml | 6 ++++-- src/GPL-3.0-with-autoconf-exception.xml | 6 ++++-- src/GPL-3.0.xml | 6 ++++-- src/LGPL-2.0+.xml | 4 +++- src/LGPL-2.0.xml | 6 ++++-- src/LGPL-2.1+.xml | 4 +++- src/LGPL-2.1.xml | 6 ++++-- src/LGPL-3.0+.xml | 4 +++- src/LGPL-3.0.xml | 6 ++++-- src/Nunit.xml | 4 +++- src/StandardML-NJ.xml | 4 +++- src/eCos-2.0.xml | 4 +++- src/wxWindows.xml | 4 +++- 29 files changed, 116 insertions(+), 48 deletions(-) diff --git a/schema/ListedLicense.xsd b/schema/ListedLicense.xsd index 5e5e74319..818a8aa54 100644 --- a/schema/ListedLicense.xsd +++ b/schema/ListedLicense.xsd @@ -42,7 +42,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -167,6 +167,18 @@ + + + + + obsoletedBysType is a wrapper for a set of obsoletedBy entries. + + + + + + + diff --git a/src/AGPL-1.0.xml b/src/AGPL-1.0.xml index 437cc49de..6efe21bd1 100644 --- a/src/AGPL-1.0.xml +++ b/src/AGPL-1.0.xml @@ -3,8 +3,10 @@ - AGPL-1.0-only - AGPL-1.0-or-later + + 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 5aef006d6..5aa72543a 100644 --- a/src/AGPL-3.0.xml +++ b/src/AGPL-3.0.xml @@ -3,8 +3,10 @@ - AGPL-3.0-only - AGPL-3.0-or-later + + AGPL-3.0-only + AGPL-3.0-or-later + http://www.gnu.org/licenses/agpl.txt http://www.opensource.org/licenses/AGPL-3.0 diff --git a/src/GFDL-1.1.xml b/src/GFDL-1.1.xml index a54b7fc68..cfdce5424 100644 --- a/src/GFDL-1.1.xml +++ b/src/GFDL-1.1.xml @@ -3,8 +3,10 @@ - GFDL-1.1-only - GFDL-1.1-or-later + + GFDL-1.1-only + GFDL-1.1-or-later + http://www.gnu.org/licenses/old-licenses/fdl-1.1.txt diff --git a/src/GFDL-1.2.xml b/src/GFDL-1.2.xml index 05e7e6369..76c275567 100644 --- a/src/GFDL-1.2.xml +++ b/src/GFDL-1.2.xml @@ -3,8 +3,10 @@ - GFDL-1.2-only - GFDL-1.2-or-later + + GFDL-1.2-only + GFDL-1.2-or-later + http://www.gnu.org/licenses/old-licenses/fdl-1.2.txt diff --git a/src/GFDL-1.3.xml b/src/GFDL-1.3.xml index 7743fde73..c91f58c0e 100644 --- a/src/GFDL-1.3.xml +++ b/src/GFDL-1.3.xml @@ -3,8 +3,10 @@ - GFDL-1.3-only - GFDL-1.3-or-later + + GFDL-1.3-only + GFDL-1.3-or-later + http://www.gnu.org/licenses/fdl-1.3.txt diff --git a/src/GPL-1.0+.xml b/src/GPL-1.0+.xml index 7b349566f..5a3c107d3 100644 --- a/src/GPL-1.0+.xml +++ b/src/GPL-1.0+.xml @@ -2,7 +2,9 @@ - GPL-1.0-or-later + + GPL-1.0-or-later + http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html diff --git a/src/GPL-1.0.xml b/src/GPL-1.0.xml index 13ab181da..f887119f5 100644 --- a/src/GPL-1.0.xml +++ b/src/GPL-1.0.xml @@ -3,8 +3,10 @@ - GPL-1.0-only - GPL-1.0-or-later + + GPL-1.0-only + GPL-1.0-or-later + http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html diff --git a/src/GPL-2.0+.xml b/src/GPL-2.0+.xml index 0a2fbd61d..76e819593 100644 --- a/src/GPL-2.0+.xml +++ b/src/GPL-2.0+.xml @@ -2,7 +2,9 @@ - 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 d2dcbc07c..b860ef5fc 100644 --- a/src/GPL-2.0-with-GCC-exception.xml +++ b/src/GPL-2.0-with-GCC-exception.xml @@ -2,8 +2,10 @@ - GPL-2.0 WITH GCC-exception-2.0 - GPL-2.0-or-later WITH GCC-exception-2.0 + + 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 diff --git a/src/GPL-2.0-with-autoconf-exception.xml b/src/GPL-2.0-with-autoconf-exception.xml index 497beb93b..7497801aa 100644 --- a/src/GPL-2.0-with-autoconf-exception.xml +++ b/src/GPL-2.0-with-autoconf-exception.xml @@ -2,8 +2,10 @@ - GPL-2.0 WITH Autoconf-exception-2.0 - GPL-2.0-or-later WITH Autoconf-exception-2.0 + + 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 diff --git a/src/GPL-2.0-with-bison-exception.xml b/src/GPL-2.0-with-bison-exception.xml index 9bf7c1a65..ce9ffb97a 100644 --- a/src/GPL-2.0-with-bison-exception.xml +++ b/src/GPL-2.0-with-bison-exception.xml @@ -2,8 +2,10 @@ - GPL-2.0 WITH Bison-exception-2.2 - GPL-2.0-or-later WITH Bison-exception-2.2 + + 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 diff --git a/src/GPL-2.0-with-classpath-exception.xml b/src/GPL-2.0-with-classpath-exception.xml index b94563dbd..074fa7988 100644 --- a/src/GPL-2.0-with-classpath-exception.xml +++ b/src/GPL-2.0-with-classpath-exception.xml @@ -2,8 +2,10 @@ - GPL-2.0 WITH Classpath-exception-2.0 - GPL-2.0-or-later WITH Classpath-exception-2.0 + + 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 diff --git a/src/GPL-2.0-with-font-exception.xml b/src/GPL-2.0-with-font-exception.xml index 72c32529c..0d4fee5e1 100644 --- a/src/GPL-2.0-with-font-exception.xml +++ b/src/GPL-2.0-with-font-exception.xml @@ -2,8 +2,10 @@ - GPL-2.0 WITH Font-exception-2.0 - GPL-2.0-or-later+ WITH Font-exception-2.0 + + 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 diff --git a/src/GPL-2.0.xml b/src/GPL-2.0.xml index e2bafdba6..94745ad11 100644 --- a/src/GPL-2.0.xml +++ b/src/GPL-2.0.xml @@ -3,8 +3,10 @@ - GPL-2.0-only - GPL-2.0-or-later + + 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 diff --git a/src/GPL-3.0+.xml b/src/GPL-3.0+.xml index f6e27a144..fe47a08bc 100644 --- a/src/GPL-3.0+.xml +++ b/src/GPL-3.0+.xml @@ -2,7 +2,9 @@ - GPL-3.0-or-later + + GPL-3.0-or-later + http://www.gnu.org/licenses/gpl-3.0-standalone.html http://www.opensource.org/licenses/GPL-3.0 diff --git a/src/GPL-3.0-with-GCC-exception.xml b/src/GPL-3.0-with-GCC-exception.xml index 1166f04cb..d6fc3c290 100644 --- a/src/GPL-3.0-with-GCC-exception.xml +++ b/src/GPL-3.0-with-GCC-exception.xml @@ -2,8 +2,10 @@ - GPL-3.0 WITH GCC-exception-3.1 - GPL-3.0-or-later WITH GCC-exception-3.1 + + 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 46741293e..508689b38 100644 --- a/src/GPL-3.0-with-autoconf-exception.xml +++ b/src/GPL-3.0-with-autoconf-exception.xml @@ -2,8 +2,10 @@ - GPL-3.0 WITH Autoconf-exception-3.0 - GPL-3.0-or-later WITH Autoconf-exception-3.0 + + 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 diff --git a/src/GPL-3.0.xml b/src/GPL-3.0.xml index 7cce22c9b..b0576f3ac 100644 --- a/src/GPL-3.0.xml +++ b/src/GPL-3.0.xml @@ -3,8 +3,10 @@ - GPL-3.0-only - GPL-3.0-or-later + + 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 diff --git a/src/LGPL-2.0+.xml b/src/LGPL-2.0+.xml index 84c5ba077..70e67b7ec 100644 --- a/src/LGPL-2.0+.xml +++ b/src/LGPL-2.0+.xml @@ -2,7 +2,9 @@ - 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 ee92c2cee..54239578f 100644 --- a/src/LGPL-2.0.xml +++ b/src/LGPL-2.0.xml @@ -3,8 +3,10 @@ - LGPL-2.0-only - LGPL-2.0-or-later + + LGPL-2.0-only + LGPL-2.0-or-later + http://www.gnu.org/licenses/old-licenses/lgpl-2.0-standalone.html diff --git a/src/LGPL-2.1+.xml b/src/LGPL-2.1+.xml index f2ad46ccc..2b0db77ab 100644 --- a/src/LGPL-2.1+.xml +++ b/src/LGPL-2.1+.xml @@ -2,7 +2,9 @@ - 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 0b0f8f794..62b9c5b90 100644 --- a/src/LGPL-2.1.xml +++ b/src/LGPL-2.1.xml @@ -3,8 +3,10 @@ - LGPL-2.1-only - LGPL-2.1-or-later + + 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 diff --git a/src/LGPL-3.0+.xml b/src/LGPL-3.0+.xml index 10ad92a68..a0f94b472 100644 --- a/src/LGPL-3.0+.xml +++ b/src/LGPL-3.0+.xml @@ -2,7 +2,9 @@ - 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 852876f69..cdf7edf24 100644 --- a/src/LGPL-3.0.xml +++ b/src/LGPL-3.0.xml @@ -3,8 +3,10 @@ - LGPL-3.0-only - LGPL-3.0-or-later + + 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 diff --git a/src/Nunit.xml b/src/Nunit.xml index 5afd60acb..e6a81cfe6 100644 --- a/src/Nunit.xml +++ b/src/Nunit.xml @@ -1,7 +1,9 @@ - zlib-acknowledgement + + zlib-acknowledgement + https://fedoraproject.org/wiki/Licensing/Nunit diff --git a/src/StandardML-NJ.xml b/src/StandardML-NJ.xml index 21dda913a..524318055 100644 --- a/src/StandardML-NJ.xml +++ b/src/StandardML-NJ.xml @@ -2,7 +2,9 @@ - SMLNJ + + SMLNJ + http://www.smlnj.org//license.html diff --git a/src/eCos-2.0.xml b/src/eCos-2.0.xml index aa0d7e9c9..2b175841e 100644 --- a/src/eCos-2.0.xml +++ b/src/eCos-2.0.xml @@ -1,7 +1,9 @@ - GPL-2.0-or-later WITH eCos-exception-2.0 + + GPL-2.0-or-later WITH eCos-exception-2.0 + http://www.gnu.org/licenses/ecos-license.html diff --git a/src/wxWindows.xml b/src/wxWindows.xml index 359a1935d..ab1f217bf 100644 --- a/src/wxWindows.xml +++ b/src/wxWindows.xml @@ -1,7 +1,9 @@ - GPL-2.0-or-later WITH WxWindows-exception-3.1 + + GPL-2.0-or-later WITH WxWindows-exception-3.1 + http://www.opensource.org/licenses/WXwindows