On Mon, Sep 19, 2016 at 07:15:50PM +0200, gregor herrmann wrote:
> On Mon, 19 Sep 2016 00:32:17 +0800, gustavo panizzo (gfa) wrote:
>
> > I've attached the debdiff, I'll push my changes to the git repo after
> > the NMU has been uploaded, let me know if you don't agree with any of
> > this.
>
> Thanks for your help.
>
> It might be easier to push the changes to the git repo before an
> upload, with 0.12 instead of 0.12+nmu1, and we can do a regular tram
> upload. -- Whatever you prefer.
I have no preference on the matter, and you are the maintainer.
I've tried to push to the git repo but I have no perms. so I've attached
the diff between HEAD and your last commit to this email
I've fixed a typo lib/Debian/LicenseReconcile/CopyrightDatum.pm as well
thanks!
--
1AE0 322E B8F7 4717 BDEA BF1D 44BB 1BA7 9F6C 6333
keybase: https://keybase.io/gfa
diff --git a/debian/changelog b/debian/changelog
index becd035..81e9e09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,3 @@
-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!
-
- -- gustavo panizzo <g...@zumbi.com.ar> Sun, 18 Sep 2016 10:40:39 +0800
-
license-reconcile (0.11) unstable; urgency=medium
* debian/copyright: change Copyright-Format 1.0 URL to HTTPS.
diff --git a/lib/Debian/LicenseReconcile/App.pm b/lib/Debian/LicenseReconcile/App.pm
index 993a12b..f9fa59f 100644
--- a/lib/Debian/LicenseReconcile/App.pm
+++ b/lib/Debian/LicenseReconcile/App.pm
@@ -289,8 +289,6 @@ 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 ea8383f..06ea421 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
-verify containment the reason found will be placed in that reference.
+veryify 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 c4faf2f..81fea4e 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 <tes...@testity.org>.'],
+ copyright=>['Copyright: 2000 Testophilus Testownik <tes...@testity.org>'],
},
{
file=>'FreeBSD',
license=>'test2',
- copyright=>['Copyright: 2001 Testophilus Testownik <tes...@testity.org>.'],
+ copyright=>['Copyright: 2001 Testophilus Testownik <tes...@testity.org>'],
},
{
file=>'GPL_1',
license=>'test3',
- copyright=>['Copyright: 2002 Testophilus Testownik <tes...@testity.org>.'],
+ copyright=>['Copyright: 2002 Testophilus Testownik <tes...@testity.org>'],
},
{
file=>'GPL_2',
license=>'test4',
- copyright=>['Copyright: 2003 Testophilus Testownik <tes...@testity.org>.'],
+ copyright=>['Copyright: 2003 Testophilus Testownik <tes...@testity.org>'],
},
{
file=>'GPL_3',
license=>'test5',
- copyright=>['Copyright: 2004 Testophilus Testownik <tes...@testity.org>.'],
+ copyright=>['Copyright: 2004 Testophilus Testownik <tes...@testity.org>'],
},
{
file=>'LGPL_2',
license=>'test6',
- copyright=>['Copyright: 2005 Testophilus Testownik <tes...@testity.org>.'],
+ copyright=>['Copyright: 2005 Testophilus Testownik <tes...@testity.org>'],
},
{
file=>'LGPL_2_1',
license=>'test7',
- copyright=>['Copyright: 2006 Testophilus Testownik <tes...@testity.org>.'],
+ copyright=>['Copyright: 2006 Testophilus Testownik <tes...@testity.org>'],
},
{
file=>'LGPL_3_0',
license=>'test8',
- copyright=>['Copyright: 2007 Testophilus Testownik <tes...@testity.org>.'],
+ copyright=>['Copyright: 2007 Testophilus Testownik <tes...@testity.org>'],
},
{
file=>'MIT',
license=>'test9',
- copyright=>['Copyright: 2008 Testophilus Testownik <tes...@testity.org>.'],
+ copyright=>['Copyright: 2008 Testophilus Testownik <tes...@testity.org>'],
},
{
file=>'Mozilla_2_0',
license=>'test10',
- copyright=>['Copyright: 2009 Testophilus Testownik <tes...@testity.org>.'],
+ copyright=>['Copyright: 2009 Testophilus Testownik <tes...@testity.org>'],
},
{
file=>'QPL_1_0',
license=>'test11',
- copyright=>['Copyright: 2010 Testophilus Testownik <tes...@testity.org>.'],
+ copyright=>['Copyright: 2010 Testophilus Testownik <tes...@testity.org>'],
},
{
file=>'Zlib',
license=>'test12',
- copyright=>['Copyright: 2011 Testophilus Testownik <tes...@testity.org>.'],
+ copyright=>['Copyright: 2011 Testophilus Testownik <tes...@testity.org>'],
},
));
diff --git a/t/09-nolicense.t b/t/09-nolicense.t
index 797f9cf..2c3f0e9 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.'],
+ copyright=>['Copyright: 1992, 1993 The Regents of the University of California. All rights reserved'],
}]);
diff --git a/t/09-tty.t b/t/09-tty.t
index ae327aa..0dccc9e 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.'],
+ copyright=>['Copyright: 1992, 1993 The Regents of the University of California. All rights reserved.'],
}]);
diff --git a/t/17-rltty.t b/t/17-rltty.t
index 3d9968e..83ee161 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 1682851..b722328 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'
],
}]);
