This is an automated email from the git hooks/post-receive script.
js pushed a commit to branch master
in repository licensecheck.
commit 2260808a47f6b4940ccfb6e4e911f22ab3badc25
Author: Jonas Smedegaard <d...@jones.dk>
Date: Fri Nov 25 20:17:50 2016 +0100
Tidy Regexp::Pattern::License::Pattern: Rename pattern
repro_notice_cond_discl → note_repro_notice_cond_discl.
---
lib/Regexp/Pattern/License.pm | 10 ++++++----
lib/Regexp/Pattern/License/Parts.pm | 16 ++++++++--------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/lib/Regexp/Pattern/License.pm b/lib/Regexp/Pattern/License.pm
index a65a791..dc4db7d 100644
--- a/lib/Regexp/Pattern/License.pm
+++ b/lib/Regexp/Pattern/License.pm
@@ -236,14 +236,16 @@ our %RE = (
'name.alt.org.debian' => 'BSD-2-clause',
caption => 'BSD (2 clause)',
tags => ['bsd'],
- pat =>
qr/$P{repro_notice_cond_discl}\b[^a-zA-Z]+$P{asis_sw_by_name}/,
+ pat =>
+
qr/$P{note_repro_notice_cond_discl}\b[^a-zA-Z]+$P{asis_sw_by_name}/,
},
bsd_3_clause => {
name => 'BSD-3-Clause',
'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{nopromo_neither}/,
+ pat =>
+
qr/$P{note_repro_notice_cond_discl}\b[^a-zA-Z]+$P{nopromo_neither}/,
},
bsd_4_clause => {
name => 'BSD-4-Clause',
@@ -633,7 +635,7 @@ $RE{'clause_retention'} = {
$RE{'clause_reproduction'} = {
caption => 'reproduction clause',
tags => ['trait'],
- pat => qr/$P{repro_notice_cond_discl}/,
+ pat => qr/$P{note_repro_notice_cond_discl}/,
};
$RE{'clause_advertising'} = {
@@ -735,7 +737,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{nopromo_neither})?/,
+
qr/$P{note_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 2eda825..7a6a4f2 100644
--- a/lib/Regexp/Pattern/License/Parts.pm
+++ b/lib/Regexp/Pattern/License/Parts.pm
@@ -83,6 +83,8 @@ Patterns each covering a single part, e.g. a clause or a
disclaimer phrase.
=item * note_invar
+=item * note_repro_notice_cond_discl
+
=item * note_retain_notice_cond_discl
=item * origin_no_misrepresent
@@ -103,8 +105,6 @@ Patterns each covering a single part, e.g. a clause or a
disclaimer phrase.
=item * permission_person_sw_doc
-=item * repro_notice_cond_discl
-
=item * use_sw_doc_any
=item * version_later_para
@@ -297,6 +297,12 @@ our %RE = (
tags => ['clause'],
pat => qr/This notice may not be removed or altered/,
},
+ note_repro_notice_cond_discl => {
+ caption => 'notice (reproduce, notice + conditions +
disclaimer)',
+ tags => ['clause'],
+ pat =>
+ qr/$redist_bin must reproduce $notice, $cond and $discl
in $doc and\/or $other_mat/,
+ },
note_retain_notice_cond_discl => {
caption => 'notice (retain, notice + conditions + disclaimer)',
tags => ['clause'],
@@ -344,12 +350,6 @@ our %RE = (
pat =>
qr/$granted, $no_charge, $to_person of $sw_docfiles
\(the "?Software"?\)/,
},
- repro_notice_cond_discl => {
- caption => 'reproduce in doc (notice, conditions, disclaimer)',
- tags => ['clause'],
- pat =>
- qr/$redist_bin must reproduce $notice, $cond and $discl
in $doc and\/or $other_mat/,
- },
use_sw_doc_any => {
caption => 'usage (software and documentation, any purpose)',
tags => ['clause'],
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/licensecheck.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
