[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/01: c/source-copyright: Fix handling punctuation in license expressions



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

jwilk pushed a commit to branch master
in repository lintian.

commit 35917237fbc5270f89784ec7dd13daa2534ce2b2
Author: Jakub Wilk <jwilk@debian.org>
Date:   Wed Oct 19 21:47:50 2016 +0200

    c/source-copyright: Fix handling punctuation in license expressions
---
 checks/source-copyright.pm | 2 +-
 debian/changelog           | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/checks/source-copyright.pm b/checks/source-copyright.pm
index 29c03bd..0d7dde3 100644
--- a/checks/source-copyright.pm
+++ b/checks/source-copyright.pm
@@ -494,7 +494,7 @@ sub parse_license {
     }else {
         $short_license = $license_block;
     }
-    $short_license =~ s/[(),]//;
+    $short_license =~ s/[(),]/ /g;
     if ($short_license =~ m/\A\s*\Z/) {
         tag 'empty-short-license-in-dep5-copyright',
           "(paragraph at line $line)";
diff --git a/debian/changelog b/debian/changelog
index ee449d0..b90cc76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ lintian (2.5.49) UNRELEASED; urgency=medium
   * checks/init.d.pm:
     + [JW] Don't require version constraint for lsb-base dependencies.
       The needed version has been available for many stable releases.
+  * checks/source-copyright.pm:
+    + [RA, JW] Fix handling punctuation characters in license expressions
+      in machine-readable copyright files.  (Closes: #841356)
   * checks/watch-file.pm:
     + [JW] Assume that watch files containing the pgpmode option (different
       than "none") verify upstream signature.  Thanks to Robert Luberda for

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


Reply to: