[licensecheck] 98/112: Tidy Regexp::Pattern::License::Pattern: Rename pattern retain_notice_cond_discl → note_retain_notice_cond_discl.

[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 9f9119c2c85efda72dfe1e5aa98e62320d4e36a5
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Nov 25 20:12:59 2016 +0100

    Tidy Regexp::Pattern::License::Pattern: Rename pattern retain_notice_cond_discl → note_retain_notice_cond_discl.
---
 lib/Regexp/Pattern/License.pm       |  2 +-
 lib/Regexp/Pattern/License/Parts.pm | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/Regexp/Pattern/License.pm b/lib/Regexp/Pattern/License.pm
index 7885dde..a65a791 100644
--- a/lib/Regexp/Pattern/License.pm
+++ b/lib/Regexp/Pattern/License.pm
@@ -627,7 +627,7 @@ Patterns each covering a single trait occuring in licenses.
 $RE{'clause_retention'} = {
 	caption => 'retention clause',
 	tags    => ['trait'],
-	pat     => qr/$P{retain_notice_cond_discl}/,
+	pat     => qr/$P{note_retain_notice_cond_discl}/,
 };
 
 $RE{'clause_reproduction'} = {
diff --git a/lib/Regexp/Pattern/License/Parts.pm b/lib/Regexp/Pattern/License/Parts.pm
index fb3458e..2eda825 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_retain_notice_cond_discl
+
 =item * origin_no_misrepresent
 
 =item * origin_no_misrepresent_ack
@@ -103,8 +105,6 @@ Patterns each covering a single part, e.g. a clause or a disclaimer phrase.
 
 =item * repro_notice_cond_discl
 
-=item * retain_notice_cond_discl
-
 =item * use_sw_doc_any
 
 =item * version_later_para
@@ -297,6 +297,11 @@ our %RE = (
 		tags    => ['clause'],
 		pat     => qr/This notice may not be removed or altered/,
 	},
+	note_retain_notice_cond_discl => {
+		caption => 'notice (retain, notice + conditions + disclaimer)',
+		tags    => ['clause'],
+		pat     => qr/$redist_src must retain $notice,? $cond and $discl/,
+	},
 	origin_no_misrepresent => {
 		caption => 'origin (no misrepresentation)',
 		tags    => ['clause'],
@@ -345,11 +350,6 @@ our %RE = (
 		pat =>
 			qr/$redist_bin must reproduce $notice, $cond and $discl in $doc and\/or $other_mat/,
 	},
-	retain_notice_cond_discl => {
-		caption => 'retain in source (notice, conditions, disclaimer)',
-		tags    => ['clause'],
-		pat     => qr/$redist_src must retain $notice,? $cond and $discl/,
-	},
 	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