[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 58ffcaf62b77018e21ae0712519a7a1910e65119
Author: Nicholas Bamber <nicholas at periapt.co.uk>
Date:   Thu Dec 20 19:06:28 2012 +0000

    reconciles itself now

diff --git a/debian/copyright b/debian/copyright
index c933c57..2b1f4cb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,6 +13,14 @@ Copyright:
  2011-2012, Nicholas Bamber <nicholas at periapt.co.uk>
 License: Artistic or GPL-1+
 
+Files: t/data/rltty.c
+License: GPL-2+
+Copyright: 1992-2005, Free Software Foundation, Inc
+
+Files: t/data/nolicense.c t/data/tty.c
+License: BSD-3-clause
+Copyright: 1992-1993, The Regents of the University of California.
+
 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 8e2d9ce..3b80b6b 100644
--- a/debian/license-reconcile.yml
+++ b/debian/license-reconcile.yml
@@ -4,6 +4,21 @@ 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*))
+  -
+   Glob: lib/*.pm
+   License: Artistic or GPL-1+
+   CopyrightExtract: (?:Copyright\s+(\Y+[\w\s]+C\<\<\s+\<[\s\w\.]+\>))
+  -
+   Glob: t/data/*
+   Contains: The Regents of the University of California
+   License: BSD-3-clause
+   Copyright: 1992-1993, The Regents of the University of California
+  -
+   Glob: t/data/*
+   Contains: Periapt Technologies
+   License: Artistic or GPL-1+
+   Copyright: 2012, Nicholas Bamber <nicholas at periapt.co.uk>
+   Justification: Periapt is controlled by Nicholas Bamber
 ChangeLog:
  license: Artistic or GPL-1+
 Default:
diff --git a/lib/Debian/LicenseReconcile/Filter/Rules.pm b/lib/Debian/LicenseReconcile/Filter/Rules.pm
index 4923155..db4db92 100644
--- a/lib/Debian/LicenseReconcile/Filter/Rules.pm
+++ b/lib/Debian/LicenseReconcile/Filter/Rules.pm
@@ -112,7 +112,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/Shebang.pm b/lib/Debian/LicenseReconcile/Filter/Shebang.pm
index 4c7b055..9996e81 100644
--- a/lib/Debian/LicenseReconcile/Filter/Shebang.pm
+++ b/lib/Debian/LicenseReconcile/Filter/Shebang.pm
@@ -87,7 +87,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/Std.pm b/lib/Debian/LicenseReconcile/Filter/Std.pm
index 579ecfb..3887901 100644
--- a/lib/Debian/LicenseReconcile/Filter/Std.pm
+++ b/lib/Debian/LicenseReconcile/Filter/Std.pm
@@ -49,7 +49,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