[firmware-nonfree] 09/24: 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-nonfree.

commit 5adb87776f79b98d190df2d7eaec2ce5d7e27e51
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
---
 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 1879f11..cf7cb8f 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 d5a9f14..9f15858 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ firmware-nonfree (20151018-1) UNRELEASED; urgency=medium
   * debian/bin: Use Python 3 (as assumed by linux-support-4.2.0-1)
   * check_upstream.py: Report possibly undistributable files that are not
     excluded
+  * check_upstream.py: Recognise GPLv3 and GPL dual-licenced files
 
   [ maximilian attems ]
   * iwlwifi: Update Intel Wireless 3160, 7260, 7265 and 7265D firmware version

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