New Upstream Snapshot - libregexp-pattern-license-perl
Ready changes
Summary
Merged new upstream version: 3.10.0 (was: 3.9.4).
Diff
diff --git a/COPYRIGHT b/COPYRIGHT
index c3668c7..0aee5af 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -6,16 +6,21 @@ Source: https://metacpan.org/pod/Regexp::Pattern::License
Files: Changes
META.json
META.yml
+ dist.ini
doap.ttl
lib/Regexp/Pattern/License.pm
lib/Regexp/Pattern/License/Parts.pm
+ t/01-basic.t
t/02-regexp-pattern.t
+ t/02-regexp-pattern_RE2.t
+ t/02-regexp-pattern_RE2_missing.t
t/02-structure.t
t/03-match-normalized.t
t/coverage-cc-deprecated.t
t/coverage-cc.t
t/coverage-fedora-2.53.t
t/coverage-osi.t
+ t/coverage-perl.t
t/coverage-spdx-1.16.t
t/coverage-spdx-1.17.t
t/coverage-spdx-1.18.t
@@ -34,14 +39,7 @@ Files: Changes
t/coverage-wikidata.t
t/lib/Test2/Tools/LicenseObject.pm
t/lib/Test2/Tools/LicenseRegistry.pm
-Copyright: Copyright 2022 Jonas Smedegaard.
-License: GPL-3.0
-
-Files: t/01-basic.t
- t/02-regexp-pattern_RE2.t
- t/02-regexp-pattern_RE2_missing.t
- t/coverage-perl.t
-Copyright: Copyright 2021 Jonas Smedegaard.
+Copyright: Copyright 2023 Jonas Smedegaard.
License: GPL-3.0
Files: INSTALL
@@ -57,30 +55,26 @@ Files: COPYRIGHT
Copyright: None
License: public-domain
-Files: dist.ini
-Copyright: Copyright 2017 Jonas Smedegaard.
-License: GPL-3.0
-
Files: Makefile.PL
Copyright: Copyright 2020 Toby Inkster.
License: GPL-1.0+ or Artistic-1.0
License: GPL-3.0
- This software is Copyright (c) 2022 by Jonas Smedegaard.
+ This software is Copyright (c) 2023 by Jonas Smedegaard.
This is free software, licensed under:
The GNU General Public License, Version 3, June 2007
License: Artistic-1.0
- This software is Copyright (c) 2022 by the copyright holder(s).
+ This software is Copyright (c) 2023 by the copyright holder(s).
This is free software, licensed under:
The Artistic License 1.0
License: GPL-1.0
- This software is Copyright (c) 2022 by the copyright holder(s).
+ This software is Copyright (c) 2023 by the copyright holder(s).
This is free software, licensed under:
diff --git a/Changes b/Changes
index d48ae0e..2d0e81c 100644
--- a/Changes
+++ b/Changes
@@ -7,6 +7,18 @@ Home page: <https://metacpan.org/release/Regexp-Pattern-License>
Bug tracker: <https://bugs.debian.org/libregexp-pattern-license-perl>
Maintainer: Jonas Smedegaard (JONASS) <jonass@cpan.org>
+v3.10.0 2023-01-17
+
+ [ Documentation ]
+ - update TODOs
+
+ [ Test Suite ]
+ - tighten test-requirement on Test2::V0
+
+ [ Other ]
+ - Added: implement engine => 'pseudo'
+ - tighten subpattern asis_sw_name_discl
+
v3.9.4 2022-02-12
[ Bug Fixes ]
@@ -44,8 +56,8 @@ v3.9.4 2022-02-12
v3.9.3 2021-08-18
[ Packaging ]
- - declare that we break App::Licensecheck before v3.2.7 (exception
- opbjects were wrongly tagged until Regexp::Pattern::License v3.9.0)
+ - declare that we break App::Licensecheck before v3.2.7 (exception objects
+ were wrongly tagged until Regexp::Pattern::License v3.9.0)
v3.9.2 2021-08-17
diff --git a/LICENSE b/LICENSE
index 95dfa72..340ad12 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-This software is Copyright (c) 2022 by Jonas Smedegaard.
+This software is Copyright (c) 2023 by Jonas Smedegaard.
This is free software, licensed under:
diff --git a/META.json b/META.json
index 8a38951..8d7177f 100644
--- a/META.json
+++ b/META.json
@@ -50,7 +50,7 @@
"test" : {
"requires" : {
"Regexp::Pattern" : "0",
- "Test2::V0" : "0",
+ "Test2::V0" : "0.000078",
"Test::Regexp::Pattern" : "0.003",
"Test::Without::Module" : "0",
"Try::Tiny" : "0"
@@ -60,11 +60,11 @@
"provides" : {
"Regexp::Pattern::License" : {
"file" : "lib/Regexp/Pattern/License.pm",
- "version" : "v3.9.4"
+ "version" : "v3.10.0"
},
"Regexp::Pattern::License::Parts" : {
"file" : "lib/Regexp/Pattern/License/Parts.pm",
- "version" : "v3.9.4"
+ "version" : "v3.10.0"
}
},
"release_status" : "stable",
@@ -82,7 +82,7 @@
},
"x_identifier" : "http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/project"
},
- "version" : "v3.9.4",
+ "version" : "v3.10.0",
"x_breaks" : {
"App::Licensecheck" : "<= v3.2.6"
},
@@ -90,5 +90,5 @@
"documenter",
"tester"
],
- "x_serialization_backend" : "JSON::PP version 4.06"
+ "x_serialization_backend" : "JSON::PP version 4.07"
}
diff --git a/META.yml b/META.yml
index b8a47b9..b7efc43 100644
--- a/META.yml
+++ b/META.yml
@@ -4,7 +4,7 @@ author:
- 'Jonas Smedegaard (JONASS) <jonass@cpan.org>'
build_requires:
Regexp::Pattern: '0'
- Test2::V0: '0'
+ Test2::V0: '0.000078'
Test::Regexp::Pattern: '0.003'
Test::Without::Module: '0'
Try::Tiny: '0'
@@ -33,10 +33,10 @@ optional_features: {}
provides:
Regexp::Pattern::License:
file: lib/Regexp/Pattern/License.pm
- version: v3.9.4
+ version: v3.10.0
Regexp::Pattern::License::Parts:
file: lib/Regexp/Pattern/License/Parts.pm
- version: v3.9.4
+ version: v3.10.0
recommends:
re::engine::RE2: '0'
requires:
@@ -47,7 +47,7 @@ resources:
homepage: https://metacpan.org/pod/Regexp::Pattern::License
license: http://www.gnu.org/licenses/gpl-3.0.txt
repository: https://salsa.debian.org/build-common-team/regexp-pattern-license.git
-version: v3.9.4
+version: v3.10.0
x_breaks:
App::Licensecheck: '<= v3.2.6'
x_help_wanted:
diff --git a/Makefile.PL b/Makefile.PL
index 666e598..0a52f1d 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -29,7 +29,7 @@ my $meta = {
test => {
requires => {
"Regexp::Pattern" => 0,
- "Test2::V0" => 0,
+ "Test2::V0" => "0.000078",
"Test::Regexp::Pattern" => 0.003,
"Test::Without::Module" => 0,
"Try::Tiny" => 0,
@@ -37,8 +37,8 @@ my $meta = {
},
},
"provides" => {
- "Regexp::Pattern::License" => { file => "lib/Regexp/Pattern/License.pm", version => "v3.9.4" },
- "Regexp::Pattern::License::Parts" => { file => "lib/Regexp/Pattern/License/Parts.pm", version => "v3.9.4" },
+ "Regexp::Pattern::License" => { file => "lib/Regexp/Pattern/License.pm", version => "v3.10.0" },
+ "Regexp::Pattern::License::Parts" => { file => "lib/Regexp/Pattern/License/Parts.pm", version => "v3.10.0" },
},
"release_status" => "stable",
"resources" => {
@@ -51,7 +51,7 @@ my $meta = {
},
x_identifier => "http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/project",
},
- "version" => "v3.9.4",
+ "version" => "v3.10.0",
"x_breaks" => { "App::Licensecheck" => "<= v3.2.6" },
"x_help_wanted" => ["documenter", "tester"],
};
diff --git a/README b/README
index 6a7df07..795e1f0 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ NAME
Regexp::Pattern::License - Regular expressions for legal licenses
VERSION
- Version v3.9.4
+ Version v3.10.0
SYNOPSIS
use Regexp::Pattern::License;
diff --git a/SIGNATURE b/SIGNATURE
index 32689de..0aa6e73 100644
--- a/SIGNATURE
+++ b/SIGNATURE
@@ -14,63 +14,47 @@ not run its Makefile.PL or Build.PL.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: RIPEMD160
-SHA256 3947c2f9d82468821321da0e4925950004dd8d045f1181e3e67dcc9e3a6fb253 COPYRIGHT
+SHA256 2964404c8a4036ef02c1ef8a795fd60f57872a654f8e18f818991e90ee86f7e6 COPYRIGHT
SHA256 f914c9deba3a5c67c820470a93b401c21cb87fd787aa0f18ce0ef79f1a4f4419 CREDITS
-SHA256 2ade91c50fe3811c35ac7ac4d3bb602874b0e875dd4e29b8a2d07f11a2c45e80 Changes
+SHA256 bc8d35f089e8f73ad36a4943f93ecdf878d601c85a638fbe030ebe8eeb5389a2 Changes
SHA256 d46df20eb26f8c1ab0cfc5c3231eb9487f2ee673fdc016795f75c92ad1960fd6 INSTALL
-SHA256 502f4a4a49776b45a78e764347cf747a9d52f6703cfcbf9bebe0e64a67d3ae3d LICENSE
+SHA256 45026ea6356c28ee5cea863f6428a83fa8ff87506aa985ea7da3f4a884b0bccd LICENSE
SHA256 b317aab650cf887d3ab10f046881d7550c6f074df50f62444f6291a2f66945c5 MANIFEST
-SHA256 6c75e2a4ac639736b3a01de4d820cbb58d79532b5464d87763c734fdb50103f9 META.json
-SHA256 e3ed547a375a9d19780abac306f0c2b45868f473358729481400e4ebfe04cce4 META.yml
-SHA256 d705b7921508c572ec26b5b4ad6c0c5fc4a5bfccd0cdf6a9246c122ff78d4ba8 Makefile.PL
-SHA256 37b470bb779361505553c3ddc731eb42581b3c0fbe725b91bb301de3b9b1318c README
-SHA256 77bbe5665a5fb9521262d8cc15b423cbe1449ff30b8f9e1883b3d2b2ecb4ff28 TODO
+SHA256 46fa6ff8546e23b5b788e347aa35a409bc8bcbe8bff6a054eb54e715880e6b7a META.json
+SHA256 95f8586b2b1562d3a74bdc401740fe085249243a5e701e9f3abf7f29eb2f5534 META.yml
+SHA256 33f40c8264b317f9de1006559718b54911ceae6ac01f1865a68e616d1b51f7d5 Makefile.PL
+SHA256 68d8753d0045fe89b59b0db844f9c24bd4d2f76413b323d49063874fd5dd8df7 README
+SHA256 a831b36e471bfb5f27de8eb60a12a05738db78fe5a8a6e475ef83524c41f5ba5 TODO
SHA256 524a02d7cef09fbf4b9f3571b6d46ba0681ce9e08f904f89462b9955036f2309 dist.ini
-SHA256 07469517da987b0d27de3a97b8f18c09667a1e43b911aac74d1a403f7a6919e0 doap.ttl
-SHA256 1da35bad9ca7189239b8edb0041c330492d5fbff040054bf8719b1177773fffb lib/Regexp/Pattern/License.pm
-SHA256 2f467225d6705f7ac5972c8f10bf78a78f428198a38317ad688077b527feeba5 lib/Regexp/Pattern/License/Parts.pm
+SHA256 b13fec35d9ac534040b3148bedf089fc2b104c9d46eb3e2ba53ae14b61a9fb11 doap.ttl
+SHA256 5b20c83e4da8a508c661b3e9eb85984cf4645a000b93f25b6d10b2e688ddbe3c lib/Regexp/Pattern/License.pm
+SHA256 2083a50846d6502f629fea095e7e932c4f063dd2ee337b3ce4d2575d9e62c9d8 lib/Regexp/Pattern/License/Parts.pm
SHA256 8571b04b5f4d940ccb5962a91df4f9260e2650ddf384d19d11c4d5ec55f7ea6e t/01-basic.t
-SHA256 b1ace126891ada201e12f06deeae9ecf9c6eeb695d70359cbf2e0a9e5bcfbb16 t/02-regexp-pattern.t
-SHA256 d8f91b172020d9c426a0693c3be0d8b96595ee6785b09526c2009af65164b137 t/02-regexp-pattern_RE2.t
+SHA256 9c79bc026f3827bd03d420409178e0059d42fa078091bb1eff966c4258f4b411 t/02-regexp-pattern.t
+SHA256 e800700973849f940e5f9721dc105659a3ee8942d61f7cee0bb77c2262088279 t/02-regexp-pattern_RE2.t
SHA256 32cb5704b792b3b2f8c9ac61a56fac04642ed4779e5fba5f5f343d63610a8a2a t/02-regexp-pattern_RE2_missing.t
SHA256 f06eefeca14a2f79d4e61e0b780de39451213b3242d4a518b1cf471c292c3562 t/02-structure.t
SHA256 b84d4c9ab327f90dc6ae38fa94f9e2d0ac01c1348a497ab1948c6307bfa099dd t/03-match-normalized.t
-SHA256 ac1a1fd59bfd0632e7788b9e5afbe677f7f92693f744fd6ca5bd62b699a2f0bb t/coverage-cc-deprecated.t
-SHA256 a8624b92af7e71fb302d92415997f92cdf44bd5a89d0b493fde1cada038cb99e t/coverage-cc.t
-SHA256 015076ab16060d3f70814ada12eb64fec2299dbbf4570246ae7d46e2a93abef8 t/coverage-fedora-2.53.t
-SHA256 dd77fb89a87c79d066d8aba751d1766af5d9f29b1fb334024fa7d846a6533804 t/coverage-osi.t
+SHA256 3503fe084253a6c31639595fe96fabed8f6b1e918c8efbf5ac16ca5a9cdb3190 t/coverage-cc-deprecated.t
+SHA256 21882b4bd100b4c8a17fe9f1bc754ea78980e117a92c4111dea2a3387fb698cf t/coverage-cc.t
+SHA256 ee6dd5575c28d3500861b54b0e0bf174f63efc6ef20fc0d39a541197e0af6382 t/coverage-fedora-2.53.t
+SHA256 22bca15b65a58119cba8406510902f90b45453e29b0702a1061e9bcbd6b8d901 t/coverage-osi.t
SHA256 aa54d0b0f45ed009356fd15caa5f2266776ed9d8c9dfbaa3554fc6d78972ac23 t/coverage-perl.t
-SHA256 ccc075e1f23493e7bf96539ebda78035f3be7049aefe754099cc9cc40c5b9341 t/coverage-spdx-1.16.t
-SHA256 e308e241aa90d181b3f614f4c00d05e740c7fe28425ae4ae5982a0b0593bfbd5 t/coverage-spdx-1.17.t
-SHA256 3c5e09821058052caa73533c768779745b9d8862eb4b993ce0043a7f1e735182 t/coverage-spdx-1.18.t
-SHA256 68bce0ee778d824c0605e97a71e2eb2c0551577bdbc812bd975126930def8e1a t/coverage-spdx-1.19.t
-SHA256 81a99e43196354ee3e26adb1080136280fe8797a21010f2b33ab9d83cc7685d4 t/coverage-spdx-1.20.t
-SHA256 47e85f498fc71c03cdfc3ef4dd99a6940df9541e9ea502000e18b162cff5a9de t/coverage-spdx-2.0.t
-SHA256 e3e3caa0310740a5978801f45d44e33c5289a598b11aad46ebded25d123c50df t/coverage-spdx-2.1.t
-SHA256 ce19080df51838129f12ec7b5da5a5cab6e83cb16d6122107c3bfe1f898ad6cf t/coverage-spdx-2.2.t
-SHA256 f691f01724eab0e8dbdec9cadc18324780c4750349370c229d4ec581ec5f3833 t/coverage-spdx-2.3.t
-SHA256 abdac8b29b1c4e2e97a1e305f87602c0b2868c2c1212ad3d1f7fa69671751c0c t/coverage-spdx-2.4.t
-SHA256 f383373408c16ee3b7b037ee755a45bba88a06916a9b3ccf4ca681eab861fdfd t/coverage-spdx-2.5.t
-SHA256 599f03921d2b45cb2b877c9b12c87b08e9fc491352eee07287f2a9fa1ee666e3 t/coverage-spdx-2.6.t
-SHA256 2bd8a7047976f4cb8042a34e5b4f6e9ef8481cbdcdcb708166bb2fa1561c1b23 t/coverage-spdx-3.0.t
-SHA256 6c1a1f27be4645e2448592d8604f130132a1b063344d195b48a389b80e5c8528 t/coverage-tldr.t
+SHA256 1e92e9df811a2c66773b4b32e4a9a0c151192dd737ee30535669801584f2453b t/coverage-spdx-1.16.t
+SHA256 c56fae36f60c1a6349d7b6fc6ffba18b6f881ca2a2c4fc4c4081abec29e9643a t/coverage-spdx-1.17.t
+SHA256 154204fe8a82fc170a18adeade44165fd2a6c86b80ede3f4caca1104040fcdb3 t/coverage-spdx-1.18.t
+SHA256 25cdd3ebebbb4ea399d5c802563d036c8d8f44e6a6bf49e540bf5158a507d3ff t/coverage-spdx-1.19.t
+SHA256 0533d586a737aee8098242267bea1735e05059dc7eff96e7a13753ae46da8005 t/coverage-spdx-1.20.t
+SHA256 514b4ea486b77ce8303867a8fba36eaa067b6ce18ecba76b13bf056ed52d76bd t/coverage-spdx-2.0.t
+SHA256 cecb831150938a03e5e50bdb4859fa8626d025e793638875aa7e2e51da878a7c t/coverage-spdx-2.1.t
+SHA256 c9f238c05376d86824b791a2cfc07aeba747c3920ecc33d17cc98db2738a7265 t/coverage-spdx-2.2.t
+SHA256 c3e6383812cc6f45cc4523f2d2a2b0e21dde2862d80d86c556dd80e20c635f62 t/coverage-spdx-2.3.t
+SHA256 f627e8bd8c409053803059fd94824559507853d360870355b2d84287692285bd t/coverage-spdx-2.4.t
+SHA256 29dea79fb026d1a062306e9382b28744d1c9e885d2d6ff0e23c15fda9fe29d9b t/coverage-spdx-2.5.t
+SHA256 d5896dd4953cba4fa5a18c2161f2b55fbc793373bcd442f3755b33e4fdbd8841 t/coverage-spdx-2.6.t
+SHA256 af2d4234b8c971b15c58b18fd47649bd483a0d7b26ce94e8e0c60b905a6a1134 t/coverage-spdx-3.0.t
+SHA256 de64b46af1061c1822734b6656d1453b3379c5e09001e7673ade800829fec42a t/coverage-tldr.t
SHA256 ffdc50c57fb46d50cddf5ffd2b65fbb631c8630c8dcec73c3894f170fdfb447a t/coverage-trove.t
SHA256 af1699aace979103041550f61bb346dc5d5132609dc5018bad182eda6cc08550 t/coverage-wikidata.t
-SHA256 425717544baafe89db5e746d3581780a60171ea7f6c32ccf9409e447411e1bb0 t/lib/Test2/Tools/LicenseObject.pm
+SHA256 0458da60bedfe1b05bfcf9f60c5e6a4253512935435a2ac80e04e83e1e3da473 t/lib/Test2/Tools/LicenseObject.pm
SHA256 05f2bcb9442de2e10909b044d7f1d246c114091562fce98b440f98118804c383 t/lib/Test2/Tools/LicenseRegistry.pm
------BEGIN PGP SIGNATURE-----
-
-iQIzBAEBAwAdFiEEn+Ppw2aRpp/1PMaELHwxRsGgASEFAmIILnsACgkQLHwxRsGg
-ASHGBw//bxZIFmLztxmBsJTvhKp+TFX/v3ksv3iHv3iEI/AAHeXedqD1yVxep0mf
-5+1VqGCAkFEQYugGUyVdnn7mST39FmcAXN09/Ib/soQ74lza45eyGVRtji2NAzgl
-0e97v9ydyhzkZiztmu/1N8WKLBXPCtZrrU+pSthh3Os4xGLhiBQ8o+u9XYJqk/a0
-ESEiPbmLbyC4yslNVeSWECrUw5/2BXG10nVFezThgaf4VVTZixHd6xnBh7yD4xTE
-3LBnzgcDEjc3B8pZrFT43sl00vOR6pHhxG8pp9QDoGBeZduiU0rT54CoWPOJ6jhw
-8fvpjlre/qAipzUVf9weYa+SnQvw3HTTuAclQ5+IaBNwZ6SBHrYSZl29rgyEN34Y
-pa+ekq8JWjSfFdTVu5nYZeAi3vZsz6IKNdpsBebaYxDTnx6e057YW+28Pv0OtUDy
-LqyjiOvQq4+3/gLmWLs0vrVTAHFl0WphYA7KvgrQeexi1ZIZ3EK70RZpooQcVfgO
-DH74vzQ8wfCNFoSDIId1iFRxlBIMixomyobHr5r/hlOOAld2DeohesrKDY1I6wDa
-slvWR1Rc/WwwStlcdCXvVuH5OKB30/1NBCxaQ0Gg+y72xR++55BN9735YXfbC0i6
-ZfJhmgvb8GHmjUXAfe85ISOjbTf9NsZA+JgMZu2U6OhlqzzdW0s=
-=gSjn
------END PGP SIGNATURE-----
diff --git a/TODO b/TODO
index c336610..c028851 100644
--- a/TODO
+++ b/TODO
@@ -40,6 +40,7 @@ Patterns:
+ linfo: http://www.linfo.org/main_index.html
+ ifross: https://github.com/LeChasseur/ifrOSS/blob/master/Lizenzcenter.md
* copyfree: http://copyfree.org/standard/licenses
+ * ODRL: https://rdflicense.linkeddata.es/
* Cover traits:
+ Comment styles (most possible):
https://en.wikipedia.org/wiki/Comparison_of_programming_languages_(syntax)#Comments
diff --git a/debian/changelog b/debian/changelog
index 5cdcf6a..11fdd27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libregexp-pattern-license-perl (3.10.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Wed, 08 Feb 2023 17:50:54 -0000
+
libregexp-pattern-license-perl (3.9.4-3) unstable; urgency=medium
* Team upload.
diff --git a/doap.ttl b/doap.ttl
index 7e089de..98b0566 100644
--- a/doap.ttl
+++ b/doap.ttl
@@ -24,6 +24,30 @@
], [
a doap-changeset:Change;
rdfs:label "Clean m4 dnl comment marker.";
+ ], [
+ a doap-changeset:Change;
+ rdfs:label "Tidy code: Drop noop code.";
+ ], [
+ a doap-changeset:Regression;
+ rdfs:label "Drop too exotic licensing phrase, and corresponding test case.";
+ ], [
+ a doap-changeset:Addition;
+ rdfs:label "Introduce new modules: Pattern::License Pattern::License::Parts.";
+ ], [
+ a doap-changeset:Change;
+ rdfs:label "Use Regexp::Pattern::License for shortname resolving (with internal list as fallback until phased out).";
+ ], [
+ a doap-changeset:Change;
+ rdfs:label "Add license patterns mit_new mit_new_materials mit_old mit_unspecified postgresql, and group pattern mit to Regexp::Pattern::License.";
+ ], [
+ a doap-changeset:Bugfix;
+ rdfs:label "Fix detect licenses mit_old mit_unspecified (was misdetected as mit_new).";
+ ], [
+ a doap-changeset:Addition;
+ rdfs:label "Add new license patterns curl dsdp mit_oldstyle mit_oldstyle_disclaimer mit_oldstyle_permission ntp ntp_disclaimer.";
+ ], [
+ a doap-changeset:Change;
+ rdfs:label "Add license patterns bsd_2_clause bsd_3_clause bsd_4_clause to Regexp::Pattern::License.";
], [
a doap-changeset:Addition;
rdfs:label "Add new trait patterns clause_retention clause_reproduction clause_advertising clause_non_endorsement disclaimer.";
@@ -54,9 +78,6 @@
], [
a doap-changeset:Addition;
rdfs:label "Add new trait pattern license_prefix.";
- ], [
- a doap-changeset:Change;
- rdfs:label "Tidy code: Drop noop code.";
], [
a doap-changeset:Change;
rdfs:label "Emulate Regexp::Common -keep syntax to capture version number.";
@@ -87,9 +108,6 @@
], [
a doap-changeset:Bugfix;
rdfs:label "Fix avoid detection of GPL/LGPL fulltext (rarely if ever used as grant).";
- ], [
- a doap-changeset:Regression;
- rdfs:label "Drop too exotic licensing phrase, and corresponding test case.";
], [
a doap-changeset:Change;
rdfs:label "Add license patterns gpl lgpl to Regexp::Pattern::License.";
@@ -120,9 +138,6 @@
], [
a doap-changeset:Change;
rdfs:label "Add license patterns fsfap fsful fsfullr to Regexp::Pattern::License.";
- ], [
- a doap-changeset:Addition;
- rdfs:label "Introduce new modules: Pattern::License Pattern::License::Parts.";
], [
a doap-changeset:Addition;
rdfs:label "Add new trait patterns fsf_unlimited fsf_unlimited_retention.";
@@ -153,9 +168,6 @@
], [
a doap-changeset:Addition;
rdfs:label "Add new license pattern ms_rl.";
- ], [
- a doap-changeset:Change;
- rdfs:label "Use Regexp::Pattern::License for shortname resolving (with internal list as fallback until phased out).";
], [
a doap-changeset:Change;
rdfs:label "Add license patterns cddl cecill cecill_1 cecill_1_1 cecill_2 cecill_2_1 cecill_b cecill_c epl to Regexp::Pattern::License.";
@@ -174,18 +186,6 @@
], [
a doap-changeset:Change;
rdfs:label "Improve detection of license GPL.";
- ], [
- a doap-changeset:Change;
- rdfs:label "Add license patterns mit_new mit_new_materials mit_old mit_unspecified postgresql, and group pattern mit to Regexp::Pattern::License.";
- ], [
- a doap-changeset:Bugfix;
- rdfs:label "Fix detect licenses mit_old mit_unspecified (was misdetected as mit_new).";
- ], [
- a doap-changeset:Addition;
- rdfs:label "Add new license patterns curl dsdp mit_oldstyle mit_oldstyle_disclaimer mit_oldstyle_permission ntp ntp_disclaimer.";
- ], [
- a doap-changeset:Change;
- rdfs:label "Add license patterns bsd_2_clause bsd_3_clause bsd_4_clause to Regexp::Pattern::License.";
];
];
doap-changeset:released-by <http://purl.org/NET/cpan-uri/person/jonass>;
@@ -366,7 +366,7 @@
doap-deps:runtime-requirement [ doap-deps:on "perl 5"^^doap-deps:CpanId ];
doap-deps:test-requirement [ doap-deps:on "Regexp::Pattern"^^doap-deps:CpanId ], [
doap-deps:on "Test::Without::Module"^^doap-deps:CpanId;
- ], [ doap-deps:on "Test2::V0"^^doap-deps:CpanId ], [
+ ], [ doap-deps:on "Test2::V0 0.000078"^^doap-deps:CpanId ], [
doap-deps:on "Test::Regexp::Pattern 0.003"^^doap-deps:CpanId;
], [ doap-deps:on "Try::Tiny"^^doap-deps:CpanId ];
doap:bug-database <http://rt.cpan.org/Dist/Display.html?Queue=Regexp-Pattern-License>, <https://bugs.debian.org/libregexp-pattern-license-perl>;
@@ -379,7 +379,7 @@
doap:maintainer <http://purl.org/NET/cpan-uri/person/jonass>;
doap:name "Regexp-Pattern-License";
doap:programming-language "Perl";
- doap:release <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-0-31>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-0>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-100>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-101>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-102>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-90>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-91>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-92>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-93>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-94>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-95>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-96>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-97>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-98>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-99>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-2-0>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-3-0>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-3-1>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-4-0>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-5-0>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-5-1>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-6-0>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-6-1>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-7-0>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-7-1>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-8-0>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-8-1>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-9-0>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-9-1>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-9-2>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-9-3>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-9-4>;
+ doap:release <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-0-31>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-0>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-100>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-101>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-102>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-90>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-91>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-92>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-93>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-94>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-95>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-96>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-97>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-98>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-1-99>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-10-0>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-2-0>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-3-0>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-3-1>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-4-0>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-5-0>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-5-1>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-6-0>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-6-1>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-7-0>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-7-1>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-8-0>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-8-1>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-9-0>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-9-1>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-9-2>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-9-3>, <http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-9-4>;
doap:repository [
a doap:GitRepository;
doap:browse <https://salsa.debian.org/build-common-team/regexp-pattern-license.git>;
@@ -409,6 +409,12 @@
dc:issued "2018-02-09"^^xsd:date;
doap-changeset:changeset [
doap-changeset:item [
+ a doap-changeset:Documentation;
+ rdfs:label "Improve POD: Rephrase sections about license combinations and license groups, to better disambiguate.";
+ ], [
+ a doap-changeset:Documentation;
+ rdfs:label "Improve POD: Fix list covered licenses aladdin icu mit_cmu mit_cmu_warranty ofl rpsl.";
+ ], [
a doap-changeset:Addition;
rdfs:label "Add hierarchical tags family:* type:*. Deprecate undocumented non-hierarchical tags.";
], [
@@ -417,12 +423,6 @@
], [
a doap-changeset:Addition;
rdfs:label "Introduce alternate license patterns: pat.alt.flavor.artifact.";
- ], [
- a doap-changeset:Documentation;
- rdfs:label "Improve POD: Rephrase sections about license combinations and license groups, to better disambiguate.";
- ], [
- a doap-changeset:Documentation;
- rdfs:label "Improve POD: Fix list covered licenses aladdin icu mit_cmu mit_cmu_warranty ofl rpsl.";
];
];
doap-changeset:released-by <http://purl.org/NET/cpan-uri/person/jonass>;
@@ -594,15 +594,6 @@
dc:issued "2018-03-29"^^xsd:date;
doap-changeset:changeset [
doap-changeset:item [
- a doap-changeset:Tests;
- rdfs:label "Extend testsuite to cover most license patterns.";
- ], [
- a doap-changeset:Change;
- rdfs:label "Fix metadata for objects cecill_b cecill_c: Use tag type:versioned:decimal (not type:unversioned).";
- ], [
- a doap-changeset:Change;
- rdfs:label "Relax object bsd_3_clause to match SPDX template.";
- ], [
a doap-changeset:Bugfix;
rdfs:label "Fix object fsfullr to match grant at all.";
], [
@@ -707,6 +698,15 @@
], [
a doap-changeset:Documentation;
rdfs:label "Add TODO file to source, with a bunch of ideas.";
+ ], [
+ a doap-changeset:Tests;
+ rdfs:label "Extend testsuite to cover most license patterns.";
+ ], [
+ a doap-changeset:Change;
+ rdfs:label "Fix metadata for objects cecill_b cecill_c: Use tag type:versioned:decimal (not type:unversioned).";
+ ], [
+ a doap-changeset:Change;
+ rdfs:label "Relax object bsd_3_clause to match SPDX template.";
];
];
doap-changeset:released-by <http://purl.org/NET/cpan-uri/person/jonass>;
@@ -998,6 +998,29 @@
doap:file-release <http://backpan.cpan.org/authors/id/J/JO/JONASS/Regexp-Pattern-License-v3.1.99.tar.gz>;
doap:revision "v3.1.99"^^xsd:string.
+<http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-10-0>
+ a doap:Version;
+ dc:identifier "Regexp-Pattern-License-v3.10.0"^^xsd:string;
+ dc:issued "2023-01-17"^^xsd:date;
+ doap-changeset:changeset [
+ doap-changeset:item [
+ a doap-changeset:Tests;
+ rdfs:label "tighten test-requirement on Test2::V0";
+ ], [
+ a doap-changeset:Addition;
+ rdfs:label "implement engine => 'pseudo'";
+ ], [
+ a doap-changeset:Change;
+ rdfs:label "tighten subpattern asis_sw_name_discl";
+ ], [
+ a doap-changeset:Documentation;
+ rdfs:label "update TODOs";
+ ];
+ ];
+ doap-changeset:released-by <http://purl.org/NET/cpan-uri/person/jonass>;
+ doap:file-release <http://backpan.cpan.org/authors/id/J/JO/JONASS/Regexp-Pattern-License-v3.10.0.tar.gz>;
+ doap:revision "v3.10.0"^^xsd:string.
+
<http://purl.org/NET/cpan-uri/dist/Regexp-Pattern-License/v_v3-2-0>
a doap:Version;
dc:identifier "Regexp-Pattern-License-v3.2.0"^^xsd:string;
@@ -2050,7 +2073,7 @@
doap-changeset:changeset [
doap-changeset:item [
a doap-changeset:Packaging;
- rdfs:label "declare that we break App::Licensecheck before v3.2.7 (exception opbjects were wrongly tagged until Regexp::Pattern::License v3.9.0)";
+ rdfs:label "declare that we break App::Licensecheck before v3.2.7 (exception objects were wrongly tagged until Regexp::Pattern::License v3.9.0)";
];
];
doap-changeset:released-by <http://purl.org/NET/cpan-uri/person/jonass>;
@@ -2158,6 +2181,6 @@
foaf:name "Sandro Mani".
<https://gitlab.collabora.com/wlozano>
- foaf:mbox <file:///home/jonas/projects/DEBIAN/CDBS/regexp-pattern-license/meta/walter.lozano@collabora.com>, <file:///home/jonas/projects/DEBIAN/CDBS/regexp-pattern-license/meta/wlozano@collabora.com>;
+ foaf:mbox <file:///build/tmp.Z9VU5IEkjY/libregexp-pattern-license-perl/meta/walter.lozano@collabora.com>, <file:///build/tmp.Z9VU5IEkjY/libregexp-pattern-license-perl/meta/wlozano@collabora.com>;
foaf:name "Walter Lozano".
diff --git a/lib/Regexp/Pattern/License.pm b/lib/Regexp/Pattern/License.pm
index 3873638..dcce46f 100644
--- a/lib/Regexp/Pattern/License.pm
+++ b/lib/Regexp/Pattern/License.pm
@@ -19,11 +19,11 @@ Regexp::Pattern::License - Regular expressions for legal licenses
=head1 VERSION
-Version v3.9.4
+Version v3.10.0
=cut
-our $VERSION = version->declare("v3.9.4");
+our $VERSION = version->declare("v3.10.0");
=head1 SYNOPSIS
@@ -14876,7 +14876,7 @@ my $gen_args_capture = {
my $gen_args_engine = {
summary =>
- 'Enable custom regexp engine (perl module re::engine::* or none)',
+ 'Enable custom regexp engine (perl module re::engine::* or pseudo or none)',
schema => ['str*'],
};
@@ -14895,7 +14895,7 @@ for my $id ( grep {/^[a-z]/} keys %RE ) {
or next;
$_TYPE{$id} = $1;
if ( $2 and $1 eq 'singleversion' ) {
- push @_OBJECTS, $id;
+ push @_OBJECTS, $id;
push @{ $_SERIES{$id} }, $2;
}
else {
@@ -15408,8 +15408,12 @@ for my $id (@_OBJECTS) {
}
}
- $pat =~ s/(?:\[|\(:)[^\]]+?(?:\]|:\))/
- exists $_ANNOTATIONS{$&} ? $_ANNOTATIONS{$&} : $&/ego;
+ if ( defined $args{engine} and $args{engine} eq 'pseudo' ) {
+ }
+ else {
+ $pat =~ s/(?:\[|\(:)[^\]]+?(?:\]|:\))/
+ exists $_ANNOTATIONS{$&} ? $_ANNOTATIONS{$&} : $&/ego;
+ }
# TODO: document if not obsoleted
# by <https://github.com/perlancar/perl-Regexp-Pattern/issues/4>
@@ -15435,7 +15439,7 @@ for my $id (@_OBJECTS) {
}
return qr/$pat/;
}
- elsif ( $args{engine} eq 'none' ) {
+ elsif ( $args{engine} eq 'none' or $args{engine} eq 'pseudo' ) {
return $pat;
}
else {
diff --git a/lib/Regexp/Pattern/License/Parts.pm b/lib/Regexp/Pattern/License/Parts.pm
index 0e0d48a..5615b10 100644
--- a/lib/Regexp/Pattern/License/Parts.pm
+++ b/lib/Regexp/Pattern/License/Parts.pm
@@ -10,11 +10,11 @@ Regexp::Pattern::License::Parts - Regular expressions for licensing sub-parts
=head1 VERSION
-Version v3.9.4
+Version v3.10.0
=cut
-our $VERSION = version->declare("v3.9.4");
+our $VERSION = version->declare("v3.10.0");
=head STATUS
@@ -219,7 +219,7 @@ our %RE = (
},
asis_sw_name_discl => {
pat =>
- 'THE SOFTWARE IS PROVIDED [as is](?:,?|AND)[ word]{1,15} DISCLAIMS'
+ 'THE SOFTWARE IS PROVIDED [as is](?:,?| AND)[ word]{1,15} DISCLAIMS'
},
asis_sw_warranty =>
{ pat => 'THE SOFTWARE IS PROVIDED [as is],? WITHOUT WARRANTY' },
diff --git a/t/02-regexp-pattern.t b/t/02-regexp-pattern.t
index ac77dcb..393cd9c 100644
--- a/t/02-regexp-pattern.t
+++ b/t/02-regexp-pattern.t
@@ -14,7 +14,7 @@ ok $re;
isa_ok $re, ['Regexp'], 're object is a Regexp';
ref_ok $re, 'REGEXP', 're object is a native Regexp object';
-regexp_patterns_in_module_ok 'Regexp::Pattern::License', $OPTS;
+regexp_patterns_in_module_ok 'Regexp::Pattern::License', $OPTS;
regexp_patterns_in_module_ok 'Regexp::Pattern::License::Parts', 'parts',
$OPTS;
diff --git a/t/02-regexp-pattern_RE2.t b/t/02-regexp-pattern_RE2.t
index 8116dc7..5525551 100644
--- a/t/02-regexp-pattern_RE2.t
+++ b/t/02-regexp-pattern_RE2.t
@@ -16,7 +16,7 @@ ok $re;
isa_ok $re, ['Regexp'], 're object is a Regexp';
isa_ok $re, ['re::engine::RE2'], 're object is an RE2 object';
-regexp_patterns_in_module_ok 'Regexp::Pattern::License', $OPTS;
+regexp_patterns_in_module_ok 'Regexp::Pattern::License', $OPTS;
regexp_patterns_in_module_ok 'Regexp::Pattern::License::Parts', 'parts',
$OPTS;
diff --git a/t/coverage-cc-deprecated.t b/t/coverage-cc-deprecated.t
index 197d0b8..9d71af5 100644
--- a/t/coverage-cc-deprecated.t
+++ b/t/coverage-cc-deprecated.t
@@ -18,7 +18,7 @@ like(
field 'Developing Nations License' => 'CC-DevNations-2.0'; # deed
# ShareAlike
- field 'Creative Commons ShareAlike' => 'CC-SA';
+ field 'Creative Commons ShareAlike' => 'CC-SA';
field 'Creative Commons ShareAlike 1.0 Generic License' =>
'CC-SA-1.0'; # grant
field 'ShareAlike 1.0' => 'CC-SA-1.0'; # legal
@@ -26,7 +26,7 @@ like(
field 'ShareAlike 1.0 Generic (CC SA 1.0)' => 'CC-SA-1.0'; # deed
# NonCommercial
- field 'Creative Commons NonCommercial' => 'CC-NC';
+ field 'Creative Commons NonCommercial' => 'CC-NC';
field 'Creative Commons NonCommercial 1.0 Generic License' =>
'CC-NC-1.0'; # grant
field 'NonCommercial 1.0' => 'CC-NC-1.0'; # legal
@@ -50,7 +50,7 @@ like(
'CC-NC-SA-1.0'; # deed
# NoDerivs-NonCommercial
- field 'Creative Commons NoDerivs-NonCommercial' => 'CC-ND-NC';
+ field 'Creative Commons NoDerivs-NonCommercial' => 'CC-ND-NC';
field 'Creative Commons NoDerivatives-NonCommercial' =>
'CC-ND-NC'; # long
field 'Creative Commons NonCommercial-NoDerivs' =>
diff --git a/t/coverage-cc.t b/t/coverage-cc.t
index 541582e..5f1fea0 100644
--- a/t/coverage-cc.t
+++ b/t/coverage-cc.t
@@ -15,7 +15,7 @@ like(
license_org_metadata( 'cc', { date => 99999999 } ),
hash {
# Attribution
- field 'Creative Commons Attribution' => 'CC-BY';
+ field 'Creative Commons Attribution' => 'CC-BY';
field 'Creative Commons Attribution 1.0 Generic License' =>
'CC-BY-1.0'; # grant
field 'Creative Commons Attribution 2.0 Generic License' =>
diff --git a/t/coverage-fedora-2.53.t b/t/coverage-fedora-2.53.t
index f9b8fc0..8492e90 100644
--- a/t/coverage-fedora-2.53.t
+++ b/t/coverage-fedora-2.53.t
@@ -164,11 +164,11 @@ like(
field 'Creative Commons BSD' => 'BSD-2-Clause';
field 'BSD 2-Clause License' => 'BSD-2-Clause'; # default caption
- field 'Creative Commons GNU GPL' => 'GPL-2';
+ field 'Creative Commons GNU GPL' => 'GPL-2';
field 'GNU General Public License, Version 2' =>
'GPL-2'; # default caption
- field 'Creative Commons GNU LGPL' => 'LGPL-2.1';
+ field 'Creative Commons GNU LGPL' => 'LGPL-2.1';
field 'GNU Lesser General Public License, Version 2.1' =>
'LGPL-2.1'; # default caption
@@ -386,7 +386,7 @@ like(
field 'MirOS License' => 'MirOS';
- field 'MIT license (also X11)' => 'mit_new';
+ field 'MIT license (also X11)' => 'mit_new';
field 'MIT-style license, Modern Style with sublicense' =>
'mit_new'; # page
@@ -584,7 +584,7 @@ like(
field 'Zope Public License v 2.0' => 'ZPLv2.0';
field 'Zope Public License v 2.1' => 'ZPLv2.1';
- field 'zlib/libpng License' => 'zlib';
+ field 'zlib/libpng License' => 'zlib';
field 'zlib/libpng License with Acknowledgement' =>
'zlib-acknowledgement';
field 'zlib with acknowledgement' => 'zlib-acknowledgement'; # short
@@ -825,7 +825,7 @@ like(
field 'BSD license' => 'BSD'; # default caption
# Fedora use BSD-4-Clause-UC as proof but names are more general
- field 'Original BSD License' => 'BSD-4-Clause';
+ field 'Original BSD License' => 'BSD-4-Clause';
field 'Original BSD License (BSD with advertising)' =>
'BSD-4-Clause'; # page
diff --git a/t/coverage-osi.t b/t/coverage-osi.t
index 24f89c1..ee47b08 100644
--- a/t/coverage-osi.t
+++ b/t/coverage-osi.t
@@ -64,7 +64,7 @@ like(
field 'Boost Software License 1.0' => 'BSL-1.0';
field 'Boost Software License' => 'BSL-1.0'; # list
field 'BSD-2-Clause-Patent' => 'BSDplusPatent';
- field 'BSD-3-Clause-LBNL' =>
+ field 'BSD-3-Clause-LBNL' =>
'BSD-3-Clause-LBNL'; # list in BSD sublist
field 'BSD+Patent' => 'BSDplusPatent';
@@ -94,7 +94,7 @@ like(
field 'Educational Community License, Version 1.0' => 'ECL-1.0';
field 'Educational Community License, Version 2.0' => 'ECL-2.0';
field 'The Eiffel Forum License, version 1' => 'EFL-1.0';
- field 'Eiffel Forum License V1.0' => 'EFL-1.0'; # list
+ field 'Eiffel Forum License V1.0' => 'EFL-1.0'; # list
field 'Eiffel Forum License, version 1.0' =>
'EFL-1.0'; # do-not-use list
field 'Eiffel Forum License, Version 2' => 'EFL-2.0';
@@ -113,10 +113,10 @@ like(
field 'GNU Affero General Public License version 3' => 'AGPL-3.0';
field 'GNU General Public License' => 'gpl-license'; # category list
field 'GPL' => 'gpl-license'; # shortname
- field 'GNU General Public License version 2' => 'GPL-2.0';
+ field 'GNU General Public License version 2' => 'GPL-2.0';
field 'GNU General Public License, version 2' =>
'GPL-2.0'; # category list
- field 'GNU General Public License version 3' => 'GPL-3.0';
+ field 'GNU General Public License version 3' => 'GPL-3.0';
field 'GNU General Public License, version 3' =>
'GPL-3.0'; # category list
field 'GNU LGPL' => 'lgpl-license';
@@ -147,7 +147,7 @@ like(
field
'Licence Libre du Québec – Réciprocité forte (LiLiQ-R+) version 1.1'
=> 'LiLiQ-Rplus-1.1';
- field 'Lucent Public License, Plan 9, version 1.0' => 'LPL-1.0';
+ field 'Lucent Public License, Plan 9, version 1.0' => 'LPL-1.0';
field 'Lucent Public License ("Plan9"), version 1.0' =>
'LPL-1.0'; # list
field 'Lucent Public License Version 1.02' => 'LPL-1.02';
@@ -155,7 +155,7 @@ like(
field 'Microsoft Reciprocal License' => 'MS-RL';
field 'MirOS Licence' => 'MirOS';
field 'The MIT License' => 'MIT';
- field 'MIT License' => 'MIT'; # list
+ field 'MIT License' => 'MIT'; # list
field 'MIT license' => 'MIT'; # category list
field 'MIT No Attribution License' => 'MIT-0';
field 'The MITRE Collaborative Virtual Workspace License' => 'CVW';
@@ -163,10 +163,10 @@ like(
field 'Motosoto Open Source License - Version 0.9.1' => 'Motosoto';
field 'Motosoto License' => 'Motosoto'; # list
field 'The Mozilla Public License (MPL), version 1.0' => 'MPL-1.0';
- field 'Mozilla Public License 1.0' => 'MPL-1.0'; # list
+ field 'Mozilla Public License 1.0' => 'MPL-1.0'; # list
field 'Mozilla Public License, version 1.0' =>
'MPL-1.0'; # do-not-use list
- field 'Mozilla Public License 1.1' => 'MPL-1.1';
+ field 'Mozilla Public License 1.1' => 'MPL-1.1';
field 'Mozilla Public License, version 1.1' =>
'MPL-1.1'; # do-not-use list
field 'Mozilla Public License 2.0' => 'MPL-2.0';
@@ -234,7 +234,7 @@ like(
field 'The Universal Permissive License (UPL), Version 1.0' => 'UPL';
field 'Universal Permissive License' => 'UPL'; # list
field 'The University of Illinois/NCSA Open Source License' => 'NCSA';
- field 'University of Illinois/NCSA Open Source License' =>
+ field 'University of Illinois/NCSA Open Source License' =>
'NCSA'; # list
field 'Upstream Compatibility License v1.0' => 'UCL-1.0';
field 'Unicode, Inc. License Agreement - Data Files and Software' =>
diff --git a/t/coverage-spdx-1.16.t b/t/coverage-spdx-1.16.t
index 8cfe019..55beebc 100644
--- a/t/coverage-spdx-1.16.t
+++ b/t/coverage-spdx-1.16.t
@@ -145,7 +145,7 @@ like(
field 'GNU Lesser General Public License v2.1 only' => 'LGPL-2.1';
field 'GNU Lesser General Public License v2.1 or later' =>
'LGPL-2.1+';
- field 'GNU Lesser General Public License v3.0 only' => 'LGPL-3.0';
+ field 'GNU Lesser General Public License v3.0 only' => 'LGPL-3.0';
field 'GNU Lesser General Public License v3.0 or later' =>
'LGPL-3.0+';
field 'libpng License' => 'Libpng';
diff --git a/t/coverage-spdx-1.17.t b/t/coverage-spdx-1.17.t
index 98ed1dc..7c1d1db 100644
--- a/t/coverage-spdx-1.17.t
+++ b/t/coverage-spdx-1.17.t
@@ -155,7 +155,7 @@ like(
field 'GNU Lesser General Public License v2.1 only' => 'LGPL-2.1';
field 'GNU Lesser General Public License v2.1 or later' =>
'LGPL-2.1+';
- field 'GNU Lesser General Public License v3.0 only' => 'LGPL-3.0';
+ field 'GNU Lesser General Public License v3.0 only' => 'LGPL-3.0';
field 'GNU Lesser General Public License v3.0 or later' =>
'LGPL-3.0+';
field 'libpng License' => 'Libpng';
diff --git a/t/coverage-spdx-1.18.t b/t/coverage-spdx-1.18.t
index 3e878a6..d2f20c5 100644
--- a/t/coverage-spdx-1.18.t
+++ b/t/coverage-spdx-1.18.t
@@ -150,7 +150,7 @@ like(
field 'GNU Lesser General Public License v2.1 only' => 'LGPL-2.1';
field 'GNU Lesser General Public License v2.1 or later' =>
'LGPL-2.1+';
- field 'GNU Lesser General Public License v3.0 only' => 'LGPL-3.0';
+ field 'GNU Lesser General Public License v3.0 only' => 'LGPL-3.0';
field 'GNU Lesser General Public License v3.0 or later' =>
'LGPL-3.0+';
field 'Historic Permission Notice and Disclaimer' => 'HPND';
diff --git a/t/coverage-spdx-1.19.t b/t/coverage-spdx-1.19.t
index 52195c5..28c4a38 100644
--- a/t/coverage-spdx-1.19.t
+++ b/t/coverage-spdx-1.19.t
@@ -147,10 +147,10 @@ like(
field
'GNU General Public License v3.0 w/GCC Runtime Library exception'
=> 'GPL-3.0-with-GCC-exception';
- field 'GNU Lesser General Public License v2.1 only' => 'LGPL-2.1';
+ field 'GNU Lesser General Public License v2.1 only' => 'LGPL-2.1';
field 'GNU Lesser General Public License v2.1 or later' =>
'LGPL-2.1+';
- field 'GNU Lesser General Public License v3.0 only' => 'LGPL-3.0';
+ field 'GNU Lesser General Public License v3.0 only' => 'LGPL-3.0';
field 'GNU Lesser General Public License v3.0 or later' =>
'LGPL-3.0+';
field 'GNU Library General Public License v2 only' => 'LGPL-2.0';
diff --git a/t/coverage-spdx-1.20.t b/t/coverage-spdx-1.20.t
index 0510489..b82af12 100644
--- a/t/coverage-spdx-1.20.t
+++ b/t/coverage-spdx-1.20.t
@@ -201,10 +201,10 @@ like(
field
'GNU General Public License v3.0 w/GCC Runtime Library exception'
=> 'GPL-3.0-with-GCC-exception';
- field 'GNU Lesser General Public License v2.1 only' => 'LGPL-2.1';
+ field 'GNU Lesser General Public License v2.1 only' => 'LGPL-2.1';
field 'GNU Lesser General Public License v2.1 or later' =>
'LGPL-2.1+';
- field 'GNU Lesser General Public License v3.0 only' => 'LGPL-3.0';
+ field 'GNU Lesser General Public License v3.0 only' => 'LGPL-3.0';
field 'GNU Lesser General Public License v3.0 or later' =>
'LGPL-3.0+';
field 'GNU Library General Public License v2 only' => 'LGPL-2.0';
@@ -381,12 +381,12 @@ like(
# TODO field 'xinetd License' => 'xinetd';
# TODO field 'XPP License' => 'xpp';
# TODO field 'XSkat License' => 'XSkat';
- field 'Yahoo! Public License v1.0' => 'YPL-1.0';
- field 'Yahoo! Public License v1.1' => 'YPL-1.1';
- field 'Zed License' => 'Zed';
- field 'Zend License v2.0' => 'Zend-2.0';
- field 'Zimbra Public License v1.3' => 'Zimbra-1.3';
- field 'zlib License' => 'Zlib';
+ field 'Yahoo! Public License v1.0' => 'YPL-1.0';
+ field 'Yahoo! Public License v1.1' => 'YPL-1.1';
+ field 'Zed License' => 'Zed';
+ field 'Zend License v2.0' => 'Zend-2.0';
+ field 'Zimbra Public License v1.3' => 'Zimbra-1.3';
+ field 'zlib License' => 'Zlib';
field 'zlib/libpng License with Acknowledgement' =>
'zlib-acknowledgement';
field 'Zope Public License 1.1' => 'ZPL-1.1';
diff --git a/t/coverage-spdx-2.0.t b/t/coverage-spdx-2.0.t
index 29e8303..4d14355 100644
--- a/t/coverage-spdx-2.0.t
+++ b/t/coverage-spdx-2.0.t
@@ -372,13 +372,13 @@ like(
# TODO field 'xinetd License' => 'xinetd';
# TODO field 'XPP License' => 'xpp';
# TODO field 'XSkat License' => 'XSkat';
- field 'Yahoo! Public License v1.0' => 'YPL-1.0';
- field 'Yahoo! Public License v1.1' => 'YPL-1.1';
- field 'Zed License' => 'Zed';
- field 'Zend License v2.0' => 'Zend-2.0';
- field 'Zimbra Public License v1.3' => 'Zimbra-1.3';
- field 'Zimbra Public License v1.4' => 'Zimbra-1.4';
- field 'zlib License' => 'Zlib';
+ field 'Yahoo! Public License v1.0' => 'YPL-1.0';
+ field 'Yahoo! Public License v1.1' => 'YPL-1.1';
+ field 'Zed License' => 'Zed';
+ field 'Zend License v2.0' => 'Zend-2.0';
+ field 'Zimbra Public License v1.3' => 'Zimbra-1.3';
+ field 'Zimbra Public License v1.4' => 'Zimbra-1.4';
+ field 'zlib License' => 'Zlib';
field 'zlib/libpng License with Acknowledgement' =>
'zlib-acknowledgement';
field 'Zope Public License 1.1' => 'ZPL-1.1';
diff --git a/t/coverage-spdx-2.1.t b/t/coverage-spdx-2.1.t
index b81b972..307af10 100644
--- a/t/coverage-spdx-2.1.t
+++ b/t/coverage-spdx-2.1.t
@@ -355,7 +355,7 @@ like(
# TODO field 'Vim License' => 'Vim';
# TODO field 'VOSTROM Public License for Open Source' => 'VOSTROM';
- field 'Vovida Software License v1.0' => 'VSL-1.0';
+ field 'Vovida Software License v1.0' => 'VSL-1.0';
field 'W3C Software Notice and License (1998-07-20)' =>
'W3C-19980720';
field 'W3C Software Notice and License (2002-12-31)' => 'W3C';
@@ -370,13 +370,13 @@ like(
# TODO field 'xinetd License' => 'xinetd';
# TODO field 'XPP License' => 'xpp';
# TODO field 'XSkat License' => 'XSkat';
- field 'Yahoo! Public License v1.0' => 'YPL-1.0';
- field 'Yahoo! Public License v1.1' => 'YPL-1.1';
- field 'Zed License' => 'Zed';
- field 'Zend License v2.0' => 'Zend-2.0';
- field 'Zimbra Public License v1.3' => 'Zimbra-1.3';
- field 'Zimbra Public License v1.4' => 'Zimbra-1.4';
- field 'zlib License' => 'Zlib';
+ field 'Yahoo! Public License v1.0' => 'YPL-1.0';
+ field 'Yahoo! Public License v1.1' => 'YPL-1.1';
+ field 'Zed License' => 'Zed';
+ field 'Zend License v2.0' => 'Zend-2.0';
+ field 'Zimbra Public License v1.3' => 'Zimbra-1.3';
+ field 'Zimbra Public License v1.4' => 'Zimbra-1.4';
+ field 'zlib License' => 'Zlib';
field 'zlib/libpng License with Acknowledgement' =>
'zlib-acknowledgement';
field 'Zope Public License 1.1' => 'ZPL-1.1';
diff --git a/t/coverage-spdx-2.2.t b/t/coverage-spdx-2.2.t
index a470c0f..e8733af 100644
--- a/t/coverage-spdx-2.2.t
+++ b/t/coverage-spdx-2.2.t
@@ -362,7 +362,7 @@ like(
# TODO field 'Vim License' => 'Vim';
# TODO field 'VOSTROM Public License for Open Source' => 'VOSTROM';
- field 'Vovida Software License v1.0' => 'VSL-1.0';
+ field 'Vovida Software License v1.0' => 'VSL-1.0';
field 'W3C Software Notice and License (1998-07-20)' =>
'W3C-19980720';
field 'W3C Software Notice and License (2002-12-31)' => 'W3C';
@@ -377,13 +377,13 @@ like(
# TODO field 'xinetd License' => 'xinetd';
# TODO field 'XPP License' => 'xpp';
# TODO field 'XSkat License' => 'XSkat';
- field 'Yahoo! Public License v1.0' => 'YPL-1.0';
- field 'Yahoo! Public License v1.1' => 'YPL-1.1';
- field 'Zed License' => 'Zed';
- field 'Zend License v2.0' => 'Zend-2.0';
- field 'Zimbra Public License v1.3' => 'Zimbra-1.3';
- field 'Zimbra Public License v1.4' => 'Zimbra-1.4';
- field 'zlib License' => 'Zlib';
+ field 'Yahoo! Public License v1.0' => 'YPL-1.0';
+ field 'Yahoo! Public License v1.1' => 'YPL-1.1';
+ field 'Zed License' => 'Zed';
+ field 'Zend License v2.0' => 'Zend-2.0';
+ field 'Zimbra Public License v1.3' => 'Zimbra-1.3';
+ field 'Zimbra Public License v1.4' => 'Zimbra-1.4';
+ field 'zlib License' => 'Zlib';
field 'zlib/libpng License with Acknowledgement' =>
'zlib-acknowledgement';
field 'Zope Public License 1.1' => 'ZPL-1.1';
diff --git a/t/coverage-spdx-2.3.t b/t/coverage-spdx-2.3.t
index 56ac10f..4061e10 100644
--- a/t/coverage-spdx-2.3.t
+++ b/t/coverage-spdx-2.3.t
@@ -366,7 +366,7 @@ like(
# TODO field 'Vim License' => 'Vim';
# TODO field 'VOSTROM Public License for Open Source' => 'VOSTROM';
- field 'Vovida Software License v1.0' => 'VSL-1.0';
+ field 'Vovida Software License v1.0' => 'VSL-1.0';
field 'W3C Software Notice and License (1998-07-20)' =>
'W3C-19980720';
field 'W3C Software Notice and License (2002-12-31)' => 'W3C';
@@ -381,13 +381,13 @@ like(
# TODO field 'xinetd License' => 'xinetd';
# TODO field 'XPP License' => 'xpp';
# TODO field 'XSkat License' => 'XSkat';
- field 'Yahoo! Public License v1.0' => 'YPL-1.0';
- field 'Yahoo! Public License v1.1' => 'YPL-1.1';
- field 'Zed License' => 'Zed';
- field 'Zend License v2.0' => 'Zend-2.0';
- field 'Zimbra Public License v1.3' => 'Zimbra-1.3';
- field 'Zimbra Public License v1.4' => 'Zimbra-1.4';
- field 'zlib License' => 'Zlib';
+ field 'Yahoo! Public License v1.0' => 'YPL-1.0';
+ field 'Yahoo! Public License v1.1' => 'YPL-1.1';
+ field 'Zed License' => 'Zed';
+ field 'Zend License v2.0' => 'Zend-2.0';
+ field 'Zimbra Public License v1.3' => 'Zimbra-1.3';
+ field 'Zimbra Public License v1.4' => 'Zimbra-1.4';
+ field 'zlib License' => 'Zlib';
field 'zlib/libpng License with Acknowledgement' =>
'zlib-acknowledgement';
field 'Zope Public License 1.1' => 'ZPL-1.1';
diff --git a/t/coverage-spdx-2.4.t b/t/coverage-spdx-2.4.t
index 0616af4..9c37332 100644
--- a/t/coverage-spdx-2.4.t
+++ b/t/coverage-spdx-2.4.t
@@ -380,7 +380,7 @@ like(
# TODO field 'Vim License' => 'Vim';
# TODO field 'VOSTROM Public License for Open Source' => 'VOSTROM';
- field 'Vovida Software License v1.0' => 'VSL-1.0';
+ field 'Vovida Software License v1.0' => 'VSL-1.0';
field 'W3C Software Notice and License (1998-07-20)' =>
'W3C-19980720';
field 'W3C Software Notice and License (2002-12-31)' => 'W3C';
@@ -395,13 +395,13 @@ like(
# TODO field 'xinetd License' => 'xinetd';
# TODO field 'XPP License' => 'xpp';
# TODO field 'XSkat License' => 'XSkat';
- field 'Yahoo! Public License v1.0' => 'YPL-1.0';
- field 'Yahoo! Public License v1.1' => 'YPL-1.1';
- field 'Zed License' => 'Zed';
- field 'Zend License v2.0' => 'Zend-2.0';
- field 'Zimbra Public License v1.3' => 'Zimbra-1.3';
- field 'Zimbra Public License v1.4' => 'Zimbra-1.4';
- field 'zlib License' => 'Zlib';
+ field 'Yahoo! Public License v1.0' => 'YPL-1.0';
+ field 'Yahoo! Public License v1.1' => 'YPL-1.1';
+ field 'Zed License' => 'Zed';
+ field 'Zend License v2.0' => 'Zend-2.0';
+ field 'Zimbra Public License v1.3' => 'Zimbra-1.3';
+ field 'Zimbra Public License v1.4' => 'Zimbra-1.4';
+ field 'zlib License' => 'Zlib';
field 'zlib/libpng License with Acknowledgement' =>
'zlib-acknowledgement';
field 'Zope Public License 1.1' => 'ZPL-1.1';
diff --git a/t/coverage-spdx-2.5.t b/t/coverage-spdx-2.5.t
index cae0633..5091df9 100644
--- a/t/coverage-spdx-2.5.t
+++ b/t/coverage-spdx-2.5.t
@@ -55,8 +55,8 @@ like(
field 'BSD 2-clause FreeBSD License' => 'BSD-2-Clause-FreeBSD';
field 'BSD 2-clause NetBSD License' => 'BSD-2-Clause-NetBSD';
field 'BSD 3-clause "New" or "Revised" License' => 'BSD-3-Clause';
- field 'BSD with attribution' => 'BSD-3-Clause-Attribution';
- field 'BSD 3-clause Clear License' => 'BSD-3-Clause-Clear';
+ field 'BSD with attribution' => 'BSD-3-Clause-Attribution';
+ field 'BSD 3-clause Clear License' => 'BSD-3-Clause-Clear';
field 'BSD 3-Clause No Nuclear License' =>
'BSD-3-Clause-No-Nuclear-License';
field 'BSD 3-Clause No Nuclear License 2014' =>
@@ -390,7 +390,7 @@ like(
# TODO field 'Vim License' => 'Vim';
# TODO field 'VOSTROM Public License for Open Source' => 'VOSTROM';
- field 'Vovida Software License v1.0' => 'VSL-1.0';
+ field 'Vovida Software License v1.0' => 'VSL-1.0';
field 'W3C Software Notice and License (1998-07-20)' =>
'W3C-19980720';
field 'W3C Software Notice and License (2002-12-31)' => 'W3C';
@@ -405,13 +405,13 @@ like(
# TODO field 'xinetd License' => 'xinetd';
# TODO field 'XPP License' => 'xpp';
# TODO field 'XSkat License' => 'XSkat';
- field 'Yahoo! Public License v1.0' => 'YPL-1.0';
- field 'Yahoo! Public License v1.1' => 'YPL-1.1';
- field 'Zed License' => 'Zed';
- field 'Zend License v2.0' => 'Zend-2.0';
- field 'Zimbra Public License v1.3' => 'Zimbra-1.3';
- field 'Zimbra Public License v1.4' => 'Zimbra-1.4';
- field 'zlib License' => 'Zlib';
+ field 'Yahoo! Public License v1.0' => 'YPL-1.0';
+ field 'Yahoo! Public License v1.1' => 'YPL-1.1';
+ field 'Zed License' => 'Zed';
+ field 'Zend License v2.0' => 'Zend-2.0';
+ field 'Zimbra Public License v1.3' => 'Zimbra-1.3';
+ field 'Zimbra Public License v1.4' => 'Zimbra-1.4';
+ field 'zlib License' => 'Zlib';
field 'zlib/libpng License with Acknowledgement' =>
'zlib-acknowledgement';
field 'Zope Public License 1.1' => 'ZPL-1.1';
diff --git a/t/coverage-spdx-2.6.t b/t/coverage-spdx-2.6.t
index cb8da57..65f734b 100644
--- a/t/coverage-spdx-2.6.t
+++ b/t/coverage-spdx-2.6.t
@@ -411,13 +411,13 @@ like(
# TODO field 'XPP License' => 'xpp';
# TODO field 'XSkat License' => 'XSkat';
- field 'Yahoo! Public License v1.0' => 'YPL-1.0';
- field 'Yahoo! Public License v1.1' => 'YPL-1.1';
- field 'Zed License' => 'Zed';
- field 'Zend License v2.0' => 'Zend-2.0';
- field 'Zimbra Public License v1.3' => 'Zimbra-1.3';
- field 'Zimbra Public License v1.4' => 'Zimbra-1.4';
- field 'zlib License' => 'Zlib';
+ field 'Yahoo! Public License v1.0' => 'YPL-1.0';
+ field 'Yahoo! Public License v1.1' => 'YPL-1.1';
+ field 'Zed License' => 'Zed';
+ field 'Zend License v2.0' => 'Zend-2.0';
+ field 'Zimbra Public License v1.3' => 'Zimbra-1.3';
+ field 'Zimbra Public License v1.4' => 'Zimbra-1.4';
+ field 'zlib License' => 'Zlib';
field 'zlib/libpng License with Acknowledgement' =>
'zlib-acknowledgement';
field 'Zope Public License 1.1' => 'ZPL-1.1';
diff --git a/t/coverage-spdx-3.0.t b/t/coverage-spdx-3.0.t
index 16db7e5..b018c67 100644
--- a/t/coverage-spdx-3.0.t
+++ b/t/coverage-spdx-3.0.t
@@ -15,15 +15,15 @@ like(
field 'Abstyles License' => 'Abstyles';
field 'Adobe Systems Incorporated Source Code License Agreement' =>
'Adobe-2006';
- field 'Adobe Glyph List License' => 'Adobe-Glyph';
- field 'Amazon Digital Services License' => 'ADSL';
- field 'Academic Free License v1.1' => 'AFL-1.1';
- field 'Academic Free License v1.2' => 'AFL-1.2';
- field 'Academic Free License v2.0' => 'AFL-2.0';
- field 'Academic Free License v2.1' => 'AFL-2.1';
- field 'Academic Free License v3.0' => 'AFL-3.0';
- field 'Afmparse License' => 'Afmparse';
- field 'Affero General Public License v1.0' => 'AGPL-1.0';
+ field 'Adobe Glyph List License' => 'Adobe-Glyph';
+ field 'Amazon Digital Services License' => 'ADSL';
+ field 'Academic Free License v1.1' => 'AFL-1.1';
+ field 'Academic Free License v1.2' => 'AFL-1.2';
+ field 'Academic Free License v2.0' => 'AFL-2.0';
+ field 'Academic Free License v2.1' => 'AFL-2.1';
+ field 'Academic Free License v3.0' => 'AFL-3.0';
+ field 'Afmparse License' => 'Afmparse';
+ field 'Affero General Public License v1.0' => 'AGPL-1.0';
field 'GNU Affero General Public License v3.0 only' =>
'AGPL-3.0-only';
field 'GNU Affero General Public License v3.0 or later' =>
@@ -211,13 +211,13 @@ like(
# field 'GL2PS License' => 'GL2PS';
# field 'Glulxe License' => 'Glulxe';
# field 'gnuplot License' => 'gnuplot';
- field 'GNU General Public License v1.0 only' => 'GPL-1.0-only';
+ field 'GNU General Public License v1.0 only' => 'GPL-1.0-only';
field 'GNU General Public License v1.0 or later' =>
'GPL-1.0-or-later';
- field 'GNU General Public License v2.0 only' => 'GPL-2.0-only';
+ field 'GNU General Public License v2.0 only' => 'GPL-2.0-only';
field 'GNU General Public License v2.0 or later' =>
'GPL-2.0-or-later';
- field 'GNU General Public License v3.0 only' => 'GPL-3.0-only';
+ field 'GNU General Public License v3.0 only' => 'GPL-3.0-only';
field 'GNU General Public License v3.0 or later' =>
'GPL-3.0-or-later';
field 'gSOAP Public License v1.3b' => 'gSOAP-1.3b';
@@ -440,13 +440,13 @@ like(
# field 'XPP License' => 'xpp';
# field 'XSkat License' => 'XSkat';
- field 'Yahoo! Public License v1.0' => 'YPL-1.0';
- field 'Yahoo! Public License v1.1' => 'YPL-1.1';
- field 'Zed License' => 'Zed';
- field 'Zend License v2.0' => 'Zend-2.0';
- field 'Zimbra Public License v1.3' => 'Zimbra-1.3';
- field 'Zimbra Public License v1.4' => 'Zimbra-1.4';
- field 'zlib License' => 'Zlib';
+ field 'Yahoo! Public License v1.0' => 'YPL-1.0';
+ field 'Yahoo! Public License v1.1' => 'YPL-1.1';
+ field 'Zed License' => 'Zed';
+ field 'Zend License v2.0' => 'Zend-2.0';
+ field 'Zimbra Public License v1.3' => 'Zimbra-1.3';
+ field 'Zimbra Public License v1.4' => 'Zimbra-1.4';
+ field 'zlib License' => 'Zlib';
field 'zlib/libpng License with Acknowledgement' =>
'zlib-acknowledgement';
field 'Zope Public License 1.1' => 'ZPL-1.1';
diff --git a/t/coverage-tldr.t b/t/coverage-tldr.t
index 1750674..eb7e39e 100644
--- a/t/coverage-tldr.t
+++ b/t/coverage-tldr.t
@@ -39,7 +39,7 @@ like(
field '4-Clause BSD' => '4-clause-bsd';
# field '4k Video Downloader EULA' => '4k-video-downloader';
- field 'Abstyles License' => 'abstyles-license';
+ field 'Abstyles License' => 'abstyles-license';
field 'Academic Free License 2.1 (AFL-2.1)' =>
'academic-free-license-v.-2.1';
field 'Academic Free License 3.0 (AFL)' =>
@@ -48,7 +48,7 @@ like(
'academy-of-motion-picture-arts-and-sciences-bsd';
field 'Adaptive Public License 1.0 (APL-1.0)' =>
'adaptive-public-license-1.0-(apl-1.0)';
- field 'Adobe Glyph List License' => 'adobe-glyph-list-license';
+ field 'Adobe Glyph List License' => 'adobe-glyph-list-license';
field 'Adobe Postscript AFM License' =>
'adobe-postscript-afm-license';
field 'Adobe Systems Incorporated Source Code License Agreement' =>
@@ -73,7 +73,7 @@ like(
field 'Apple MIT License (AML)' => 'apple-mit-license-(aml)';
field 'Apple Public Source License 2.0 (APSL)' =>
'apple-public-source-license-2.0-(apsl)';
- field 'Artistic License 1.0' => 'artistic-license-1.0';
+ field 'Artistic License 1.0' => 'artistic-license-1.0';
field 'Artistic License 2.0 (Artistic-2.0)' =>
'artistic-license-2.0-(artistic)';
field 'Attribution Assurance License (AAL)' =>
@@ -193,7 +193,7 @@ like(
# field 'Egreen Open Source ' => 'egreen-open-source-';
field 'Eiffel Forum License v2.0 (EFL-2.0)' =>
'eiffel-forum-license-v2.0-(efl-2.0)';
- field 'enna License' => 'enna-license';
+ field 'enna License' => 'enna-license';
field 'Entessa Public License v1.0 (Entessa)' =>
'entessa-public-license-v1.0-(entessa)';
field 'Erlang Public License v1.1 (ErlPL-1.1)' =>
@@ -351,9 +351,9 @@ like(
field 'OpenSSL License (OpenSSL)' => 'openssl-license-(openssl)';
# field 'Oracle Binary Code License Agreement for the Java SE Platform Products and JavaFX' => 'oracle-binary-code-license-agreement-for-the-java-se-platform-products-and-javafx';
- field 'Peer Production License' => 'peer-production-license';
- field 'PHP License 3.0.1' => 'the-php-license-3.0.1';
- field 'PHP License 3.0 (PHP)' => 'php-license-3.0-(php)';
+ field 'Peer Production License' => 'peer-production-license';
+ field 'PHP License 3.0.1' => 'the-php-license-3.0.1';
+ field 'PHP License 3.0 (PHP)' => 'php-license-3.0-(php)';
field 'PostgreSQL License (PostgreSQL)' =>
'postgresql-license-(postgresql)';
@@ -374,7 +374,7 @@ like(
'red-hat-ecos-public-license-v1.1-(rhecos-1.1)';
field 'Ricoh Source Code Public License (RSCPL)' =>
'ricoh-source-code-public-license-(rscpl)';
- field 'Ruby License (Ruby)' => 'ruby-license-(ruby)';
+ field 'Ruby License (Ruby)' => 'ruby-license-(ruby)';
field 'Sax Public Domain Notice (SAX-PD)' =>
'sax-public-domain-notice-(sax-pd)';
@@ -462,7 +462,7 @@ like(
'yahoo!-public-license-v1.1-(ypl-1.1)';
# field 'Zebra SDK' => 'zebra-sdk';
- field 'Zed License' => 'zed-license';
+ field 'Zed License' => 'zed-license';
field 'Zimbra Public License v1.3 (Zimbra-1.3)' =>
'zimbra-public-license-v1.3-(zimbra-1.3)';
field 'zimbra public license' => 'zimbra-public-license';
diff --git a/t/lib/Test2/Tools/LicenseObject.pm b/t/lib/Test2/Tools/LicenseObject.pm
index 03d196c..ac02db8 100644
--- a/t/lib/Test2/Tools/LicenseObject.pm
+++ b/t/lib/Test2/Tools/LicenseObject.pm
@@ -6,7 +6,7 @@ use Regexp::Pattern;
use Regexp::Pattern::License;
use Test2::API qw(context run_subtest);
use Test2::Todo;
-use Test2::Util::Ref qw(rtype);
+use Test2::Util::Ref qw(rtype);
use Test2::Tools::Compare qw(like unlike);
use Try::Tiny;