From 46edc2d4ec32b0354ee1e5fe962d4e8602fd3cb1 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 13 Apr 2018 07:28:11 -0700
Subject: [PATCH] pull: Add deprecated SPDX identifiers

These identifiers are deprecated, but they haven't yet been dropped
from the SPDX spec.  That means that, although they're not
recommended, they're still valid identifiers to use where you can use
other License List 3.0 identifiers.  Listing them here makes it easy
for folks using the deprecated identifiers to look up the associated
FSF metadata.

An alternative approach would be to stick with only non-deprecated
SPDX identifiers here and have users hit the SPDX API to resolve those
before coming to this API.  But the SPDX API does not currently expose
obsoletedBy migration recommendations [1].

[1]: https://github.com/spdx/LicenseListPublisher/issues/12
---
 pull.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pull.py b/pull.py
index 0baab43..c4da6a2 100755
--- a/pull.py
+++ b/pull.py
@@ -135,7 +135,7 @@
     'Condor': {'spdx': ['Condor-1.1']},
     'ECL2.0': {'spdx': ['ECL-2.0']},
     'eCos11': {'spdx': ['RHeCos-1.1']},
-    'eCos2.0': {'spdx': ['GPL-2.0+ WITH eCos-exception-2.0']},
+    'eCos2.0': {'spdx': ['GPL-2.0+ WITH eCos-exception-2.0', 'eCos-2.0']},
     'EPL': {'spdx': ['EPL-1.0']},
     'EPL2': {'spdx': ['EPL-2.0']}, # not in license-list-XML yet
     'EUDataGrid': {'spdx': ['EUDatagrid']},
@@ -148,9 +148,9 @@
     'FreeBSD': {'spdx': ['BSD-2-Clause-FreeBSD']},
     'freetype': {'spdx': ['FTL']},
     'GNUAllPermissive': {'spdx': ['FSFAP']},
-    'GNUGPLv3': {'spdx': ['GPL-3.0-or-later', 'GPL-3.0-only', 'GPL-3.0']},
+    'GNUGPLv3': {'spdx': ['GPL-3.0-or-later', 'GPL-3.0-only', 'GPL-3.0', 'GPL-3.0+']},
     'gnuplot': {'spdx': ['gnuplot']},
-    'GPLv2': {'spdx': ['GPL-2.0-or-later', 'GPL-2.0-only', 'GPL-2.0']},
+    'GPLv2': {'spdx': ['GPL-2.0-or-later', 'GPL-2.0-only', 'GPL-2.0', 'GPL-2.0+']},
     'HPND': {'spdx': ['HPND']},
     'IBMPL': {'spdx': ['IPL-1.0']},
     'iMatix': {'spdx': ['iMatix']},
@@ -160,8 +160,8 @@
     'IPAFONT': {'spdx': ['IPA']},
     'ISC': {'spdx': ['ISC']},
     'JSON': {'spdx': ['JSON']},
-    'LGPLv3': {'spdx': ['LGPL-3.0-or-later', 'LGPL-3.0-only', 'LGPL-3.0']},
-    'LGPLv2.1': {'spdx': ['LGPL-2.1-or-later', 'LGPL-2.1-only', 'LGPL-2.1']},
+    'LGPLv3': {'spdx': ['LGPL-3.0-or-later', 'LGPL-3.0-only', 'LGPL-3.0', 'LGPL-3.0+']},
+    'LGPLv2.1': {'spdx': ['LGPL-2.1-or-later', 'LGPL-2.1-only', 'LGPL-2.1', 'LGPL-2.1+']},
     'LPPL-1.2': {'spdx': ['LPPL-1.2']},
     'LPPL-1.3a': {'spdx': ['LPPL-1.3a']},
     'lucent102': {'spdx': ['LPL-1.02']},
@@ -196,7 +196,7 @@
     'SGIFreeB': {'spdx': ['SGI-B-2.0']},
     'SILOFL': {'spdx': ['OFL-1.1']},
     'SPL': {'spdx': ['SPL-1.0']},
-    'StandardMLofNJ': {'spdx': ['SMLNJ']},
+    'StandardMLofNJ': {'spdx': ['SMLNJ', 'StandardML-NJ']},
     'Unlicense': {'spdx': ['Unlicense']},
     'UPL': {'spdx': ['UPL-1.0']},
     'Vim': {'spdx': ['Vim']},
@@ -209,7 +209,7 @@
     'Yahoo': {'spdx': ['YPL-1.1']},
     'Zend': {'spdx': ['Zend-2.0']},
     'Zimbra': {'spdx': ['Zimbra-1.3']},
-    'ZLib': {'spdx': ['Zlib']},
+    'ZLib': {'spdx': ['Zlib', 'Nunit']},
     'Zope2.0': {'spdx': ['ZPL-2.0']},
     'Zope2.1': {'spdx': ['ZPL-2.1']},
 }