diff --git a/src/AGPL-3.0.xml b/src/AGPL-3.0.xml index c492c2f89c..d12cbbbaa5 100644 --- a/src/AGPL-3.0.xml +++ b/src/AGPL-3.0.xml @@ -7,10 +7,8 @@ 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 - + AGPL-3.0-only + AGPL-3.0-or-later 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 146246dee0..5f9082afe0 100644 --- a/src/GFDL-1.1.xml +++ b/src/GFDL-1.1.xml @@ -6,10 +6,8 @@ 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 - + GFDL-1.1-only + GFDL-1.1-or-later 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 4a6a4df828..0c734ceb40 100644 --- a/src/GFDL-1.2.xml +++ b/src/GFDL-1.2.xml @@ -6,10 +6,8 @@ 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 - + GFDL-1.2-only + GFDL-1.2-or-later 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 11dd61343b..5d1144ac5b 100644 --- a/src/GFDL-1.3.xml +++ b/src/GFDL-1.3.xml @@ -6,10 +6,8 @@ http://www.gnu.org/licenses/fdl-1.3.txt - - DEPRECATED: Deprecated in lieu of more - explicit license identifier of GFDL-1.3-only - + GFDL-1.3-only + GFDL-1.3-or-later 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 6c5550de38..a533ff27ab 100644 --- a/src/GPL-1.0+.xml +++ b/src/GPL-1.0+.xml @@ -5,7 +5,7 @@ http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html - DEPRECATED: Use GPL-1.0-or-later + GPL-1.0-or-later Copyright (C) 19xx name of author

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.

diff --git a/src/GPL-1.0.xml b/src/GPL-1.0.xml index 87c57dfaad..b194cbb98f 100644 --- a/src/GPL-1.0.xml +++ b/src/GPL-1.0.xml @@ -6,10 +6,8 @@ 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 - + GPL-1.0-only + GPL-1.0-or-later Copyright (C)19xx name of author

diff --git a/src/GPL-2.0+.xml b/src/GPL-2.0+.xml index 2a09721a4c..ecc8092523 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 78aa663e5f..3481d0f687 100644 --- a/src/GPL-2.0-with-GCC-exception.xml +++ b/src/GPL-2.0-with-GCC-exception.xml @@ -5,7 +5,8 @@ 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. + GPL-2.0 WITH GCC-exception-2.0 + GPL-2.0-or-later WITH GCC-exception-2.0

insert GPL v2 license text here

GCC Linking Exception

diff --git a/src/GPL-2.0-with-autoconf-exception.xml b/src/GPL-2.0-with-autoconf-exception.xml index 0086434b72..a79901b3fe 100644 --- a/src/GPL-2.0-with-autoconf-exception.xml +++ b/src/GPL-2.0-with-autoconf-exception.xml @@ -5,7 +5,8 @@ http://ac-archive.sourceforge.net/doc/copyright.html - DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license. + GPL-2.0 WITH Autoconf-exception-2.0 + GPL-2.0-or-later WITH Autoconf-exception-2.0

insert GPL v2 license text here

Autoconf Exception

diff --git a/src/GPL-2.0-with-bison-exception.xml b/src/GPL-2.0-with-bison-exception.xml index fa65c86d88..1f9b36ad62 100644 --- a/src/GPL-2.0-with-bison-exception.xml +++ b/src/GPL-2.0-with-bison-exception.xml @@ -5,7 +5,8 @@ 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. + GPL-2.0 WITH Bison-exception-2.2 + GPL-2.0-or-later WITH Bison-exception-2.2 Bison Exception

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.

diff --git a/src/GPL-2.0-with-classpath-exception.xml b/src/GPL-2.0-with-classpath-exception.xml index 72b7265fdf..175b2f9af5 100644 --- a/src/GPL-2.0-with-classpath-exception.xml +++ b/src/GPL-2.0-with-classpath-exception.xml @@ -5,7 +5,8 @@ http://www.gnu.org/software/classpath/license.html - DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license. + GPL-2.0 WITH Classpath-exception-2.0 + GPL-2.0-or-later WITH Classpath-exception-2.0

insert GPL v2 license text here

Class Path Exception

diff --git a/src/GPL-2.0-with-font-exception.xml b/src/GPL-2.0-with-font-exception.xml index 94939e2472..074f113eff 100644 --- a/src/GPL-2.0-with-font-exception.xml +++ b/src/GPL-2.0-with-font-exception.xml @@ -5,7 +5,8 @@ http://www.gnu.org/licenses/gpl-faq.html#FontException - DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license. + GPL-2.0 WITH Font-exception-2.0 + GPL-2.0-or-later+ WITH Font-exception-2.0

insert GPL v2 license text here

Font Exception

diff --git a/src/GPL-2.0.xml b/src/GPL-2.0.xml index e8709d956a..fd07bf2729 100644 --- a/src/GPL-2.0.xml +++ b/src/GPL-2.0.xml @@ -7,10 +7,8 @@ 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 - + GPL-2.0-only + GPL-2.0-or-later Copyright (C)yyyy name of author

diff --git a/src/GPL-3.0+.xml b/src/GPL-3.0+.xml index bdb936b3fa..72f7113289 100644 --- a/src/GPL-3.0+.xml +++ b/src/GPL-3.0+.xml @@ -6,7 +6,7 @@ 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 + GPL-3.0-or-later Copyright (C) <year> <name of author>

diff --git a/src/GPL-3.0-with-GCC-exception.xml b/src/GPL-3.0-with-GCC-exception.xml index 86c2d11ba8..c0667ff7d3 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 6eecd39e8c..c9829bec73 100644 --- a/src/GPL-3.0-with-autoconf-exception.xml +++ b/src/GPL-3.0-with-autoconf-exception.xml @@ -5,7 +5,8 @@ http://www.gnu.org/licenses/autoconf-exception-3.0.html - DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license. + GPL-3.0 WITH Autoconf-exception-3.0 + GPL-3.0-or-later WITH Autoconf-exception-3.0

insert GPL v3 text here

AUTOCONF CONFIGURE SCRIPT EXCEPTION

diff --git a/src/GPL-3.0.xml b/src/GPL-3.0.xml index 9166d148a4..934b84bfd7 100644 --- a/src/GPL-3.0.xml +++ b/src/GPL-3.0.xml @@ -7,10 +7,8 @@ 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 - + GPL-3.0-only + GPL-3.0-or-later Copyright (C)<year> <name of author> diff --git a/src/LGPL-2.0+.xml b/src/LGPL-2.0+.xml index 9f13905de0..9cd239db12 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 d44f3c1624..b50d64c87c 100644 --- a/src/LGPL-2.0.xml +++ b/src/LGPL-2.0.xml @@ -6,10 +6,8 @@ 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 - + LGPL-2.0-only + LGPL-2.0-or-later 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 409be43c80..4bdec76e15 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 a13ab74d0e..ea3e9ace47 100644 --- a/src/LGPL-2.1.xml +++ b/src/LGPL-2.1.xml @@ -7,10 +7,8 @@ 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 - + LGPL-2.1-only + LGPL-2.1-or-later Copyright (C)year name of author

diff --git a/src/LGPL-3.0+.xml b/src/LGPL-3.0+.xml index 4b91daa74d..c461b62436 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 5b8285693e..da0bd5adac 100644 --- a/src/LGPL-3.0.xml +++ b/src/LGPL-3.0.xml @@ -7,10 +7,8 @@ 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 - + LGPL-3.0-only + LGPL-3.0-or-later

GNU LESSER GENERAL PUBLIC LICENSE

diff --git a/src/Nunit.xml b/src/Nunit.xml index 8c94feb850..219658fac9 100644 --- a/src/Nunit.xml +++ b/src/Nunit.xml @@ -4,7 +4,7 @@ https://fedoraproject.org/wiki/Licensing/Nunit - DEPRECATED: This license was added twice by accident. Use short identifier: zlib-acknowledgement + zlib-acknowledgement

Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov, Charlie Poole
Copyright © 2000-2004 Philip A. Craig diff --git a/src/StandardML-NJ.xml b/src/StandardML-NJ.xml index 2794c2600a..45a9721b17 100644 --- a/src/StandardML-NJ.xml +++ b/src/StandardML-NJ.xml @@ -2,10 +2,10 @@ - DEPRECATED: This license was added twice (as of v1.17 and then in v1.20) by accident. Use short identifier: SMLNJ http://www.smlnj.org//license.html + SMLNJ

STANDARD ML OF NEW JERSEY COPYRIGHT NOTICE, LICENSE AND DISCLAIMER.

diff --git a/src/eCos-2.0.xml b/src/eCos-2.0.xml index ff69f95270..0d5380dac6 100644 --- a/src/eCos-2.0.xml +++ b/src/eCos-2.0.xml @@ -4,7 +4,7 @@ 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. + GPL-2.0-or-later WITH eCos-exception-2.0 The eCos license version 2.0

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

diff --git a/src/wxWindows.xml b/src/wxWindows.xml index efd05d00d8..5c5ce8c162 100644 --- a/src/wxWindows.xml +++ b/src/wxWindows.xml @@ -4,10 +4,7 @@ http://www.opensource.org/licenses/WXwindows - -

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

-

Typically used with GPL-2.0+.

- + GPL-2.0-or-later WITH WxWindows-exception-3.1

EXCEPTION NOTICE