Bug#832840: license-reconcile: diff for NMU version 0.12+nmu1
gustavo panizzo (gfa)
gfa at zumbi.com.ar
Sun Sep 18 16:32:17 UTC 2016
Control: tags 832840 + pending
Dear maintainer,
I've prepared an NMU for license-reconcile (versioned as 0.12+nmu1)
I'll look for an sponsor and upload it.
The nmu includes an non uploaded change of yours, as is it
non-functional I've included it.
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.
Regards.
--
1AE0 322E B8F7 4717 BDEA BF1D 44BB 1BA7 9F6C 6333
keybase: https://keybase.io/gfa
-------------- next part --------------
diff -Nru license-reconcile-0.11/debian/changelog license-reconcile-0.12+nmu1/debian/changelog
--- license-reconcile-0.11/debian/changelog 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/debian/changelog 2016-09-18 10:40:39.000000000 +0800
@@ -1,3 +1,15 @@
+license-reconcile (0.12+nmu1) unstable; urgency=low
+
+ [ gustavo panizzo ]
+ * Non-maintainer upload.
+ * Update test cases to match licensecheck output. Thanks Petter Reinholdtsen
+ for the patches, Fix FTBFS (Closes: #832840).
+
+ [ gregor herrmann ]
+ * Remove Nicholas Bamber from Uploaders. Thanks for your work!
+
+ -- gustavo panizzo <gfa at 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 -Nru license-reconcile-0.11/debian/control license-reconcile-0.12+nmu1/debian/control
--- license-reconcile-0.11/debian/control 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/debian/control 2016-09-16 09:27:33.000000000 +0800
@@ -1,6 +1,6 @@
Source: license-reconcile
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: gregor herrmann <gregoa at debian.org>, Nicholas Bamber <nicholas at periapt.co.uk>
+Uploaders: gregor herrmann <gregoa at debian.org>
Section: devel
Testsuite: autopkgtest-pkg-perl
Priority: optional
diff -Nru license-reconcile-0.11/lib/Debian/LicenseReconcile/App.pm license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/App.pm
--- license-reconcile-0.11/lib/Debian/LicenseReconcile/App.pm 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/App.pm 2016-09-18 10:23:37.000000000 +0800
@@ -244,11 +244,11 @@
=head1 VERSION
-Version 0.11
+Version 0.12+nmu1
=cut
-our $VERSION = '0.11';
+our $VERSION = '0.12+nmu1';
=head1 SYNOPSIS
@@ -289,6 +289,8 @@
=head2 files
+=head2 suggest_stanzas
+
=head1 AUTHOR
Nicholas Bamber, C<< <nicholas at periapt.co.uk> >>
diff -Nru license-reconcile-0.11/lib/Debian/LicenseReconcile/CopyrightDatum/Holder.pm license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/CopyrightDatum/Holder.pm
--- license-reconcile-0.11/lib/Debian/LicenseReconcile/CopyrightDatum/Holder.pm 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/CopyrightDatum/Holder.pm 2016-09-17 20:18:04.000000000 +0800
@@ -61,11 +61,11 @@
=head1 VERSION
-Version 0.11
+Version 0.12+nmu1
=cut
-our $VERSION = '0.11';
+our $VERSION = '0.12+nmu1';
=head1 SYNOPSIS
diff -Nru license-reconcile-0.11/lib/Debian/LicenseReconcile/CopyrightDatum.pm license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/CopyrightDatum.pm
--- license-reconcile-0.11/lib/Debian/LicenseReconcile/CopyrightDatum.pm 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/CopyrightDatum.pm 2016-09-17 20:24:09.000000000 +0800
@@ -214,11 +214,11 @@
=head1 VERSION
-Version 0.11
+Version 0.12+nmu1
=cut
-our $VERSION = '0.11';
+our $VERSION = '0.12+nmu1';
=head1 DESCRIPTION
diff -Nru license-reconcile-0.11/lib/Debian/LicenseReconcile/CopyrightTarget.pm license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/CopyrightTarget.pm
--- license-reconcile-0.11/lib/Debian/LicenseReconcile/CopyrightTarget.pm 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/CopyrightTarget.pm 2016-09-17 20:18:48.000000000 +0800
@@ -100,11 +100,11 @@
=head1 VERSION
-Version 0.11
+Version 0.12+nmu1
=cut
-our $VERSION = '0.11';
+our $VERSION = '0.12+nmu1';
=head1 SYNOPSIS
diff -Nru license-reconcile-0.11/lib/Debian/LicenseReconcile/Errors.pm license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/Errors.pm
--- license-reconcile-0.11/lib/Debian/LicenseReconcile/Errors.pm 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/Errors.pm 2016-09-17 20:17:56.000000000 +0800
@@ -29,11 +29,11 @@
=head1 VERSION
-Version 0.11
+Version 0.12+nmu1
=cut
-our $VERSION = '0.11';
+our $VERSION = '0.12+nmu1';
=head1 SYNOPSIS
diff -Nru license-reconcile-0.11/lib/Debian/LicenseReconcile/Filter/ChangeLog.pm license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/Filter/ChangeLog.pm
--- license-reconcile-0.11/lib/Debian/LicenseReconcile/Filter/ChangeLog.pm 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/Filter/ChangeLog.pm 2016-09-17 20:18:28.000000000 +0800
@@ -96,11 +96,11 @@
=head1 VERSION
-Version 0.11
+Version 0.12+nmu1
=cut
-our $VERSION = '0.11';
+our $VERSION = '0.12+nmu1';
=head1 SYNOPSIS
diff -Nru license-reconcile-0.11/lib/Debian/LicenseReconcile/Filter/Rules.pm license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/Filter/Rules.pm
--- license-reconcile-0.11/lib/Debian/LicenseReconcile/Filter/Rules.pm 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/Filter/Rules.pm 2016-09-17 20:18:42.000000000 +0800
@@ -57,11 +57,11 @@
=head1 VERSION
-Version 0.11
+Version 0.12+nmu1
=cut
-our $VERSION = '0.11';
+our $VERSION = '0.12+nmu1';
=head1 SYNOPSIS
diff -Nru license-reconcile-0.11/lib/Debian/LicenseReconcile/Filter/Shebang.pm license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/Filter/Shebang.pm
--- license-reconcile-0.11/lib/Debian/LicenseReconcile/Filter/Shebang.pm 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/Filter/Shebang.pm 2016-09-17 20:18:23.000000000 +0800
@@ -32,11 +32,11 @@
=head1 VERSION
-Version 0.11
+Version 0.12+nmu1
=cut
-our $VERSION = '0.11';
+our $VERSION = '0.12+nmu1';
=head1 SYNOPSIS
diff -Nru license-reconcile-0.11/lib/Debian/LicenseReconcile/Filter/Std.pm license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/Filter/Std.pm
--- license-reconcile-0.11/lib/Debian/LicenseReconcile/Filter/Std.pm 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/Filter/Std.pm 2016-09-17 20:18:34.000000000 +0800
@@ -17,11 +17,11 @@
=head1 VERSION
-Version 0.11
+Version 0.12+nmu1
=cut
-our $VERSION = '0.11';
+our $VERSION = '0.12+nmu1';
=head1 SYNOPSIS
diff -Nru license-reconcile-0.11/lib/Debian/LicenseReconcile/Filter.pm license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/Filter.pm
--- license-reconcile-0.11/lib/Debian/LicenseReconcile/Filter.pm 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/Filter.pm 2016-09-17 20:18:10.000000000 +0800
@@ -91,11 +91,11 @@
=head1 VERSION
-Version 0.11
+Version 0.12+nmu1
=cut
-our $VERSION = '0.11';
+our $VERSION = '0.12+nmu1';
=head1 SYNOPSIS
diff -Nru license-reconcile-0.11/lib/Debian/LicenseReconcile/FormatSpec.pm license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/FormatSpec.pm
--- license-reconcile-0.11/lib/Debian/LicenseReconcile/FormatSpec.pm 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/FormatSpec.pm 2016-09-17 20:18:17.000000000 +0800
@@ -20,11 +20,11 @@
=head1 VERSION
-Version 0.11
+Version 0.12+nmu1
=cut
-our $VERSION = '0.11';
+our $VERSION = '0.12+nmu1';
=head1 SYNOPSIS
diff -Nru license-reconcile-0.11/lib/Debian/LicenseReconcile/LicenseCheck.pm license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/LicenseCheck.pm
--- license-reconcile-0.11/lib/Debian/LicenseReconcile/LicenseCheck.pm 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/LicenseCheck.pm 2016-09-17 20:19:00.000000000 +0800
@@ -196,11 +196,11 @@
=head1 VERSION
-Version 0.11
+Version 0.12+nmu1
=cut
-our $VERSION = '0.11';
+our $VERSION = '0.12+nmu1';
=head1 SYNOPSIS
diff -Nru license-reconcile-0.11/lib/Debian/LicenseReconcile/Utils.pm license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/Utils.pm
--- license-reconcile-0.11/lib/Debian/LicenseReconcile/Utils.pm 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/Utils.pm 2016-09-17 20:18:55.000000000 +0800
@@ -26,11 +26,11 @@
=head1 VERSION
-Version 0.11
+Version 0.12+nmu1
=cut
-our $VERSION = '0.11';
+our $VERSION = '0.12+nmu1';
=head1 SYNOPSIS
diff -Nru license-reconcile-0.11/lib/Debian/LicenseReconcile.pm license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile.pm
--- license-reconcile-0.11/lib/Debian/LicenseReconcile.pm 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile.pm 2016-09-17 20:24:24.000000000 +0800
@@ -50,11 +50,11 @@
=head1 VERSION
-Version 0.11
+Version 0.12+nmu1
=cut
-our $VERSION = '0.11';
+our $VERSION = '0.12+nmu1';
=head1 SYNOPSIS
diff -Nru license-reconcile-0.11/t/08-licensecheck.t license-reconcile-0.12+nmu1/t/08-licensecheck.t
--- license-reconcile-0.11/t/08-licensecheck.t 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/t/08-licensecheck.t 2016-09-16 10:11:45.000000000 +0800
@@ -86,61 +86,61 @@
{
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 -Nru license-reconcile-0.11/t/09-nolicense.t license-reconcile-0.12+nmu1/t/09-nolicense.t
--- license-reconcile-0.11/t/09-nolicense.t 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/t/09-nolicense.t 2016-09-16 10:11:45.000000000 +0800
@@ -12,5 +12,5 @@
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 -Nru license-reconcile-0.11/t/09-tty.t license-reconcile-0.12+nmu1/t/09-tty.t
--- license-reconcile-0.11/t/09-tty.t 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/t/09-tty.t 2016-09-16 10:11:45.000000000 +0800
@@ -13,5 +13,5 @@
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 -Nru license-reconcile-0.11/t/17-rltty.t license-reconcile-0.12+nmu1/t/17-rltty.t
--- license-reconcile-0.11/t/17-rltty.t 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/t/17-rltty.t 2016-09-16 10:11:45.000000000 +0800
@@ -13,7 +13,7 @@
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 @@
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 @@
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 -Nru license-reconcile-0.11/t/20-copyright_extract.t license-reconcile-0.12+nmu1/t/20-copyright_extract.t
--- license-reconcile-0.11/t/20-copyright_extract.t 2016-07-05 20:20:50.000000000 +0800
+++ license-reconcile-0.12+nmu1/t/20-copyright_extract.t 2016-09-16 10:11:45.000000000 +0800
@@ -14,8 +14,8 @@
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 @@
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.'
],
}]);
More information about the pkg-perl-maintainers
mailing list