diff -Nru node-spdx-correct-3.1.0/debian/changelog node-spdx-correct-3.1.1/debian/changelog --- node-spdx-correct-3.1.0/debian/changelog 2020-03-09 15:27:30.000000000 +0000 +++ node-spdx-correct-3.1.1/debian/changelog 2020-05-28 08:25:33.000000000 +0000 @@ -1,3 +1,10 @@ +node-spdx-correct (3.1.1-1) unstable; urgency=medium + + * Team upload + * New upstream version 3.1.1 + + -- Xavier Guimard Thu, 28 May 2020 10:25:33 +0200 + node-spdx-correct (3.1.0-1) unstable; urgency=medium * Team upload diff -Nru node-spdx-correct-3.1.0/debian/copyright node-spdx-correct-3.1.1/debian/copyright --- node-spdx-correct-3.1.0/debian/copyright 2020-02-19 05:54:20.000000000 +0000 +++ node-spdx-correct-3.1.1/debian/copyright 2020-05-28 08:25:33.000000000 +0000 @@ -16,7 +16,7 @@ you may not use this file except in compliance with the License. You may obtain a copy of the License at . - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff -Nru node-spdx-correct-3.1.0/index.js node-spdx-correct-3.1.1/index.js --- node-spdx-correct-3.1.0/index.js 2018-12-06 07:59:46.000000000 +0000 +++ node-spdx-correct-3.1.1/index.js 2020-05-22 15:38:17.000000000 +0000 @@ -49,6 +49,7 @@ ['GNU GENERAL PUBLIC LICENSE', 'GPL'], ['MTI', 'MIT'], ['Mozilla Public License', 'MPL'], + ['Universal Permissive License', 'UPL'], ['WTH', 'WTF'], ['-License', ''] ] @@ -138,6 +139,26 @@ function (argument) { return argument.replace(/(-| )clause(-| )(\d)/, '-$3-Clause') }, + // e.g. 'New BSD license' + function (argument) { + return argument.replace(/\b(Modified|New|Revised)(-| )?BSD((-| )License)?/i, 'BSD-3-Clause') + }, + // e.g. 'Simplified BSD license' + function (argument) { + return argument.replace(/\bSimplified(-| )?BSD((-| )License)?/i, 'BSD-2-Clause') + }, + // e.g. 'Free BSD license' + function (argument) { + return argument.replace(/\b(Free|Net)(-| )?BSD((-| )License)?/i, 'BSD-2-Clause-$1BSD') + }, + // e.g. 'Clear BSD license' + function (argument) { + return argument.replace(/\bClear(-| )?BSD((-| )License)?/i, 'BSD-3-Clause-Clear') + }, + // e.g. 'Old BSD License' + function (argument) { + return argument.replace(/\b(Old|Original)(-| )?BSD((-| )License)?/i, 'BSD-4-Clause') + }, // e.g. 'BY-NC-4.0' function (argument) { return 'CC-' + argument diff -Nru node-spdx-correct-3.1.0/package.json node-spdx-correct-3.1.1/package.json --- node-spdx-correct-3.1.0/package.json 2018-12-06 07:59:46.000000000 +0000 +++ node-spdx-correct-3.1.1/package.json 2020-05-22 15:38:17.000000000 +0000 @@ -1,7 +1,7 @@ { "name": "spdx-correct", "description": "correct invalid SPDX expressions", - "version": "3.1.0", + "version": "3.1.1", "author": "Kyle E. Mitchell (https://kemitchell.com)", "contributors": [ "Kyle E. Mitchell (https://kemitchell.com)", diff -Nru node-spdx-correct-3.1.0/test.js node-spdx-correct-3.1.1/test.js --- node-spdx-correct-3.1.0/test.js 2018-12-06 07:59:46.000000000 +0000 +++ node-spdx-correct-3.1.1/test.js 2020-05-22 15:38:17.000000000 +0000 @@ -131,6 +131,8 @@ 'BSD 3 Clause': 'BSD-3-Clause', 'BSD 3': 'BSD-3-Clause', 'BSD 3-Clause': 'BSD-3-Clause', + 'BSD 4-Clause': 'BSD-4-Clause', + 'BSD-4-Clause': 'BSD-4-Clause', 'BSD 3-clause': 'BSD-3-Clause', 'BSD clause 3': 'BSD-3-Clause', 'BSD': 'BSD-2-Clause', @@ -153,6 +155,7 @@ 'CC-BY 3.0': 'CC-BY-3.0', 'CC-BY 4.0 International': 'CC-BY-4.0', 'Cc-by-3.0': 'CC-BY-3.0', + 'Clear BSD License': 'BSD-3-Clause-Clear', 'DWTFYW License': 'WTFPL', 'DWTFYW': 'WTFPL', 'DWTFYWPL': 'WTFPL', @@ -163,6 +166,8 @@ 'Eclipse Public License': 'EPL-1.0', 'Eclipse Public License, Eclipse Distribution License': 'EPL-1.0', 'Eclipse': 'EPL-1.0', + 'Free BSD': 'BSD-2-Clause-FreeBSD', + 'FreeBSD': 'BSD-2-Clause-FreeBSD', 'GLP': 'GPL-3.0-or-later', 'GLPv3': 'GPL-3.0-or-later', 'GNU Affero GPL 3.0': 'AGPL-3.0-or-later', @@ -333,19 +338,27 @@ 'MiT': 'MIT', 'Mit': 'MIT', 'MIT +no-false-attribs': 'MITNFA', + 'Modified BSD': 'BSD-3-Clause', 'Mozilla Public License 1.1': 'MPL-1.1', 'Mozilla Public License 2.0': 'MPL-2.0', 'Mozilla Public License version 2': 'MPL-2.0', 'Mozilla Public License': 'MPL-2.0', 'Mozilla Public License, v. 2.0': 'MPL-2.0', 'Mozilla Public License, version 2.0': 'MPL-2.0', + 'NetBSD': 'BSD-2-Clause-NetBSD', + 'New BSD': 'BSD-3-Clause', + 'Old BSD': 'BSD-4-Clause', + 'Original BSD License': 'BSD-4-Clause', 'Public Domain (UNLISCENSE)': 'Unlicense', 'Public Domain (Unlicense)': 'Unlicense', 'Public Domain ': 'Unlicense', 'Public domain(unlicense)': 'Unlicense', 'Public-domain (Unlicense)': 'Unlicense', + 'Simplified BSD Licese': 'BSD-2-Clause', 'Standard 3-clause BSD': 'BSD-3-Clause', 'The Unlicense': 'Unlicense', + 'Universal Permissive License': 'UPL-1.0', + 'UPL': 'UPL-1.0', 'UNLICENSE': 'Unlicense', 'UNLICENSED': 'Unlicense', 'UNLICNSE': 'Unlicense',