[firmware-free] 16/19: check_upstream.py: Recognise GPLv3 and GPL dual-licenced files

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch master
in repository firmware-free.

commit dbc0911e1894efc94c4830b0ecc750ef35e3e300
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Oct 18 04:45:10 2015 +0100

    check_upstream.py: Recognise GPLv3 and GPL dual-licenced files
    
    [bwh: Cherry-picked from firmware-nonfree commit
     5adb87776f79b98d190df2d7eaec2ce5d7e27e51]
---
 debian/bin/check_upstream.py | 2 +-
 debian/changelog             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/bin/check_upstream.py b/debian/bin/check_upstream.py
index 7c33d81..bc8db3c 100755
--- a/debian/bin/check_upstream.py
+++ b/debian/bin/check_upstream.py
@@ -40,7 +40,7 @@ def check_section(section):
                 else DistState.non_free)
     elif re.match(r'^(?:D|Red)istributable\b', section.licence):
         return DistState.non_free
-    elif re.match(r'^GPL(?:v2|\+)?\b', section.licence):
+    elif re.match(r'^GPL(?:v[23]|\+)?\b|^Dual GPL(?:v[23])?/', section.licence):
         return (DistState.free if is_source_available(section)
                 else DistState.undistributable)
     else:
diff --git a/debian/changelog b/debian/changelog
index 7081ca1..1b28a66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ firmware-free (20130117-1) UNRELEASED; urgency=medium
   * Update to linux-support 4.5.0-2
   * check_upstream.py: Report possibly non-free or undistributable files that
     are not excluded
+  * check_upstream.py: Recognise GPLv3 and GPL dual-licenced files
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 16 Aug 2015 18:43:29 +0200
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/firmware-free.git