From 390fc63192e1e0808797ae0ab5f0020a65f1d178 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Mon, 20 Feb 2017 15:56:11 -0800 Subject: [PATCH] *: Add obsoletedBy to obsolete licenses Taking advantage of the schema change from the previous commit. --- 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 +---- 27 files changed, 44 insertions(+), 60 deletions(-) diff --git a/src/AGPL-3.0.xml b/src/AGPL-3.0.xml index c492c2f89c..f3c5bd5b70 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 146246dee0..538e73ef9a 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 4a6a4df828..ddc06f21d4 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 11dd61343b..95025f368d 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 6c5550de38..1a0d00ce27 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 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..0d8c79e7bd 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 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..e22a30f692 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

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..69e2aeb00e 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

Autoconf Exception

diff --git a/src/GPL-2.0-with-bison-exception.xml b/src/GPL-2.0-with-bison-exception.xml index fa65c86d88..6995ef2fe7 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

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..c43de866aa 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

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..b7e923e164 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

Font Exception

diff --git a/src/GPL-2.0.xml b/src/GPL-2.0.xml index e8709d956a..2f1c63074d 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 bdb936b3fa..64ea91187a 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 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..e383b2a33f 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

AUTOCONF CONFIGURE SCRIPT EXCEPTION

diff --git a/src/GPL-3.0.xml b/src/GPL-3.0.xml index 9166d148a4..dac296738d 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 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..c0a87f65ed 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 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..e8ef39717f 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 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..4a1030b406 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 -

GNU LESSER GENERAL PUBLIC LICENSE

diff --git a/src/Nunit.xml b/src/Nunit.xml index 8c94feb850..c95b2ca03a 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
Copyright © 2000-2004 Philip A. Craig diff --git a/src/StandardML-NJ.xml b/src/StandardML-NJ.xml index 2794c2600a..229a2078e5 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 ff69f95270..f5c7e7d182 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

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..dd191494eb 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