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 45d51abcce67fb74a808e06928c62a879da43942
Author: Dominique Dumont <d...@debian.org>
Date: Fri May 8 18:43:35 2015 +0200
scanner: fix parsing of multi copyright owners
---
lib/Dpkg/Copyright/Scanner.pm | 2 +-
t/scanner/pack_copyright.t | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm
index c33a377..1685e80 100644
--- a/lib/Dpkg/Copyright/Scanner.pm
+++ b/lib/Dpkg/Copyright/Scanner.pm
@@ -180,7 +180,7 @@ sub __pack_copyright ($r) {
return $r if $r eq 'no-info-found';
my %cop;
$r =~ /^[\s\W]+|[\s\W]+$/g;
- foreach my $c ( split( m!\s*/\s*!, $r)) {
+ foreach my $c ( split( m!\s+/\s+!, $r)) {
my ($owner, @data) = __split_copyright($c);
return $r unless defined $owner;
$cop{$owner} ||= [] ;
diff --git a/t/scanner/pack_copyright.t b/t/scanner/pack_copyright.t
index 170b7ea..89e3c77 100644
--- a/t/scanner/pack_copyright.t
+++ b/t/scanner/pack_copyright.t
@@ -25,6 +25,10 @@ my @tests = (
[
q!2004-2015, Oliva f00 Oberto / 2001-2010, Paul bar Stevenson !,
"2004-2015, Oliva f00 Oberto\n 2001-2010, Paul bar Stevenson"
+ ],
+ [
+ '2005, Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) /
2005, Michael Schuerig (http://www.schuerig.de/michael/) / 2005, Jon Tirsen
(http://www.tirsen.com)',
+ "2005, Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)\n
2005, Michael Schuerig (http://www.schuerig.de/michael/)\n 2005, Jon Tirsen
(http://www.tirsen.com)"
]
);
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
