[devscripts] 19/22: ignore coyright (claim|is|in), and fix test

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository devscripts.

commit 1ed14a143053020d15401c96207e670760c8c41d
Author: Philip Hands <phil at hands.com>
Date:   Wed Feb 20 13:37:00 2013 +0000

    ignore coyright (claim|is|in), and fix test
---
 scripts/licensecheck.pl |    5 ++---
 test/test_licensecheck  |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index ea18d70..c3d8de5 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -329,9 +329,8 @@ sub parse_copyright {
 	)';
     my $copyright_disindicator_regex = '
 	\b(?:info(?:rmation)?	# Discussing copyright information
-	|(notice|statement)s?	# Discussing the notice
-	|string
-	|and|or                 # Part of a sentence
+	|(notice|statement|claim|string)s?	# Discussing the notice
+	|and|or|is|in           # Part of a sentence
 	|(holder|owner)s?       # Part of a sentence
 	|ownership              # Part of a sentence
 	)\b';
diff --git a/test/test_licensecheck b/test/test_licensecheck
index 5ddf3ae..f057467 100755
--- a/test/test_licensecheck
+++ b/test/test_licensecheck
@@ -92,7 +92,7 @@ testCommentsDetection() {
 }
 
 testFalsePositives() {
-    license2 "-m --copyright" "false-positives" "UNKNOWN	2013 Devscripts developers"
+    license2 "-m --copyright" "false-positives" "Public domain	2013 Devscripts developers"
 }
 
 testRegexpKiller() {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git