Control: tags 812339 + patch Control: tags 812339 + pending Dear maintainer,
I've prepared an NMU for libdata-compare-perl (versioned as 1.25-0.1) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. regards, -mika-
diff -Nru libdata-compare-perl-1.23/CHANGELOG libdata-compare-perl-1.25/CHANGELOG
--- libdata-compare-perl-1.23/CHANGELOG 2013-09-26 15:38:14.000000000 +0200
+++ libdata-compare-perl-1.25/CHANGELOG 2014-12-10 14:32:38.000000000 +0100
@@ -1,3 +1,12 @@
+1.25 2013-04-15 DCANTRELL Add Gianni Ceccarelli's tests and patch
+ to Use refaddr & reftype to "do the right
+ thing" when comparing objects that overload
+ numification and stringification
+
+1.24 2014-04-05 DCANTRELL Bump the required JSON.pm version for
+ tests - something's a bit broken around
+ about v 2.53
+
1.23 2013-09-26 DCANTRELL Add David Muir Sharnoff's tests for
really big data structures (but not yet
working);
diff -Nru libdata-compare-perl-1.23/MANIFEST libdata-compare-perl-1.25/MANIFEST
--- libdata-compare-perl-1.23/MANIFEST 2013-09-26 15:45:43.000000000 +0200
+++ libdata-compare-perl-1.25/MANIFEST 2014-12-10 14:34:52.000000000 +0100
@@ -28,5 +28,8 @@
GPL2.txt
t/coverage.sh
t/FIXME-large-structures.t
+MANIFEST.SKIP
+t/overload.t
+t/lib/SpecialClass.pm
META.yml Module YAML meta-data (added by MakeMaker)
META.json Module JSON meta-data (added by MakeMaker)
diff -Nru libdata-compare-perl-1.23/MANIFEST.SKIP libdata-compare-perl-1.25/MANIFEST.SKIP
--- libdata-compare-perl-1.23/MANIFEST.SKIP 1970-01-01 01:00:00.000000000 +0100
+++ libdata-compare-perl-1.25/MANIFEST.SKIP 2014-11-21 12:11:44.000000000 +0100
@@ -0,0 +1,2 @@
+.travis.yml
+^\.git
diff -Nru libdata-compare-perl-1.23/META.json libdata-compare-perl-1.25/META.json
--- libdata-compare-perl-1.23/META.json 2013-09-26 15:45:43.000000000 +0200
+++ libdata-compare-perl-1.25/META.json 2014-12-10 14:34:52.000000000 +0100
@@ -4,7 +4,7 @@
"unknown"
],
"dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150",
+ "generated_by" : "ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.120351",
"license" : [
"unknown"
],
@@ -22,18 +22,18 @@
"prereqs" : {
"build" : {
"requires" : {
- "ExtUtils::MakeMaker" : 0
+ "ExtUtils::MakeMaker" : "0"
}
},
"configure" : {
"requires" : {
- "ExtUtils::MakeMaker" : 0
+ "ExtUtils::MakeMaker" : "0"
}
},
"runtime" : {
"requires" : {
"File::Find::Rule" : "0.1",
- "Scalar::Util" : 0
+ "Scalar::Util" : "0"
}
}
},
@@ -46,5 +46,5 @@
"url" : "https://github.com/DrHyde/perl-modules-Data-Compare";
}
},
- "version" : "1.23"
+ "version" : "1.25"
}
diff -Nru libdata-compare-perl-1.23/META.yml libdata-compare-perl-1.25/META.yml
--- libdata-compare-perl-1.23/META.yml 2013-09-26 15:45:42.000000000 +0200
+++ libdata-compare-perl-1.25/META.yml 2014-12-10 14:34:52.000000000 +0100
@@ -7,7 +7,7 @@
configure_requires:
ExtUtils::MakeMaker: 0
dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150'
+generated_by: 'ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.120351'
license: unknown
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -23,4 +23,4 @@
resources:
bugtracker: https://github.com/DrHyde/perl-modules-Data-Compare/issues/new
repository: https://github.com/DrHyde/perl-modules-Data-Compare
-version: 1.23
+version: 1.25
diff -Nru libdata-compare-perl-1.23/debian/changelog libdata-compare-perl-1.25/debian/changelog
--- libdata-compare-perl-1.23/debian/changelog 2016-01-22 15:50:07.000000000 +0100
+++ libdata-compare-perl-1.25/debian/changelog 2016-01-22 15:50:07.000000000 +0100
@@ -1,3 +1,10 @@
+libdata-compare-perl (1.25-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * New upstream release (Closes: #812339).
+
+ -- Michael Prokop <[email protected]> Fri, 22 Jan 2016 15:37:20 +0100
+
libdata-compare-perl (1.23-0.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru libdata-compare-perl-1.23/lib/Data/Compare.pm libdata-compare-perl-1.25/lib/Data/Compare.pm
--- libdata-compare-perl-1.23/lib/Data/Compare.pm 2013-09-26 15:32:03.000000000 +0200
+++ libdata-compare-perl-1.25/lib/Data/Compare.pm 2014-12-10 14:31:08.000000000 +0100
@@ -17,7 +17,7 @@
@ISA = qw(Exporter);
@EXPORT = qw(Compare);
-$VERSION = 1.23;
+$VERSION = 1.25;
$DEBUG = $ENV{PERL_DATA_COMPARE_DEBUG} || 0;
my %handler;
@@ -144,7 +144,7 @@
elsif ($refx ne $refy) { # not the same type
$rval = 0;
}
- elsif ($x == $y) { # exactly the same reference
+ elsif (Scalar::Util::refaddr($x) == Scalar::Util::refaddr($y)) { # exactly the same reference
$rval = 1;
}
elsif ($refx eq 'SCALAR' || $refx eq 'REF') {
@@ -184,7 +184,7 @@
$rval = 0;
}
else { # a package name (object blessed)
- my ($type) = "$x" =~ m/^$refx=(\S+)\(/;
+ my $type = Scalar::Util::reftype($x);
if ($type eq 'HASH') {
my %x = %$x;
my %y = %$y;
@@ -405,7 +405,7 @@
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
-Some parts copyright 2003 - 2013 David Cantrell.
+Some parts copyright 2003 - 2014 David Cantrell.
Seeing that Fabien seems to have disappeared, David Cantrell has become
a co-maintainer so he can apply needed patches. The licence, of course,
@@ -415,6 +415,8 @@
=head1 SEE ALSO
+L<Test::Deep::NoTest>
+
perl(1), perlref(1)
=cut
diff -Nru libdata-compare-perl-1.23/t/lib/SpecialClass.pm libdata-compare-perl-1.25/t/lib/SpecialClass.pm
--- libdata-compare-perl-1.23/t/lib/SpecialClass.pm 1970-01-01 01:00:00.000000000 +0100
+++ libdata-compare-perl-1.25/t/lib/SpecialClass.pm 2014-12-10 14:29:25.000000000 +0100
@@ -0,0 +1,12 @@
+package SpecialClass;
+use strict;use warnings;
+use overload
+ '""' => \&to_string,
+ '0+' => \&to_number,
+ fallback=>1;
+
+sub new { my ($class,%data) = @_; bless {%data},$class }
+sub to_string { return $_[0]->{str} || 'foo' }
+sub to_number { return $_[0]->{num} || 12 }
+
+1;
diff -Nru libdata-compare-perl-1.23/t/overload.t libdata-compare-perl-1.25/t/overload.t
--- libdata-compare-perl-1.23/t/overload.t 1970-01-01 01:00:00.000000000 +0100
+++ libdata-compare-perl-1.25/t/overload.t 2014-12-10 14:29:48.000000000 +0100
@@ -0,0 +1,15 @@
+use strict;
+use warnings;
+use lib 't/lib';
+use SpecialClass;
+
+use Data::Compare;
+use Test::More tests=>2;
+
+ok(!Compare(SpecialClass->new(str=>'bar'),
+ SpecialClass->new(str=>'bar',num=>15)),
+ 'String overload does not fool it');
+
+ok(!Compare(SpecialClass->new(str=>'bar',num=>15),
+ SpecialClass->new(str=>'boo',num=>15)),
+ 'Numeric overload does not fool it');
diff -Nru libdata-compare-perl-1.23/t/saritha-nalagandla-bug.t libdata-compare-perl-1.25/t/saritha-nalagandla-bug.t
--- libdata-compare-perl-1.23/t/saritha-nalagandla-bug.t 2011-07-23 15:45:21.000000000 +0200
+++ libdata-compare-perl-1.25/t/saritha-nalagandla-bug.t 2014-04-05 19:34:32.000000000 +0200
@@ -6,7 +6,7 @@
eval "use JSON";
if($@) {
eval 'use Test::More skip_all => "no JSON support";exit 0';
-} elsif($JSON::VERSION < 2) {
+} elsif($JSON::VERSION < 2.9) {
eval 'use Test::More skip_all => "JSON module too old";exit 0';
} else {
eval 'use Test::More tests => 2';
diff -Nru libdata-compare-perl-1.23/t/taint.t libdata-compare-perl-1.25/t/taint.t
--- libdata-compare-perl-1.23/t/taint.t 2011-07-23 15:45:21.000000000 +0200
+++ libdata-compare-perl-1.25/t/taint.t 2014-09-24 14:22:57.000000000 +0200
@@ -16,7 +16,7 @@
$ENV{PERL5LIB} = '';
exec(
join(' ',
- $^X,
+ $Config{perlpath},
'-Tw',
(
# map { "-I$_" }
signature.asc
Description: Digital signature
