[devscripts] 13/16: licensecheck: fixed regexp used to detect discussion about © (Closes: #723723)

[dod at debian.org]

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

dod pushed a commit to branch master
in repository devscripts.

commit f117e093b0773aeac981ee612a49e9fd76ad3b76
Author: Dominique Dumont <dod at debian.org>
Date:   Thu May 14 17:57:47 2015 +0200

    licensecheck: fixed regexp used to detect discussion about © (Closes: #723723)
---
 scripts/licensecheck.pl  |  2 +-
 test/licensecheck/cddl.h | 26 ++++++++++++++++++++++++++
 test/test_licensecheck   |  4 ++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 0ec32cb..bb5f976 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -183,7 +183,7 @@ my $copyright_indicator_regex_with_capture = qr!$copyright_indicator_regex(?::\s
 
 my $copyright_disindicator_regex
     = qr!
-     ^\s*(?:info(?:rmation)?	# Discussing copyright information
+     \b(?:info(?:rmation)?	# Discussing copyright information
             |(notice|statement|claim|string)s?	# Discussing the notice
             |and|or|is|in|to        # Part of a sentence
             |(holder|owner)s?       # Part of a sentence
diff --git a/test/licensecheck/cddl.h b/test/licensecheck/cddl.h
new file mode 100644
index 0000000..6be450f
--- /dev/null
+++ b/test/licensecheck/cddl.h
@@ -0,0 +1,26 @@
+/*
+* CDDL HEADER START
+*
+* The contents of this file are subject to the terms of the
+* Common Development and Distribution License (the "License").
+* You may not use this file except in compliance with the License.
+*
+* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+* or http://www.opensolaris.org/os/licensing.
+* See the License for the specific language governing permissions
+* and limitations under the License.
+*
+* When distributing Covered Code, include this CDDL HEADER in each
+* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+* If applicable, add the following below this CDDL HEADER, with the
+* fields enclosed by brackets "[]" replaced with your own identifying
+* information: Portions Copyright [yyyy] [name of copyright owner]
+*
+* CDDL HEADER END
+*/
+/*
+* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+* Use is subject to license terms.
+*/
+
+/* For #723723 */
diff --git a/test/test_licensecheck b/test/test_licensecheck
index f16b0df..028c444 100755
--- a/test/test_licensecheck
+++ b/test/test_licensecheck
@@ -79,6 +79,10 @@ testMPL() {
     license "mpl-2.0-comma.sh" "MPL (v2.0)"
 }
 
+testCDDL() {
+    license2 "-m --copyright" "cddl.h" "CDDL	2006 Sun Microsystems, Inc. All rights reserved"
+}
+
 testMachine() {
     license2 "-m" "beerware.cpp" "Beerware"
     license2 "--machine" "lgpl-2.1.h" "LGPL (v2.1)"

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