[license-reconcile] 01/01: Took account of latest licensecheck version and bumped dependency
Nicholas Bamber
periapt at moszumanska.debian.org
Thu Nov 26 20:01:37 UTC 2015
This is an automated email from the git hooks/post-receive script.
periapt pushed a commit to branch master
in repository license-reconcile.
commit 03bda5557d92d1726b0d2f9d2ee35dbaa95e160b
Author: Nicholas Bamber <nicholas at periapt.co.uk>
Date: Thu Nov 26 20:01:25 2015 +0000
Took account of latest licensecheck version and bumped dependency
---
debian/changelog | 1 +
debian/control | 8 ++++----
lib/Debian/LicenseReconcile/LicenseCheck.pm | 2 +-
t/08-licensecheck.t | 26 +++++++++++++-------------
t/18-app.t | 1 +
5 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5f14525..0bb9623 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ license-reconcile (0.10) UNRELEASED; urgency=medium
* Consolidated TODO list
* Started adding new tests
+ * Took account of latest licensecheck version and bumped dependency
-- Nicholas Bamber <nicholas at periapt.co.uk> Wed, 18 Nov 2015 15:58:33 +0000
diff --git a/debian/control b/debian/control
index 2b6cb32..89fb11e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Priority: optional
Build-Depends: debhelper (>= 9),
libmodule-build-perl,
perl (>= 5.18),
- bash-completion
-Build-Depends-Indep: devscripts (>= 2.15.9~),
+ bash-completion
+Build-Depends-Indep: devscripts (>= 2.15.10~),
libclass-xsaccessor-perl,
libconfig-any-perl,
libdebian-copyright-perl (>= 0.2),
@@ -31,7 +31,7 @@ Build-Depends-Indep: devscripts (>= 2.15.9~),
libtext-levenshteinxs-perl,
libuniversal-require-perl,
libyaml-libyaml-perl,
- libsoftware-license-perl
+ libsoftware-license-perl
Standards-Version: 3.9.6
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/license-reconcile.git
Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/license-reconcile.git
@@ -40,7 +40,7 @@ Package: license-reconcile
Architecture: all
Depends: ${misc:Depends},
${perl:Depends},
- devscripts (>= 2.15.9~),
+ devscripts (>= 2.15.10~),
libclass-xsaccessor-perl,
libconfig-any-perl,
libdebian-copyright-perl (>= 0.2),
diff --git a/lib/Debian/LicenseReconcile/LicenseCheck.pm b/lib/Debian/LicenseReconcile/LicenseCheck.pm
index 887cb40..38eef2b 100644
--- a/lib/Debian/LicenseReconcile/LicenseCheck.pm
+++ b/lib/Debian/LicenseReconcile/LicenseCheck.pm
@@ -48,7 +48,7 @@ Readonly my %LICENSE_MAPPING => (
'Artistic (v2.0)' => 'Artistic-2.0',
);
-Readonly my $SCRIPT => '/usr/bin/licensecheck --no-conf --text';
+Readonly my $SCRIPT => "/usr/bin/licensecheck --no-conf -c '.+'";
Readonly my $PARSE_RE => qr{
^ # beginning of line
diff --git a/t/08-licensecheck.t b/t/08-licensecheck.t
index f009196..81fea4e 100644
--- a/t/08-licensecheck.t
+++ b/t/08-licensecheck.t
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-use Test::More skip_all=>'https://lists.alioth.debian.org/pipermail/devscripts-devel/2015-November/004303.html';
+use Test::More tests=>3;
use Test::Deep;
use Test::NoWarnings;
use Debian::LicenseReconcile::LicenseCheck;
@@ -86,61 +86,61 @@ cmp_deeply(\@data, bag(
{
file=>'Apache_2_0',
license=>'test1',
- copyright=>['Copyright: 2000 by Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2000 Testophilus Testownik <tester at testity.org>'],
},
{
file=>'FreeBSD',
license=>'test2',
- copyright=>['Copyright: 2001 by Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2001 Testophilus Testownik <tester at testity.org>'],
},
{
file=>'GPL_1',
license=>'test3',
- copyright=>['Copyright: 2002 by Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2002 Testophilus Testownik <tester at testity.org>'],
},
{
file=>'GPL_2',
license=>'test4',
- copyright=>['Copyright: 2003 by Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2003 Testophilus Testownik <tester at testity.org>'],
},
{
file=>'GPL_3',
license=>'test5',
- copyright=>['Copyright: 2004 by Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2004 Testophilus Testownik <tester at testity.org>'],
},
{
file=>'LGPL_2',
license=>'test6',
- copyright=>['Copyright: 2005 by Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2005 Testophilus Testownik <tester at testity.org>'],
},
{
file=>'LGPL_2_1',
license=>'test7',
- copyright=>['Copyright: 2006 by Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2006 Testophilus Testownik <tester at testity.org>'],
},
{
file=>'LGPL_3_0',
license=>'test8',
- copyright=>['Copyright: 2007 by Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2007 Testophilus Testownik <tester at testity.org>'],
},
{
file=>'MIT',
license=>'test9',
- copyright=>['Copyright: 2008 by Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2008 Testophilus Testownik <tester at testity.org>'],
},
{
file=>'Mozilla_2_0',
license=>'test10',
- copyright=>['Copyright: 2009 by Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2009 Testophilus Testownik <tester at testity.org>'],
},
{
file=>'QPL_1_0',
license=>'test11',
- copyright=>['Copyright: 2010 by Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2010 Testophilus Testownik <tester at testity.org>'],
},
{
file=>'Zlib',
license=>'test12',
- copyright=>['Copyright: 2011 by Testophilus Testownik <tester at testity.org>'],
+ copyright=>['Copyright: 2011 Testophilus Testownik <tester at testity.org>'],
},
));
diff --git a/t/18-app.t b/t/18-app.t
index 4889b2d..7704e54 100644
--- a/t/18-app.t
+++ b/t/18-app.t
@@ -1,6 +1,7 @@
#!/usr/bin/perl
use Test::More skip_all => 'Need to rethink the documentation and testing and examples';
+#use Test::More tests=>10;
use Test::Deep;
use Test::Output;
use Test::NoWarnings;
--
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