[license-reconcile] 03/03: more copyright corretions

Nicholas Bamber periapt at moszumanska.debian.org
Sun Nov 1 09:02:58 UTC 2015


This is an automated email from the git hooks/post-receive script.

periapt pushed a commit to branch master
in repository license-reconcile.

commit 2fd712d8e5bdbb1d482a8beac728911a1513f875
Author: Nicholas Bamber <nicholas at periapt.co.uk>
Date:   Sun Nov 1 09:02:25 2015 +0000

    more copyright corretions
---
 debian/copyright             | 15 +++++++++++++--
 debian/license-reconcile.yml |  9 +++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 3c5074f..1c6c217 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,10 +19,21 @@ Files: t/data/example/debian/copyright
 License: GPL-1+
 Copyright: TBS
  
+Files: t/data/copyright_extract2
+Copyright:
+ 2008, MySQL AB,
+ 2008-2009, Sun Microsystems, Inc.
+License: GPL-2
+
+Files: t/data/copyright_extract1
+Copyright:
+ 2007 Google Inc.
+ 2008, MySQL AB,
+ 2008-2009, Sun Microsystems, Inc.
+License: GPL-2
+
 Files:
  t/data/example/base
- t/data/copyright_extract2
- t/data/copyright_extract1
  t/data/example/base.h
 Copyright: 2011-2012, Nicholas Bamber <nicholas at periapt.co.uk>
 License: GPL-2
diff --git a/debian/license-reconcile.yml b/debian/license-reconcile.yml
index db85b3e..54be00b 100644
--- a/debian/license-reconcile.yml
+++ b/debian/license-reconcile.yml
@@ -10,10 +10,19 @@ Rules:
    Copyright: 2012, 2015, Nicholas Bamber <nicholas at periapt.co.uk>
    MaxVersion: 0.11
   -
+   Glob: t/data/example/debian/copyright
+   License: Artistic or GPL-1+
+   MaxVersion: 0.11
+   Copyright: 2012, Nicholas Bamber <nicholas at periapt.co.uk>
+   Justification: it was example data only
+  -
    Glob: lib/*.pm
    License: Artistic or GPL-1+
    CopyrightExtract: (?:Copyright\s+(\Y+[\w\s]+C\<\<\s+\<[\s\w\.]+\>))
   -
+   Glob: t/data/copyright_extract*
+   CopyrightExtract: (\Y+\s[a-zA-Z\s]+)
+  -
    Glob: t/data/example/base*
    Copyright: 2011, Nicholas Bamber <nicholas at periapt.co.uk>
    Justification: Periapt is controlled by Nicholas Bamber

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/license-reconcile.git



More information about the Pkg-perl-cvs-commits mailing list