[libconfig-model-dpkg-perl] 04/08: Scanner: handle "zlib and expat" license (very fragile...)

[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 7097631d181e138b6ec1aff9ebab42bc5d25b718
Author: Dominique Dumont <dod at debian.org>
Date:   Sat Jan 17 21:09:32 2015 +0100

    Scanner: handle "zlib and expat" license (very fragile...)
---
 lib/Dpkg/Copyright/Scanner.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm
index e859e4f..c7238f0 100644
--- a/lib/Dpkg/Copyright/Scanner.pm
+++ b/lib/Dpkg/Copyright/Scanner.pm
@@ -73,10 +73,14 @@ sub scan_files {
         $l =~ s/\s+\(v([^)]+)\)/-$1/;
         $l =~ s/^\s*(GENERATED FILE)/UNKNOWN/;
         $l =~ s/\s+(GENERATED FILE)//;
-        $l =~ s/^\s*zlib\/libpng$/Zlib/;
-        $l =~ s/^\s*MIT\/X11 \(BSD like\)$/Expat/;
+        $l =~ s/\bzlib\/libpng\b/Zlib/;
+        $l =~ s/\bMIT\/X11 \(BSD like\)/Expat/;
         $l =~ s/^\s*BSD \((\d) clause\)$/BSD-$1-clause/;
         $l =~ s/^\s*public domain$/public-domain/i;
+
+        # this is very fragile. may need to change license-check to output license keyword
+        $l =~ s/ / and /g;
+
         $c =~ s/'//g;
         $c =~ s/^©\s*//;
         $c =~ s/(?<=\b\d{4})\s*-\s*\d{4}(?=\s*-\s*(\d{4})\b)//g;

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