Bug#832840: license-reconcile: diff for NMU version 0.12+nmu1

2016-09-20 Thread gustavo panizzo (gfa) 
On Tue, Sep 20, 2016 at 06:42:51AM +0800, gustavo panizzo (gfa) wrote:
> 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

or you can clone from
git.debian.org:/srv/home/users/gfa-guest/public_git/license-reconcile



-- 
1AE0 322E B8F7 4717 BDEA BF1D 44BB 1BA7 9F6C 6333

keybase: https://keybase.io/gfa

Bug#832840: license-reconcile: diff for NMU version 0.12+nmu1

2016-09-20 Thread gregor herrmann 
On Tue, 20 Sep 2016 06:42:51 +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

Thanks.

The patch was against the last tag and not against HEAD, and it was
reversed, but I got it in after all :)
 
I've also added "Team upload" to d/changelog, otherwise lintian
complains about an NMU.

And uploaded. Thanks again.


Cheers,
gregor, closing the RFS bug

-- 
 .''`.  Homepage https://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer -  https://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Nick Cave & The Bad Seeds: Spell


signature.asc
Description: Digital Signature

Bug#832840: license-reconcile: diff for NMU version 0.12+nmu1

2016-09-19 Thread gustavo panizzo (gfa) 
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   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<<  >>
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 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 .'],
+	copyright=>['Copyright: 2000 Testophilus Testownik '],
 },
 {
 file=>'FreeBSD',
 license=>'test2',
-	copyright=>['Copyright: 2001 Testophilus Testownik .'],
+	copyright=>['Copyright: 2001 Testophilus Testownik '],
 },
 {
 file=>'GPL_1',
 license=>'test3',
-	copyright=>['Copyright: 2002 Testophilus Testownik .'],
+	copyright=>['Copyright: 2002 Testophilus Testownik '],
 },
 {
 file=>'GPL_2',
 license=>'test4',
-	copyright=>['Copyright: 2003 Testophilus Testownik .'],
+	copyright=>['Copyright: 2003 Testophilus Testownik '],
 },
 {
 file=>'GPL_3',
 license=>'test5',
-	copyright=>['Copyright: 2004 Testophilus Testownik .'],
+	copyright=>['Copyright: 2004 Testophilus Testownik '],
 },
 {
 file=>'LGPL_2',
 license=>'test6',
-	copyright=>['Copyright: 2005 Testophilus Testownik .'],
+	copyright=>['Copyright: 2005 Testophilus Testownik '],
 },
 {
 file=>'LGPL_2_1',
 license=>'test7',
-	copyright=>['Copyright: 2006 Testophilus Testownik .'],
+	copyright=>['Copyright: 2006 Testophilus Testownik '],
 },
 {
 file=>'LGPL_3_0',
 license=>'test8',
-	copyright=>['Copyright: 2007 Testophilus Testownik .'],
+	copyright=>['Copyright: 2007 Testophilus Testownik '],
 },
 {
 file=>'MIT',
 license=>'test9',
-	copyright=>['Copyright: 2008 Testophilus Testownik .'],
+	copyright=>['Copyright: 2008 Testophilus Testownik '],
 },
 {
 file=>'Mozilla_2_0',
 license=>'test10',
-	copyright=>['Copyright: 2009 Testophilus Testownik .'],
+	copyright=>['Copyright: 2009 Testophilus Testownik '],
 },
 {

Bug#832840: license-reconcile: diff for NMU version 0.12+nmu1

2016-09-19 Thread gregor herrmann 
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.
 

Cheers,
gregor

-- 
 .''`.  Homepage https://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer -  https://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: STS: Zeit für uns


signature.asc
Description: Digital Signature

Bug#832840: license-reconcile: diff for NMU version 0.12+nmu1

2016-09-18 Thread gustavo panizzo (gfa) 
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
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.0 
+0800
+++ license-reconcile-0.12+nmu1/debian/changelog2016-09-18 
10:40:39.0 +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   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.0 
+0800
+++ license-reconcile-0.12+nmu1/debian/control  2016-09-16 09:27:33.0 
+0800
@@ -1,6 +1,6 @@
 Source: license-reconcile
 Maintainer: Debian Perl Group 
-Uploaders: gregor herrmann , Nicholas Bamber 

+Uploaders: gregor herrmann 
 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.0 +0800
+++ license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/App.pm  
2016-09-18 10:23:37.0 +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<<  >>
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.0 +0800
+++ 
license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/CopyrightDatum/Holder.pm
2016-09-17 20:18:04.0 +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.0 +0800
+++ license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/CopyrightDatum.pm   
2016-09-17 20:24:09.0 +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.0 +0800
+++ license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/CopyrightTarget.pm  
2016-09-17 20:18:48.0 +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.0 +0800
+++ license-reconcile-0.12+nmu1/lib/Debian/LicenseReconcile/Errors.pm   
2016-09-17 20:17:56.0 +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.0 +0800
+++