[SCM] tool for reconciling source and copyright branch, master, updated. debian/0.1-6-g58ffcaf

[Nicholas Bamber]

The following commit has been merged in the master branch:
commit 7f6eb7fd49adbcfc68774b815b6daa34517f151e
Author: Nicholas Bamber <nicholas at periapt.co.uk>
Date:   Thu Dec 20 18:14:48 2012 +0000

    resolved one copyright discrepancy and prepared way for others

diff --git a/debian/copyright b/debian/copyright
index 2ceeb33..c933c57 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,6 +7,12 @@ Files: *
 Copyright: 2012, Nicholas Bamber <nicholas at periapt.co.uk>
 License: Artistic or GPL-1+
 
+Files: lib/Debian/LicenseReconcile/Filter/ChangeLog.pm
+Copyright:
+ 2007-2010, Damyan Ivanov <dmn at debian.org>
+ 2011-2012, Nicholas Bamber <nicholas at periapt.co.uk>
+License: Artistic or GPL-1+
+
 License: Artistic
  This program is free software; you can redistribute it and/or modify
  it under the terms of the Artistic License, which comes with Perl.
diff --git a/debian/license-reconcile.yml b/debian/license-reconcile.yml
index cc6fbd6..8e2d9ce 100644
--- a/debian/license-reconcile.yml
+++ b/debian/license-reconcile.yml
@@ -1,3 +1,9 @@
+Rules:
+ rules:
+  -
+   Glob: lib/Debian/LicenseReconcile/Filter/ChangeLog.pm
+   License: Artistic or GPL-1+
+   CopyrightExtract: (?:=item\s+Copyright\s+\(C\)\s+(\Y+[\w\s]+\s\<\w+\@[\w\.]+\>\s*$\s*))(?:=item\s+Copyright\s+\(C\)\s+(\Y+[\w\s]+\s\<\w+\@[\w\.]+\>\s*$\s*))
 ChangeLog:
  license: Artistic or GPL-1+
 Default:
diff --git a/lib/Debian/LicenseReconcile.pm b/lib/Debian/LicenseReconcile.pm
index 8cd0575..1e1f286 100644
--- a/lib/Debian/LicenseReconcile.pm
+++ b/lib/Debian/LicenseReconcile.pm
@@ -83,7 +83,7 @@ Nicholas Bamber, C<< <nicholas at periapt.co.uk> >>
 
 =head1 LICENSE AND COPYRIGHT
 
-Copyright 2012 Nicholas Bamber.
+Copyright 2012 Nicholas Bamber C<< <nicholas at periapt.co.uk> >>.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of either: the GNU General Public License as published
diff --git a/lib/Debian/LicenseReconcile/App.pm b/lib/Debian/LicenseReconcile/App.pm
index 26193f1..8373046 100644
--- a/lib/Debian/LicenseReconcile/App.pm
+++ b/lib/Debian/LicenseReconcile/App.pm
@@ -256,7 +256,7 @@ Nicholas Bamber, C<< <nicholas at periapt.co.uk> >>
 
 =head1 LICENSE AND COPYRIGHT
 
-Copyright 2012 Nicholas Bamber.
+Copyright 2012 Nicholas Bamber C<< <nicholas at periapt.co.uk> >>.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of either: the GNU General Public License as published
diff --git a/lib/Debian/LicenseReconcile/CopyrightDatum.pm b/lib/Debian/LicenseReconcile/CopyrightDatum.pm
index 7a4a69d..9812479 100644
--- a/lib/Debian/LicenseReconcile/CopyrightDatum.pm
+++ b/lib/Debian/LicenseReconcile/CopyrightDatum.pm
@@ -271,7 +271,7 @@ Nicholas Bamber, C<< <nicholas at periapt.co.uk> >>
 
 =head1 LICENSE AND COPYRIGHT
 
-Copyright 2012 Nicholas Bamber.
+Copyright 2012 Nicholas Bamber C<< <nicholas at periapt.co.uk> >>.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of either: the GNU General Public License as published
diff --git a/lib/Debian/LicenseReconcile/CopyrightTarget.pm b/lib/Debian/LicenseReconcile/CopyrightTarget.pm
index b70f962..7b88825 100644
--- a/lib/Debian/LicenseReconcile/CopyrightTarget.pm
+++ b/lib/Debian/LicenseReconcile/CopyrightTarget.pm
@@ -142,7 +142,7 @@ Nicholas Bamber, C<< <nicholas at periapt.co.uk> >>
 
 =head1 LICENSE AND COPYRIGHT
 
-Copyright 2012 Nicholas Bamber.
+Copyright 2012 Nicholas Bamber C<< <nicholas at periapt.co.uk> >>.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of either: the GNU General Public License as published
diff --git a/lib/Debian/LicenseReconcile/Errors.pm b/lib/Debian/LicenseReconcile/Errors.pm
index 6c858a6..43e935d 100644
--- a/lib/Debian/LicenseReconcile/Errors.pm
+++ b/lib/Debian/LicenseReconcile/Errors.pm
@@ -70,7 +70,7 @@ Nicholas Bamber, C<< <nicholas at periapt.co.uk> >>
 
 =head1 LICENSE AND COPYRIGHT
 
-Copyright 2012 Nicholas Bamber.
+Copyright 2012 Nicholas Bamber C<< <nicholas at periapt.co.uk> >>.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of either: the GNU General Public License as published
diff --git a/lib/Debian/LicenseReconcile/Filter.pm b/lib/Debian/LicenseReconcile/Filter.pm
index c370b09..59b5563 100644
--- a/lib/Debian/LicenseReconcile/Filter.pm
+++ b/lib/Debian/LicenseReconcile/Filter.pm
@@ -179,7 +179,7 @@ Nicholas Bamber, C<< <nicholas at periapt.co.uk> >>
 
 =head1 LICENSE AND COPYRIGHT
 
-Copyright 2012 Nicholas Bamber.
+Copyright 2012 Nicholas Bamber C<< <nicholas at periapt.co.uk> >>.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of either: the GNU General Public License as published
diff --git a/lib/Debian/LicenseReconcile/FormatSpec.pm b/lib/Debian/LicenseReconcile/FormatSpec.pm
index c04781d..2ffb8fd 100644
--- a/lib/Debian/LicenseReconcile/FormatSpec.pm
+++ b/lib/Debian/LicenseReconcile/FormatSpec.pm
@@ -70,7 +70,7 @@ Nicholas Bamber, C<< <nicholas at periapt.co.uk> >>
 
 =head1 LICENSE AND COPYRIGHT
 
-Copyright 2012 Nicholas Bamber.
+Copyright 2012 Nicholas Bamber C<< <nicholas at periapt.co.uk> >>.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of either: the GNU General Public License as published
diff --git a/lib/Debian/LicenseReconcile/LicenseCheck.pm b/lib/Debian/LicenseReconcile/LicenseCheck.pm
index cf09ae4..049d45d 100644
--- a/lib/Debian/LicenseReconcile/LicenseCheck.pm
+++ b/lib/Debian/LicenseReconcile/LicenseCheck.pm
@@ -238,7 +238,7 @@ Nicholas Bamber, C<< <nicholas at periapt.co.uk> >>
 
 =head1 LICENSE AND COPYRIGHT
 
-Copyright 2012 Nicholas Bamber.
+Copyright 2012 Nicholas Bamber C<< <nicholas at periapt.co.uk> >>.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of either: the GNU General Public License as published
diff --git a/lib/Debian/LicenseReconcile/Utils.pm b/lib/Debian/LicenseReconcile/Utils.pm
index ceac448..f0b4eda 100644
--- a/lib/Debian/LicenseReconcile/Utils.pm
+++ b/lib/Debian/LicenseReconcile/Utils.pm
@@ -50,7 +50,7 @@ Nicholas Bamber, C<< <nicholas at periapt.co.uk> >>
 
 =head1 LICENSE AND COPYRIGHT
 
-Copyright 2012 Nicholas Bamber.
+Copyright 2012 Nicholas Bamber C<< <nicholas at periapt.co.uk> >>.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of either: the GNU General Public License as published

-- 
tool for reconciling source and copyright