[licensecheck] 16/26: Split License::Parts pattern copr_perm_incl → incl + copr_perm.

[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 441fc8f048d3450c66ad626669458bd67467d723
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Jan 24 02:16:01 2017 +0100

    Split License::Parts pattern copr_perm_incl → incl + copr_perm.
---
 lib/Regexp/Pattern/License.pm       |  4 ++--
 lib/Regexp/Pattern/License/Parts.pm | 21 +++++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/lib/Regexp/Pattern/License.pm b/lib/Regexp/Pattern/License.pm
index d437514..87df097 100644
--- a/lib/Regexp/Pattern/License.pm
+++ b/lib/Regexp/Pattern/License.pm
@@ -486,14 +486,14 @@ our %RE = (
 		tags    => ['mit'],
 		pat     => qr/$P{ack_pub_use_nosrc}/,
 		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{cp_sw_copr}\. $P{ack_pub_use_nosrc}\. This includes acknowledgments in either Copyright notices, Manuals, Publicity and Marketing documents or any documentation provided with any product containing this software\. $P{license_not_lib}\./,
+			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{retain_copr_perm_sw_copr}\. $P{ack_pub_use_nosrc}\. This includes acknowledgments in either Copyright notices, Manuals, Publicity and Marketing documents or any documentation provided with any product containing this software\. $P{license_not_lib}\./,
 	},
 	mit_feh => {
 		name    => 'MIT-feh',
 		caption => 'MIT (feh)',
 		tags    => ['mit'],
 		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{cp_sw_doc} and $P{ack_doc_pkg_use}\./,
+			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{retain_copr_perm_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 2e443da..6d00fca 100644
--- a/lib/Regexp/Pattern/License/Parts.pm
+++ b/lib/Regexp/Pattern/License/Parts.pm
@@ -45,9 +45,11 @@ our %RE = (
 		pat =>
 			qr/this software and associated documentation files \(the "?Material"?\)/
 	},
+	cp_sw => { pat => qr/all copies of the Software/ },
 	cp_sw_copr =>
 		{ pat => qr/all copies of the Software and its Copyright notices/ },
-	cp_sw_doc => { pat => qr/all copies of the Software and its documentation/ },
+	cp_sw_doc =>
+		{ pat => qr/all copies of the Software and its documentation/ },
 	the_sw => {
 		pat =>
 			qr/this software and associated documentation files \(the "?Software"?\)/
@@ -107,10 +109,7 @@ 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/
-	},
+	incl => { pat => qr/shall be included/ },
 	namenot =>
 		{ pat => qr/[Tt]he names?(?: \S+){1,15} (?:may|must|shall) not/ },
 	neithername => {
@@ -217,10 +216,6 @@ our %RE = (
 	# combinations
 	discl_name_warranties =>
 		{ pat => qr/(?:\S+ ){1,15}DISCLAIMS? ALL WARRANTIES/ },
-	note_marketing => {
-		pat =>
-			qr/shall be included in all copies of the Software, its documentation and marketing/
-	},
 	permission_use_fee_agree =>
 		{ pat => qr/and without a written agreement/ },
 );
@@ -231,8 +226,14 @@ $RE{note_copr_perm}{pat}
 	= qr/provided that$I? $RE{copr_perm}{pat} appear in all copies/;
 $RE{note_copr_perm_doc}{pat}
 	= qr/both $RE{copr_perm}{pat} appear in supporting documentation/;
+$RE{note_marketing}{pat}
+	= qr/$RE{incl}{pat} in $RE{cp_sw}{pat}, its documentation and marketing/;
 $RE{retain_copr_perm_subst}{pat}
-	= qr/$RE{copr_perm}{pat} shall be included in all copies or substantial portions of the Software/;
+	= qr/$RE{copr_perm}{pat} $RE{incl}{pat} in all copies or substantial portions of the Software/;
+$RE{retain_copr_perm_sw_copr}{pat}
+	= qr/$RE{copr_perm}{pat} $RE{incl}{pat} in $RE{cp_sw_copr}{pat}/;
+$RE{retain_copr_perm_sw_doc}{pat}
+	= qr/$RE{copr_perm}{pat} $RE{incl}{pat} in $RE{cp_sw_doc}{pat}/;
 $RE{retain_notice_cond_discl}{pat}
 	= qr/Redistributions of source code must retain $RE{copr_cond_discl}{pat}/;
 $RE{nopromo_except}{pat}

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