[libgeo-point-perl] 03/07: Remove patches applied upstream, before entering Debian

[Daniel Lintott]

This is an automated email from the git hooks/post-receive script.

dlintott-guest pushed a commit to branch master
in repository libgeo-point-perl.

commit 2bc821d4c0342f7954a0324d4dfbddf3ccc3f6e1
Author: Daniel Lintott <daniel at serverb.co.uk>
Date:   Sat Feb 22 20:27:02 2014 +0000

    Remove patches applied upstream, before entering Debian
    
    Git-Dch: Ignore
---
 .../patches/0001-Fix-distance-calculations.patch   | 49 ----------------------
 ...e-degree-and-radian-custom-distance-units.patch | 48 ---------------------
 2 files changed, 97 deletions(-)

diff --git a/debian/patches/0001-Fix-distance-calculations.patch b/debian/patches/0001-Fix-distance-calculations.patch
deleted file mode 100644
index 5468f89..0000000
--- a/debian/patches/0001-Fix-distance-calculations.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 7462faadd61d3e24661aa6ee1dab6febb6e575a1 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni at debian.org>
-Date: Fri, 17 Jan 2014 16:22:19 +0200
-Subject: [PATCH 1/2] Fix distance calculations
-Bug-Debian: http://bugs.debian.org/735744
-Bug: https://rt.cpan.org/Ticket/Display.html?id=92242
-
-Geo::Distance, at least version 0.20, doesn't offer a distance_calc()
-method at all.
----
- lib/Geo/Point.pm |  2 +-
- t/11point.t      | 11 ++++++++++-
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
---- a/lib/Geo/Point.pm
-+++ b/lib/Geo/Point.pm
-@@ -230,7 +230,7 @@ sub distancePointPoint($$$)
- 
-     my $here  = $self->in('wgs84');
-     my $there = $other->in('wgs84');
--    $geodist->distance_calc($units, $here->latlong, $there->latlong);
-+    $geodist->distance($units, $here->latlong, $there->latlong);
- }
- 
- 
---- a/t/11point.t
-+++ b/t/11point.t
-@@ -8,7 +8,7 @@ use warnings;
- 
- use lib qw(. lib tests ../MathPolygon/lib ../../MathPolygon/lib);
- 
--use Test::More tests => 39;
-+use Test::More tests => 40;
- 
- use Geo::Point;
- use Geo::Proj;
-@@ -91,3 +91,12 @@ is($p->string, 'point[utm-31](5.0000 4.0
- is($p->x, 5);
- is($p->y, 4);
- 
-+#
-+# distance
-+#
-+
-+my $p1 = $gp->latlong(0, 1);
-+my $p2 = $gp->latlong(1, 1);
-+
-+cmp_ok(abs($p1->distance($p2, 'nautical mile') - 60), '<', 0.1);
-+
diff --git a/debian/patches/0002-Fix-the-degree-and-radian-custom-distance-units.patch b/debian/patches/0002-Fix-the-degree-and-radian-custom-distance-units.patch
deleted file mode 100644
index 2b7ae1e..0000000
--- a/debian/patches/0002-Fix-the-degree-and-radian-custom-distance-units.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 056c53aff0c2a2b44be7df1d6ed67843005b5183 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni at debian.org>
-Date: Fri, 17 Jan 2014 17:07:43 +0200
-Subject: [PATCH 2/2] Fix the 'degree' and 'radian' custom distance units
-Bug-Debian: http://bugs.debian.org/735744
-Bug: https://rt.cpan.org/Ticket/Display.html?id=92242
-
-The error in reg_unit() call was probably a victim of a bug in
-Geo::Distance documentation, see http://bugs.debian.org/735682
-
-The geometrical interpretation of these distance units isn't
-obvious to me, so just check that results are nonzero.
----
- lib/Geo/Shape.pm | 4 ++--
- t/11point.t      | 5 ++++-
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
---- a/lib/Geo/Shape.pm
-+++ b/lib/Geo/Shape.pm
-@@ -90,8 +90,8 @@ sub distance($;$)
-     unless($geodist)
-     {   $geodist = Geo::Distance->new;
-         $geodist->formula('hsin');
--        $geodist->reg_unit(radians => 1);
--        $geodist->reg_unit(degrees => deg2rad(1));
-+        $geodist->reg_unit(1 => 'radians');
-+        $geodist->reg_unit(deg2rad(1) => 'degrees');
-         $geodist->reg_unit(km => 1, 'kilometer');
-     }
- 
---- a/t/11point.t
-+++ b/t/11point.t
-@@ -8,7 +8,7 @@ use warnings;
- 
- use lib qw(. lib tests ../MathPolygon/lib ../../MathPolygon/lib);
- 
--use Test::More tests => 40;
-+use Test::More tests => 42;
- 
- use Geo::Point;
- use Geo::Proj;
-@@ -100,3 +100,6 @@ my $p2 = $gp->latlong(1, 1);
- 
- cmp_ok(abs($p1->distance($p2, 'nautical mile') - 60), '<', 0.1);
- 
-+isnt($p1->distance($p2, 'degrees'), 0);
-+isnt($p1->distance($p2, 'radians'), 0);
-+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libgeo-point-perl.git