diff --git a/src/AGPL-1.0.xml b/src/AGPL-1.0.xml index 32aa2a6437..437cc49def 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 8dc0a72c65..5aef006d69 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 8e9a282eb2..a54b7fc681 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 1c86619e90..05e7e63691 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 3c1d10a9f8..7743fde73f 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 71a6134f1f..7b349566fd 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 e00c472e45..13ab181daf 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 c53b9ccb15..0a2fbd61d2 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 9cca822346..d2dcbc07c1 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 82a242f4b9..497beb93be 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 3b514903c0..9bf7c1a656 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 35624e85b1..b94563dbd0 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 c9279eb236..72c32529c1 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 954beda0cc..e3960893f1 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 29374c3875..f6e27a144c 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 673f4eba3b..1166f04cb1 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 fcd8e5fefd..46741293e1 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 c33e1e9ce4..7cce22c9b7 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 c662a1b188..84c5ba0775 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 d17093cdaa..ee92c2cee4 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 ca6df532a5..f2ad46ccc3 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 dc416c3832..0b0f8f794d 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 e736838b3b..10ad92a685 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 6b2ad17055..852876f69a 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 dab3ee072d..5afd60acbc 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 ba556230f4..21dda913a3 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 921049f6ad..aa0d7e9c9e 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 5fb7f110e4..359a1935dd 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