[devscripts] 01/01: licensecheck: parse (c) owner with email like info at foo.com

[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 88e0770dcd127dd97ec505def4eb1bf5d7fe374d
Author: Dominique Dumont <dod at debian.org>
Date:   Wed Feb 24 11:29:45 2016 +0100

    licensecheck: parse (c) owner with email like info at foo.com
    
    The info in the email did match the copyright_disindicator_regex I've
    tweaked the regexp to not ditch the data if "info" is followed by
    "@". This still looks quite brittle though...
---
 debian/changelog               |  4 ++++
 scripts/licensecheck.pl        |  7 ++++---
 test/licensecheck/libuv-isc.am | 24 ++++++++++++++++++++++++
 test/test_licensecheck         |  4 ++++
 4 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0f700fb..a68352c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ devscripts (2.16.2) UNRELEASED; urgency=medium
       tests.
     + Reactivate --no-verbose mode.  Closes: #815645 
 
+  [ Dominique Dumont ]
+  * licensecheck:
+    - parse (c) owner with email like info at foo.com
+
  -- Osamu Aoki <osamu at debian.org>  Sat, 13 Feb 2016 22:10:05 +0900
 
 devscripts (2.16.1) unstable; urgency=medium
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 161505a..ca8288b 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -244,15 +244,16 @@ my $copyright_indicator_regex
 
 my $copyright_indicator_regex_with_capture = qr!$copyright_indicator_regex(?::\s*|\s+)(\S.*)$!lix;
 
+# avoid ditching things like <info at foo.com>
 my $copyright_disindicator_regex
-    = qr!
-	    \b(?:info(?:rmation)?	# Discussing copyright information
+    = qr{
+	    \b(?:info(?:rmation)?(?!@)	# Discussing copyright information
             |(notice|statement|claim|string)s?	# Discussing the notice
             |is|in|to        # Part of a sentence
             |(holder|owner)s?       # Part of a sentence
             |ownership              # Part of a sentence
             )\b
-        !ix;
+        }ix;
 
 my $copyright_predisindicator_regex
     = qr!(
diff --git a/test/licensecheck/libuv-isc.am b/test/licensecheck/libuv-isc.am
new file mode 100644
index 0000000..e9cd24c
--- /dev/null
+++ b/test/licensecheck/libuv-isc.am
@@ -0,0 +1,24 @@
+# Copyright (c) 2013, Ben Noordhuis <info at bnoordhuis.nl>
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ACLOCAL_AMFLAGS = -I m4
+
+AM_CPPFLAGS = -I$(top_srcdir)/include \
+              -I$(top_srcdir)/src
+
+include_HEADERS=include/uv.h include/uv-errno.h include/uv-threadpool.h include/uv-version.h
+
+CLEANFILES =
+
+lib_LTLIBRARIES = libuv.la
diff --git a/test/test_licensecheck b/test/test_licensecheck
index 67e97aa..0a9a504 100755
--- a/test/test_licensecheck
+++ b/test/test_licensecheck
@@ -129,6 +129,10 @@ testCDDL() {
     license2 "-m --copyright" "cddl.h" "CDDL	2006 Sun Microsystems, Inc. All rights reserved"
 }
 
+testISC() {
+    license2 "-m --copyright" "libuv-isc.am" "ISC	2013, Ben Noordhuis <info at bnoordhuis.nl>"
+}
+
 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