[devscripts] 01/05: licensecheck: Add handling for a variation of 3 clause BSD.

[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 4bb98d56d89a3ebbff9ccd7bcb7bb521b5b36abd
Author: James McCoy <jamessan at debian.org>
Date:   Sat Jan 11 19:07:00 2014 -0500

    licensecheck: Add handling for a variation of 3 clause BSD.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog        | 1 +
 scripts/licensecheck.pl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 49efc95..3976508 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ devscripts (2.13.10) UNRELEASED; urgency=low
 
   [ James McCoy ]
   * chdist: Ensure error messages end with an EOL.  (Closes: #734307)
+  * licensecheck: Add handling for a variation of 3 clause BSD.
 
  -- Jakub Wilk <jwilk at debian.org>  Fri, 27 Dec 2013 18:39:11 +0100
 
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index d2caf8f..5b0eee5 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -496,7 +496,7 @@ sub parselicense {
     if ($licensetext =~ /THIS SOFTWARE IS PROVIDED .*AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY/) {
 	if ($licensetext =~ /All advertising materials mentioning features or use of this software must display the following acknowledge?ment.*This product includes software developed by/i) {
 	    $license = "BSD (4 clause) $license";
-	} elsif ($licensetext =~ /(The name .*? may not|Neither the (names? .*?|authors?) nor the names of( (its|their|other|any))? contributors may) be used to endorse or promote products derived from this software/i) {
+	} elsif ($licensetext =~ /(The name(?:\(s\))? .*? may not|Neither the (names? .*?|authors?) nor the names of( (its|their|other|any))? contributors may) be used to endorse or promote products derived from this software/i) {
 	    $license = "BSD (3 clause) $license";
 	} elsif ($licensetext =~ /Redistributions of source code must retain the above copyright notice/i) {
 	    $license = "BSD (2 clause) $license";

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