[license-reconcile] 01/02: * Update test cases to match licensecheck output. Thanks Petter Reinholdtsen for the patches, Fix FTBFS (Closes: #832840). * Fix typo in lib/Debian/LicenseReconcile/CopyrightDatum.pm.
gregor herrmann
gregoa at debian.org
Tue Sep 20 15:37:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository license-reconcile.
commit 7fec0a47583fe056156c894b9071d6f7e630d806
Author: gustavo panizzo <gfa at zumbi.com.ar>
Date: Sun Sep 18 10:40:39 2016 +0800
* Update test cases to match licensecheck output. Thanks Petter Reinholdtsen
for the patches, Fix FTBFS (Closes: #832840).
* Fix typo in lib/Debian/LicenseReconcile/CopyrightDatum.pm.
Gbp-Dch: Ignore
---
debian/changelog | 10 ++++++++--
lib/Debian/LicenseReconcile/App.pm | 2 ++
lib/Debian/LicenseReconcile/CopyrightDatum.pm | 2 +-
t/08-licensecheck.t | 24 ++++++++++++------------
t/09-nolicense.t | 2 +-
t/09-tty.t | 2 +-
t/17-rltty.t | 6 +++---
t/20-copyright_extract.t | 6 +++---
8 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7b2d364..becd035 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-license-reconcile (0.12) UNRELEASED; urgency=medium
+license-reconcile (0.12) unstable; urgency=medium
+ [ gustavo panizzo ]
+ * Update test cases to match licensecheck output. Thanks Petter Reinholdtsen
+ for the patches, Fix FTBFS (Closes: #832840).
+ * Fix typo in lib/Debian/LicenseReconcile/CopyrightDatum.pm.
+
+ [ gregor herrmann ]
* Remove Nicholas Bamber from Uploaders. Thanks for your work!
- -- gregor herrmann <gregoa at debian.org> Sat, 20 Aug 2016 03:43:07 +0200
+ -- gustavo panizzo <gfa at zumbi.com.ar> Sun, 18 Sep 2016 10:40:39 +0800
license-reconcile (0.11) unstable; urgency=medium
diff --git a/lib/Debian/LicenseReconcile/App.pm b/lib/Debian/LicenseReconcile/App.pm
index f9fa59f..993a12b 100644
--- a/lib/Debian/LicenseReconcile/App.pm
+++ b/lib/Debian/LicenseReconcile/App.pm
@@ -289,6 +289,8 @@ This contains the core logic of the tool.
=head2 files
+=head2 suggest_stanzas
+
=head1 AUTHOR
Nicholas Bamber, C<< <nicholas at periapt.co.uk> >>
diff --git a/lib/Debian/LicenseReconcile/CopyrightDatum.pm b/lib/Debian/LicenseReconcile/CopyrightDatum.pm
index 06ea421..ea8383f 100644
--- a/lib/Debian/LicenseReconcile/CopyrightDatum.pm
+++ b/lib/Debian/LicenseReconcile/CopyrightDatum.pm
@@ -253,7 +253,7 @@ This method returns a boolean indicating whether the object contains the argumen
The method will respect the argument if it is a
L<Debian::LicenseReconcile::CopyrightDatum> and otherwise stringify and parse it.
It may also take an optional reference. If this is set on failing to
-veryify containment the reason found will be placed in that reference.
+verify containment the reason found will be placed in that reference.
=head2 copyright_holders
diff --git a/t/08-licensecheck.t b/t/08-licensecheck.t
index 81fea4e..c4faf2f 100644
--- a/t/08-licensecheck.t
+++ b/t/08-licensecheck.t
@@ -86,61 +86,61 @@ cmp_deeply(\@data, bag(
{
file=>'Apache_2_0',
license=>'test1',
- copyright=>['Copyright: 2000 Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2000 Testophilus Testownik <tester at testity.org>.'],
},
{
file=>'FreeBSD',
license=>'test2',
- copyright=>['Copyright: 2001 Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2001 Testophilus Testownik <tester at testity.org>.'],
},
{
file=>'GPL_1',
license=>'test3',
- copyright=>['Copyright: 2002 Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2002 Testophilus Testownik <tester at testity.org>.'],
},
{
file=>'GPL_2',
license=>'test4',
- copyright=>['Copyright: 2003 Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2003 Testophilus Testownik <tester at testity.org>.'],
},
{
file=>'GPL_3',
license=>'test5',
- copyright=>['Copyright: 2004 Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2004 Testophilus Testownik <tester at testity.org>.'],
},
{
file=>'LGPL_2',
license=>'test6',
- copyright=>['Copyright: 2005 Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2005 Testophilus Testownik <tester at testity.org>.'],
},
{
file=>'LGPL_2_1',
license=>'test7',
- copyright=>['Copyright: 2006 Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2006 Testophilus Testownik <tester at testity.org>.'],
},
{
file=>'LGPL_3_0',
license=>'test8',
- copyright=>['Copyright: 2007 Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2007 Testophilus Testownik <tester at testity.org>.'],
},
{
file=>'MIT',
license=>'test9',
- copyright=>['Copyright: 2008 Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2008 Testophilus Testownik <tester at testity.org>.'],
},
{
file=>'Mozilla_2_0',
license=>'test10',
- copyright=>['Copyright: 2009 Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2009 Testophilus Testownik <tester at testity.org>.'],
},
{
file=>'QPL_1_0',
license=>'test11',
- copyright=>['Copyright: 2010 Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2010 Testophilus Testownik <tester at testity.org>.'],
},
{
file=>'Zlib',
license=>'test12',
- copyright=>['Copyright: 2011 Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2011 Testophilus Testownik <tester at testity.org>.'],
},
));
diff --git a/t/09-nolicense.t b/t/09-nolicense.t
index 2c3f0e9..797f9cf 100644
--- a/t/09-nolicense.t
+++ b/t/09-nolicense.t
@@ -12,5 +12,5 @@ isa_ok($LICENSECHECK, 'Debian::LicenseReconcile::LicenseCheck');
my @data = $LICENSECHECK->get_info('nolicense.c');
cmp_deeply(\@data, [{
file=>'nolicense.c',
- copyright=>['Copyright: 1992, 1993 The Regents of the University of California. All rights reserved'],
+ copyright=>['Copyright: 1992-1993 The Regents of the University of California.'],
}]);
diff --git a/t/09-tty.t b/t/09-tty.t
index 0dccc9e..ae327aa 100644
--- a/t/09-tty.t
+++ b/t/09-tty.t
@@ -13,5 +13,5 @@ my @data = $LICENSECHECK->get_info('tty.c');
cmp_deeply(\@data, [{
file=>'tty.c',
license=>'BSD-3-clause',
- copyright=>['Copyright: 1992, 1993 The Regents of the University of California. All rights reserved.'],
+ copyright=>['Copyright: 1992-1993 The Regents of the University of California.'],
}]);
diff --git a/t/17-rltty.t b/t/17-rltty.t
index 83ee161..3d9968e 100644
--- a/t/17-rltty.t
+++ b/t/17-rltty.t
@@ -13,7 +13,7 @@ Readonly my $RAW_DATA => $LICENSECHECK->get_info('rltty.c');
Readonly my $DATUM => Debian::LicenseReconcile::CopyrightDatum->new($RAW_DATA->{copyright});
isa_ok($DATUM, 'Debian::LicenseReconcile::CopyrightDatum');
cmp_deeply($DATUM->as_hash, {
- 'Free Software Foundation, Inc' => methods(min=>1992,max=>2005,size=>14),
+ 'Free Software Foundation, Inc.' => methods(min=>1992,max=>2005,size=>14),
});
my $filter = Debian::LicenseReconcile::Filter::Rules->new(
@@ -35,7 +35,7 @@ cmp_deeply(\@data, [{
file=>'rltty.c',
license=>'GPL-2+',
test=>'Rules3',
- copyright=>['Copyright: 1992-2005 Free Software Foundation, Inc'],
+ copyright=>['Copyright: 1992-2005 Free Software Foundation, Inc.'],
}]);
$filter = Debian::LicenseReconcile::Filter::Rules->new(
@@ -59,5 +59,5 @@ cmp_deeply(\@data, [{
file=>'rltty.c',
license=>'Apache-2.0',
test=>'Rules4',
- copyright=>['Copyright: 1992-2005 Free Software Foundation, Inc'],
+ copyright=>['Copyright: 1992-2005 Free Software Foundation, Inc.'],
}]);
diff --git a/t/20-copyright_extract.t b/t/20-copyright_extract.t
index b722328..1682851 100644
--- a/t/20-copyright_extract.t
+++ b/t/20-copyright_extract.t
@@ -14,8 +14,8 @@ cmp_deeply(\@data, [{
file=>'copyright_extract1',
license=>'GPL-2',
copyright=>bag(
- re('2007 Google Inc'),
- re('2008 MySQL AB, 2008-2009 Sun Microsystems, Inc')
+ re('2007 Google Inc.'),
+ re('2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.')
),
}]);
@@ -34,7 +34,7 @@ cmp_deeply(\@data, [{
file=>'copyright_extract2',
license=>'GPL-2',
copyright=>[
- 'Copyright: 2008 MySQL AB, 2008-2009 Sun Microsystems, Inc'
+ 'Copyright: 2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.'
],
}]);
--
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