[libconfig-model-dpkg-perl] 01/03: update: 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 453d19c5486bf3d96a99db87eca51cdbb041bcef
Author: Dominique Dumont <dod at debian.org>
Date:   Wed Aug 23 21:01:42 2017 +0200

    update: skip debian changelog and copyright files
    
    skip copyright because there's no need to have recursive copyrights
    skip changelog because it's often contains log entries beginning with
    copyright and it's a collective work by nature.
---
 lib/Dpkg/Copyright/Scanner.pm      |  5 +++++
 t/scanner/examples/batmon.app.out  |  8 --------
 t/scanner/examples/open-nebula.out | 17 ++++++-----------
 t/scanner/examples/rakudo-star.out | 10 +++++++---
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm
index b8eb2d4..3854ed4 100644
--- a/lib/Dpkg/Copyright/Scanner.pm
+++ b/lib/Dpkg/Copyright/Scanner.pm
@@ -219,6 +219,11 @@ sub scan_files ( %args ) {
         $f =~ s!\./!!;
         next if $files->{$f}; # file already parsed
 
+        # skip copyright because there's no need to have recursive copyrights
+        # skip changelog because it's often contains log entries beginning with copyright
+        # and it's a collective work by nature.
+        next if $f =~  m!debian/(copyright|changelog)!;
+
         # filter out files user does not want checked
         if ( $f !~ $regexps{check} ) {
             # the ignore test should not be usefull as the files are ignored by licensecheck
diff --git a/t/scanner/examples/batmon.app.out b/t/scanner/examples/batmon.app.out
index 8ec8331..f58d648 100644
--- a/t/scanner/examples/batmon.app.out
+++ b/t/scanner/examples/batmon.app.out
@@ -6,14 +6,6 @@ Files: Resources/*
 Copyright: 1989, 1991, Free Software Foundation, Inc.
 License: UNKNOWN
 
-Files: debian/*
-Copyright: Rewrite in format 1.0, update copyright years.
-License: UNKNOWN
-
-Files: debian/copyright
-Copyright: 2006-2014, Debian GNUstep maintainers / 2005-2013, GNUstep Application Project / -format/1.0
-License: GPL-2+
-
 Files: main.m
 Copyright: 2005, Free Software Foundation
 License: GPL-2+
diff --git a/t/scanner/examples/open-nebula.out b/t/scanner/examples/open-nebula.out
index 8f29793..c9c12bf 100644
--- a/t/scanner/examples/open-nebula.out
+++ b/t/scanner/examples/open-nebula.out
@@ -10,15 +10,6 @@ Files: debian/*
 Copyright: 2002-2011, Distributed Systems Architecture Group, Universidad
 License: UNKNOWN
 
-Files: debian/changelog
-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: share/pkgs/*
 Copyright: no-info-found
 License: Apache-2.0
@@ -125,11 +116,15 @@ Files: src/sunstone/routes/*
 Copyright: 2010-2015, C12G Labs S.L.
 License: Apache-2.0
 
-Files: src/template/template_syntax.cc
- src/template/template_syntax.h
+Files: src/template/*
 Copyright: 1984, 1989, 1990, 2000-2013, Free Software Foundation, Inc
 License: GPL-3+
 
+Files: src/template/SConstruct
+ src/template/Template.cc
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
 Files: src/vm/vm_file_var_syntax.cc
  src/vm/vm_file_var_syntax.h
  src/vm/vm_var_syntax.cc
diff --git a/t/scanner/examples/rakudo-star.out b/t/scanner/examples/rakudo-star.out
index 30e18e5..30e7c22 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: 2009-2014, The Perl Foundation
 License: UNKNOWN
 
 Files: modules/*
@@ -15,11 +15,15 @@ Copyright: UNKNOWN
 License: Artistic-2.0
 
 Files: modules/doc/*
+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