[licensecheck] 95/112: Tidy Regexp::Pattern::License::Pattern: Rename pattern promo_no_author → nopromo_neither.
Jonas Smedegaard
dr at jones.dk
Fri Nov 25 22:02:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
js pushed a commit to branch master
in repository licensecheck.
commit 96f419a5baa52601046f37ad1c9e994a12d5e3d4
Author: Jonas Smedegaard <dr at jones.dk>
Date: Fri Nov 25 15:56:03 2016 +0100
Tidy Regexp::Pattern::License::Pattern: Rename pattern promo_no_author → nopromo_neither.
---
lib/Regexp/Pattern/License.pm | 6 +++---
lib/Regexp/Pattern/License/Parts.pm | 16 ++++++++--------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib/Regexp/Pattern/License.pm b/lib/Regexp/Pattern/License.pm
index 3e61cfb..6ea3161 100644
--- a/lib/Regexp/Pattern/License.pm
+++ b/lib/Regexp/Pattern/License.pm
@@ -243,7 +243,7 @@ our %RE = (
'name.alt.org.debian' => 'BSD-3-clause',
caption => 'BSD (3 clause)',
tags => ['bsd'],
- pat => qr/$P{repro_notice_cond_discl}\b[^a-zA-Z]+$P{promo_no_author}/,
+ pat => qr/$P{repro_notice_cond_discl}\b[^a-zA-Z]+$P{nopromo_neither}/,
},
bsd_4_clause => {
name => 'BSD-4-Clause',
@@ -651,7 +651,7 @@ $RE{'clause_advertising_always'} = {
$RE{'clause_non_endorsement'} = {
caption => 'non-endorsement clause',
tags => ['trait'],
- pat => qr/$P{promo_no_author}/,
+ pat => qr/$P{nopromo_neither}/,
};
$RE{'fsf_unlimited'} = {
@@ -735,7 +735,7 @@ $RE{'bsd'} = {
caption => 'BSD (unspecified)',
tags => ['group'],
pat =>
- qr/$P{repro_notice_cond_discl}(?:(?:[^a-zA-Z]+$P{ad_verbatim}.*)?[^a-zA-Z]+$P{promo_no_author})?/,
+ qr/$P{repro_notice_cond_discl}(?:(?:[^a-zA-Z]+$P{ad_verbatim}.*)?[^a-zA-Z]+$P{nopromo_neither})?/,
};
$RE{'gnu'} = {
diff --git a/lib/Regexp/Pattern/License/Parts.pm b/lib/Regexp/Pattern/License/Parts.pm
index 21dc6bb..87233a9 100644
--- a/lib/Regexp/Pattern/License/Parts.pm
+++ b/lib/Regexp/Pattern/License/Parts.pm
@@ -77,6 +77,8 @@ Patterns each covering a single part, e.g. a clause or a disclaimer phrase.
=item * name_no_ad
+=item * nopromo_neither
+
=item * note_cpyr_perm
=item * origin_no_misrepresent
@@ -97,8 +99,6 @@ Patterns each covering a single part, e.g. a clause or a disclaimer phrase.
=item * permission_person_sw_doc
-=item * promo_no_author
-
=item * repro_notice_cond_discl
=item * retain_notice
@@ -280,6 +280,12 @@ our %RE = (
tags => ['clause'],
pat => qr/without specific, written prior permission/,
},
+ nopromo_neither => {
+ caption => 'no promotion (neither)',
+ tags => ['clause'],
+ pat =>
+ qr/(?:$no_authors may|The name.*? (?:may|must) not) be used to $promote $no_permit/,
+ },
note_cpyr_perm => {
caption => 'notice (copyright + permission)',
tags => ['clause'],
@@ -328,12 +334,6 @@ our %RE = (
pat =>
qr/$granted, $no_charge, $to_person of $sw_docfiles \(the "?Software"?\)/,
},
- promo_no_author => {
- caption => 'no author in promos',
- tags => ['clause'],
- pat =>
- qr/(?:$no_authors may|The name.*? (?:may|must) not) be used to $promote $no_permit/,
- },
repro_notice_cond_discl => {
caption => 'reproduce in doc (notice, conditions, disclaimer)',
tags => ['clause'],
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/licensecheck.git
More information about the Pkg-perl-cvs-commits
mailing list