[licensecheck] 11/26: Improve license patternmit_feh.

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository licensecheck.

commit b2813847ea96a714e6dc244ba47b41a90e851e67
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Nov 29 06:32:04 2016 +0100

    Improve license patternmit_feh.
---
 lib/Regexp/Pattern/License.pm       |  3 ++-
 lib/Regexp/Pattern/License/Parts.pm | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/lib/Regexp/Pattern/License.pm b/lib/Regexp/Pattern/License.pm
index 6c4f1ef..75d1080 100644
--- a/lib/Regexp/Pattern/License.pm
+++ b/lib/Regexp/Pattern/License.pm
@@ -490,7 +490,8 @@ our %RE = (
 		name    => 'MIT-feh',
 		caption => 'MIT (feh)',
 		tags    => ['mit'],
-		pat     => qr/$P{ack_doc_pkg_use}/,
+		pat =>
+			qr/$P{perm_granted}, $P{free_charge}, $P{to_pers} $P{the_sw}, $P{to_deal_the_sw_rights} $P{to_mod_sublic} $P{sw}, and $P{to_perm_pers}, $P{subj_cond}:? $P{copr_perm_incl} in $P{sw_doc} and $P{ack_doc_pkg_use}\./,
 	},
 	mit_new => {
 		'name.alt.org.spdx'      => 'MIT',
diff --git a/lib/Regexp/Pattern/License/Parts.pm b/lib/Regexp/Pattern/License/Parts.pm
index 65f104c..c0eccbb 100644
--- a/lib/Regexp/Pattern/License/Parts.pm
+++ b/lib/Regexp/Pattern/License/Parts.pm
@@ -45,15 +45,29 @@ our %RE = (
 		pat =>
 			qr/this software and associated documentation files \(the "?Material"?\)/
 	},
+	sw_doc => { pat => qr/all copies of the Software and its documentation/ },
+	the_sw => {
+		pat =>
+			qr/this software and associated documentation files \(the "?Software"?\)/
+	},
 
 	# rights
 	perm_granted => { pat => qr/Permission is hereby granted/ },
 	to_deal_mat =>
 		{ pat => qr/to deal in the Materials without restriction/ },
+	to_deal_the_sw_rights => {
+		pat =>
+			qr/to deal in the Software without restriction, including without limitation the rights/
+	},
 	to_mod_sublic => {
 		pat =>
 			qr/to use, copy, modify, merge, publish, distribute, sublicense, and\/or sell copies of/
 	},
+	to_perm_pers => {
+		caption => 'to permit person',
+		pat =>
+			qr/to permit persons to whom the Software is furnished to do so/
+	},
 
 	# agents
 	to_pers => { pat => qr/to any person obtaining a copy of/ },
@@ -66,6 +80,7 @@ our %RE = (
 	},
 
 	# conditions
+	subj_cond           => { pat => qr/subject to the following conditions/ },
 	ack_doc_mat_pkg_use => {
 		pat =>
 			qr/acknowledgment shall be given in the documentation, materials and software packages that this Software was used/
@@ -90,6 +105,10 @@ our %RE = (
 		pat =>
 			qr/If you change this software and redistribute parts or all of it in any form, you must make the source code of the altered version of this software available/
 	},
+	copr_perm_incl => {
+		pat =>
+			qr/The above copyright notice and this permission notice shall be included/
+	},
 	namenot =>
 		{ pat => qr/[Tt]he names?(?: \S+){1,15} (?:may|must|shall) not/ },
 	neithername => {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/licensecheck.git