[licensecheck] 97/112: Tidy Regexp::Pattern::License::Pattern: Rename pattern retain_notice → note_invar.

[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 c5bf29c554606bc43f4180379155987bde8586a2
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Nov 25 20:05:38 2016 +0100

    Tidy Regexp::Pattern::License::Pattern: Rename pattern retain_notice → note_invar.
---
 lib/Regexp/Pattern/License.pm       |  6 +++---
 lib/Regexp/Pattern/License/Parts.pm | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/Regexp/Pattern/License.pm b/lib/Regexp/Pattern/License.pm
index 6ea3161..7885dde 100644
--- a/lib/Regexp/Pattern/License.pm
+++ b/lib/Regexp/Pattern/License.pm
@@ -370,7 +370,7 @@ our %RE = (
 		name => 'Cube',
 		tags => ['zlib'],
 		pat =>
-			qr/$P{origin_no_misrepresent}.*?$P{derive_altermark}.*?$P{retain_notice}.*?$P{derive_no_relicense}/,
+			qr/$P{origin_no_misrepresent}.*?$P{derive_altermark}.*?$P{note_invar}.*?$P{derive_no_relicense}/,
 	},
 	curl => {
 		tags => ['mit'],
@@ -391,7 +391,7 @@ our %RE = (
 		name => 'Eurosym',
 		tags => ['zlib'],
 		pat =>
-			qr/$P{origin_no_misrepresent}.*?$P{derive_altermark}.*?$P{derive_share}.*?$P{retain_notice}/,
+			qr/$P{origin_no_misrepresent}.*?$P{derive_altermark}.*?$P{derive_share}.*?$P{note_invar}/,
 	},
 	fsfap => {
 		name    => 'FSFAP',
@@ -580,7 +580,7 @@ END
 		caption => 'zlib/libpng',
 		tags    => ['zlib'],
 		pat =>
-			qr/$P{origin_no_misrepresent}.*?$P{derive_altermark}.*?$P{retain_notice}/,
+			qr/$P{origin_no_misrepresent}.*?$P{derive_altermark}.*?$P{note_invar}/,
 	},
 	zlib_acknowledgement => {
 		name    => 'zlib-acknowledgement',
diff --git a/lib/Regexp/Pattern/License/Parts.pm b/lib/Regexp/Pattern/License/Parts.pm
index 11a9c6d..fb3458e 100644
--- a/lib/Regexp/Pattern/License/Parts.pm
+++ b/lib/Regexp/Pattern/License/Parts.pm
@@ -81,6 +81,8 @@ Patterns each covering a single part, e.g. a clause or a disclaimer phrase.
 
 =item * note_cpyr_perm
 
+=item * note_invar
+
 =item * origin_no_misrepresent
 
 =item * origin_no_misrepresent_ack
@@ -101,8 +103,6 @@ Patterns each covering a single part, e.g. a clause or a disclaimer phrase.
 
 =item * repro_notice_cond_discl
 
-=item * retain_notice
-
 =item * retain_notice_cond_discl
 
 =item * use_sw_doc_any
@@ -292,6 +292,11 @@ our %RE = (
 		pat =>
 			qr/provided that the above copyright notice and this permission notice appear in all copies/,
 	},
+	note_invar => {
+		caption => 'notice (invariable)',
+		tags    => ['clause'],
+		pat     => qr/This notice may not be removed or altered/,
+	},
 	origin_no_misrepresent => {
 		caption => 'origin (no misrepresentation)',
 		tags    => ['clause'],
@@ -340,11 +345,6 @@ our %RE = (
 		pat =>
 			qr/$redist_bin must reproduce $notice, $cond and $discl in $doc and\/or $other_mat/,
 	},
-	retain_notice => {
-		caption => 'retain in source (notice)',
-		tags    => ['clause'],
-		pat     => qr/This notice may not be removed or altered/,
-	},
 	retain_notice_cond_discl => {
 		caption => 'retain in source (notice, conditions, disclaimer)',
 		tags    => ['clause'],

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