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 b4f0b0037129b0e952251d129b90d4c6cef49447 Author: Dominique Dumont <d...@debian.org> Date: Fri May 8 18:56:09 2015 +0200 scanner: improved copyright cleanup (for icedove) --- lib/Dpkg/Copyright/Scanner.pm | 10 ++++++---- t/scanner/examples/moarvm.out | 3 +-- t/scanner/examples/sdl2.out | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm index b7cfe29..1352b36 100644 --- a/lib/Dpkg/Copyright/Scanner.pm +++ b/lib/Dpkg/Copyright/Scanner.pm @@ -116,11 +116,11 @@ sub scan_files ( %args ) { $l =~ s/\s+(GENERATED FILE)//; $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; + $l =~ s/\bBSD \((\d) clause\)/BSD-$1-clause/; + $l =~ s/\bpublic domain\b/public-domain/i; # this is very fragile. may need to change license-check to output license keyword - $l =~ s/ / and /g unless $l =~ /\bor\b/; + $l =~ s/ / or /g unless $l =~ /\bor\b/; $c =~ s/'//g; $c =~ s/^©\s*//; @@ -128,10 +128,12 @@ sub scan_files ( %args ) { $c =~ s/(\d+)\s*-\s*(\d+)/$1-$2/g; $c =~ s/\b(\d{4}),?\s+([\S^\d])/$1, $2/g; $c =~ s/\s+by\s+//g; - $c =~ s/all\s+rights?\s+reserved[\s\.]*//gi; + $c =~ s/(\\n)*all\s+rights?\s+reserved\.?(\\n)*\s*//gi; # yes there are literal \n $c = 'no-info-found' if $c =~ /^\*No/; $c =~ s/\(r\)//g; $c =~ s!^[\s,/*]|[\s,/*-]+$!!g; + $c =~ s/--/-/g; + $c =~ s!\s+\*/\s+! !; $c = __pack_copyright($c); diff --git a/t/scanner/examples/moarvm.out b/t/scanner/examples/moarvm.out index 0bc2e38..ca17cbd 100644 --- a/t/scanner/examples/moarvm.out +++ b/t/scanner/examples/moarvm.out @@ -167,9 +167,8 @@ Copyright: 2004, Internet Systems Consortium, Inc. ("ISC") License: ISC Files: 3rdparty/libuv/src/unix/android-ifaddrs.c -Copyright: 2014, Emergya (Cloud4all, FP7 +Copyright: 2014, Emergya (Cloud4all, FP7/2007-2013, grant agreement n° 289016) 2013, Kenneth MacKay - 2007-2013, grant agreement n° 289016) License: BSD-2-clause Files: 3rdparty/libuv/src/unix/atomic-ops.h diff --git a/t/scanner/examples/sdl2.out b/t/scanner/examples/sdl2.out index d3423c7..116fd44 100644 --- a/t/scanner/examples/sdl2.out +++ b/t/scanner/examples/sdl2.out @@ -10,7 +10,7 @@ Files: include/SDL_egl.h include/SDL_opengles2.h Copyright: 2008, 2009, The Khronos Group Inc 1997-2014, Sam Lantinga <slou...@libsdl.org> -License: Zlib and Expat +License: Zlib or Expat Files: src/* Copyright: 1997-2014, Sam Lantinga <slou...@libsdl.org> @@ -55,7 +55,7 @@ Copyright: 1998, Gareth McCaughan License: UNKNOWN Files: src/test/SDL_test_font.c -Copyright: A. Schiffler 2012, */ / 1997-2014, Sam Lantinga <slou...@libsdl.org> +Copyright: A. Schiffler 2012, / 1997-2014, Sam Lantinga <slou...@libsdl.org> License: Zlib Files: src/test/SDL_test_md5.c -- 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