[libconfig-model-dpkg-perl] 01/02: Scanner: skip debian changelog and copyright files

[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 8fe66646cd5266308966f40f2cc5bccaab84d4e4
Author: Dominique Dumont <dod at debian.org>
Date:   Sat Jan 30 17:39:07 2016 +0100

    Scanner: skip debian changelog and copyright files
---
 lib/Dpkg/Copyright/Scanner.pm      |  1 +
 t/scanner/examples/open-nebula.out |  9 ---------
 t/scanner/examples/rakudo-star.out | 10 +++++++---
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm
index 806d07f..7e96a6f 100644
--- a/lib/Dpkg/Copyright/Scanner.pm
+++ b/lib/Dpkg/Copyright/Scanner.pm
@@ -127,6 +127,7 @@ sub scan_files ( %args ) {
         # say "found: $line";
         my ($f,$l,$c) = split /\t/, $line; 
         $f =~ s!\./!!;
+        next if $f =~ m!debian/(copyright|changelog)$!; # too confusing
         next if $files->{$f}; # file already parsed
 
         $l =~ s/([*?\\])/\\$1/g;
diff --git a/t/scanner/examples/open-nebula.out b/t/scanner/examples/open-nebula.out
index bc4877a..26824c6 100644
--- a/t/scanner/examples/open-nebula.out
+++ b/t/scanner/examples/open-nebula.out
@@ -7,15 +7,6 @@ Copyright: 2002-2015, OpenNebula Project, OpenNebula Systems (formerly C12G Labs
 License: Apache-2.0
 
 Files: debian/*
-Copyright: line 66: Duplicate field  / Fix lintian warning W: opennebula source:
-License: UNKNOWN
-
-Files: debian/copyright
-Copyright: 2010, 2011, VMware, Inc
- 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
-License: UNKNOWN
-
-Files: debian/manpages/*
 Copyright: 2002-2011, Distributed Systems Architecture Group, Universidad
 License: UNKNOWN
 
diff --git a/t/scanner/examples/rakudo-star.out b/t/scanner/examples/rakudo-star.out
index bec7de9..9c4961d 100644
--- a/t/scanner/examples/rakudo-star.out
+++ b/t/scanner/examples/rakudo-star.out
@@ -1,5 +1,5 @@
 Files: *
-Copyright: 2000-2015, The Perl Foundation
+Copyright: 2006-2015, The Perl Foundation
 License: UNKNOWN
 
 Files: modules/*
@@ -19,11 +19,15 @@ Copyright: 2000-2006, The Perl Foundation
 License: Artistic-2.0
 
 Files: modules/doc/html/*
+Copyright: 2005, 2015, jQuery Foundation, Inc. | jquery.org/license
+License: UNKNOWN
+
+Files: modules/doc/html/css/*
 Copyright: 2015, jQuery Foundation and other contributors; Licensed MIT
 License: UNKNOWN
 
-Files: modules/doc/html/js/jquery-1.11.3.min.js
-Copyright: 2005, 2015, jQuery Foundation, Inc. | jquery.org/license
+Files: modules/doc/html/js/jquery-ui.min.js
+Copyright: 2015, jQuery Foundation and other contributors; Licensed MIT
 License: UNKNOWN
 
 Files: modules/json_fast/*

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