[libconfig-model-dpkg-perl] 18/27: Scanner: handle license like "foo or bar"

[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 libconfig-model-dpkg-perl.

commit 5643b78e1c75267ce9ddc0865ad1ced2abfd886a
Author: Dominique Dumont <dod at debian.org>
Date:   Tue Dec 30 20:46:13 2014 +0100

    Scanner: handle license like "foo or bar"
---
 lib/Dpkg/Copyright/Scanner.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm
index 8822741..e2df2f1 100644
--- a/lib/Dpkg/Copyright/Scanner.pm
+++ b/lib/Dpkg/Copyright/Scanner.pm
@@ -74,6 +74,7 @@ sub scan_files {
         $l =~ s/([*?\\])/\\$1/g;
         $l =~ s/\s*\(unversioned\/unknown version\)//;
         $l =~ s/\s*\(with incorrect FSF address\)//;
+        $l =~ s/(\w+)\s+\(v([^)]+) or v([^)]+)\)/uc($1)."-$2 or ".uc($1)."-$3"/e;
         $l =~ s/\s+\(v([^)]+) or later\)/-$1+/;
         $l =~ s/\s+\(v([^)]+)\)/-$1/;
         $l =~ s/^\s*(GENERATED FILE)/UNKNOWN/;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git