diff -Nru libgeo-distance-perl-0.19/Changes libgeo-distance-perl-0.20/Changes --- libgeo-distance-perl-0.19/Changes 2012-04-04 04:21:58.000000000 +0000 +++ libgeo-distance-perl-0.20/Changes 2012-10-19 15:24:40.000000000 +0000 @@ -1,5 +1,9 @@ Revision history for Perl extension Geo::Distance. +0.20 2012-10-19 + - Fix a test that was comparing floating point numbers and falling over on + some platforms. + 0.19 2012-04-03 - Fix various typos. - Fix floating point error in the hsin formula. diff -Nru libgeo-distance-perl-0.19/META.yml libgeo-distance-perl-0.20/META.yml --- libgeo-distance-perl-0.19/META.yml 2012-04-04 04:21:58.000000000 +0000 +++ libgeo-distance-perl-0.20/META.yml 2012-10-19 15:24:40.000000000 +0000 @@ -8,7 +8,7 @@ configure_requires: ExtUtils::MakeMaker: 6.30 dynamic_config: 0 -generated_by: 'Dist::Zilla version 4.300010, CPAN::Meta::Converter version 2.120630' +generated_by: 'Dist::Zilla version 4.300028, CPAN::Meta::Converter version 2.120921' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -19,4 +19,4 @@ resources: bugtracker: https://github.com/bluefeet/Geo-Distance/issues repository: git://github.com/bluefeet/Geo-Distance.git -version: 0.19 +version: 0.20 diff -Nru libgeo-distance-perl-0.19/Makefile.PL libgeo-distance-perl-0.20/Makefile.PL --- libgeo-distance-perl-0.19/Makefile.PL 2012-04-04 04:21:58.000000000 +0000 +++ libgeo-distance-perl-0.20/Makefile.PL 2012-10-19 15:24:40.000000000 +0000 @@ -25,7 +25,7 @@ "PREREQ_PM" => { "Math::Complex" => 0 }, - "VERSION" => "0.19", + "VERSION" => "0.20", "test" => { "TESTS" => "t/*.t" } diff -Nru libgeo-distance-perl-0.19/README libgeo-distance-perl-0.20/README --- libgeo-distance-perl-0.19/README 2012-04-04 04:21:58.000000000 +0000 +++ libgeo-distance-perl-0.20/README 2012-10-19 15:24:40.000000000 +0000 @@ -1,7 +1,7 @@ This archive contains the distribution Geo-Distance, -version 0.19: +version 0.20: Calculate Distances and Closest Locations diff -Nru libgeo-distance-perl-0.19/debian/changelog libgeo-distance-perl-0.20/debian/changelog --- libgeo-distance-perl-0.19/debian/changelog 2012-04-05 12:26:27.000000000 +0000 +++ libgeo-distance-perl-0.20/debian/changelog 2012-11-02 16:15:54.000000000 +0000 @@ -1,3 +1,18 @@ +libgeo-distance-perl (0.20-1) unstable; urgency=low + + * New upstream release. + + [ Jonas Smedegaard ] + * Update package relations: + + Relax to build-depend unversioned on cdbs: Needed version + satisfied in stable, and oldstable no longer supported. + * Update copyright file: + + Fix use comment and license pseudo-sections to obey silly + restrictions of copyright format 1.0. + * Bump debhelper compatibility level to 8. + + -- Jonas Smedegaard Fri, 02 Nov 2012 17:15:44 +0100 + libgeo-distance-perl (0.19-1) unstable; urgency=low * New upstream release. diff -Nru libgeo-distance-perl-0.19/debian/compat libgeo-distance-perl-0.20/debian/compat --- libgeo-distance-perl-0.19/debian/compat 2012-04-05 12:13:05.000000000 +0000 +++ libgeo-distance-perl-0.20/debian/compat 2012-11-02 16:13:34.000000000 +0000 @@ -1 +1 @@ -7 +8 diff -Nru libgeo-distance-perl-0.19/debian/control libgeo-distance-perl-0.20/debian/control --- libgeo-distance-perl-0.19/debian/control 2012-04-05 12:27:39.000000000 +0000 +++ libgeo-distance-perl-0.20/debian/control 2012-11-02 16:13:43.000000000 +0000 @@ -1,8 +1,8 @@ Source: libgeo-distance-perl Section: perl Priority: optional -Build-Depends: devscripts, - cdbs (>= 0.4.73~), +Build-Depends: cdbs, + devscripts, perl, debhelper, dh-buildinfo, diff -Nru libgeo-distance-perl-0.19/debian/copyright libgeo-distance-perl-0.20/debian/copyright --- libgeo-distance-perl-0.19/debian/copyright 2012-04-05 12:24:45.000000000 +0000 +++ libgeo-distance-perl-0.20/debian/copyright 2012-11-02 16:07:45.000000000 +0000 @@ -6,6 +6,9 @@ Files: * Copyright: 2012, Aran Clary Deltac License: Artistic or GPL-1+ +Comment: + License: + . This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. @@ -14,12 +17,14 @@ License: GPL-2+ License: Artistic -Comment: + Comment: + . On Debian systems the 'Artistic License' is located in '/usr/share/common-licenses/Artistic'. License: GPL-1+ -Comment: + Comment: + . On Debian systems the 'GNU General Public License' version 1 is located in '/usr/share/common-licenses/GPL-1'. @@ -33,7 +38,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -Comment: + . + Comment: + . On Debian systems the 'GNU General Public License' version 2 is located in '/usr/share/common-licenses/GPL'. . diff -Nru libgeo-distance-perl-0.19/debian/copyright_hints libgeo-distance-perl-0.20/debian/copyright_hints --- libgeo-distance-perl-0.19/debian/copyright_hints 2012-04-05 12:22:37.000000000 +0000 +++ libgeo-distance-perl-0.20/debian/copyright_hints 2012-11-02 16:08:57.000000000 +0000 @@ -25,6 +25,11 @@ License: UNKNOWN FIXME +Files: debian/rules +Copyright: 2011, Jonas Smedegaard +License: GPL-2+ + FIXME + Files: LICENSE Copyright: 1989, Free Software Foundation, Inc 19xx name of author @@ -44,12 +49,7 @@ interest in the notices and associated disclaimers the software, and -License: GPL-1+ - FIXME - -Files: debian/rules -Copyright: 2011, Jonas Smedegaard -License: GPL-2+ +License: GPL-ever FIXME Files: README diff -Nru libgeo-distance-perl-0.19/debian/rules libgeo-distance-perl-0.20/debian/rules --- libgeo-distance-perl-0.19/debian/rules 2012-04-05 12:22:09.000000000 +0000 +++ libgeo-distance-perl-0.20/debian/rules 2012-11-02 16:06:32.000000000 +0000 @@ -24,7 +24,7 @@ DEB_UPSTREAM_PACKAGE = Geo-Distance #DEB_UPSTREAM_URL = http://www.cpan.org/modules/by-module/Geo DEB_UPSTREAM_URL = http://search.cpan.org/CPAN/authors/id/B/BL/BLUEFEET -DEB_UPSTREAM_TARBALL_MD5 = adf18ee4f957805d9901c52eabbd83c9 +DEB_UPSTREAM_TARBALL_MD5 = 6206bfa7f203d10a12f7a1178be764d6 # Needed both by upstream build process and at runtime common-depends = libmath-complex-perl diff -Nru libgeo-distance-perl-0.19/lib/Geo/Distance.pm libgeo-distance-perl-0.20/lib/Geo/Distance.pm --- libgeo-distance-perl-0.19/lib/Geo/Distance.pm 2012-04-04 04:21:58.000000000 +0000 +++ libgeo-distance-perl-0.20/lib/Geo/Distance.pm 2012-10-19 15:24:40.000000000 +0000 @@ -1,6 +1,6 @@ package Geo::Distance; { - $Geo::Distance::VERSION = '0.19'; + $Geo::Distance::VERSION = '0.20'; } use strict; use warnings; diff -Nru libgeo-distance-perl-0.19/t/issue-github-2.t libgeo-distance-perl-0.20/t/issue-github-2.t --- libgeo-distance-perl-0.19/t/issue-github-2.t 2012-04-04 04:21:58.000000000 +0000 +++ libgeo-distance-perl-0.20/t/issue-github-2.t 2012-10-19 15:24:40.000000000 +0000 @@ -19,8 +19,11 @@ $geo->formula('hsin'); my $control_value = $geo->distance( 'mile', "-81.044","35.244", "-80.8272","35.1935" ); -cmp_ok( $new_value, '==', $control_value, 'gcd now produces same result as hsin' ); -cmp_ok( $old_value, '!=', $control_value, 'old gcd did not produce same result as hsin' ); +ok( abs($new_value - $control_value) < 0.00000000001, 'gcd now produces same result as hsin' ) or + diag "$new_value is not equal to $control_value"; + +ok( abs($old_value - $control_value) > 0.00000000001, 'old gcd did not produce same result as hsin' ) or + diag "$old_value is equal to $control_value"; sub old_gcd { my($geo,$unit,$lon1,$lat1,$lon2,$lat2) = @_;