#! /bin/sh /usr/share/dpatch/dpatch-run
## 70-perl.dpatch by Andreas Putzo <andreas@putzo.net>
##
## DP: Move perl modules to Geo::Gpsdrive for now.

@DPATCH@
diff -urNad gpsdrive-2.10~pre4~/scripts/geoinfo.pl gpsdrive-2.10~pre4/scripts/geoinfo.pl
--- gpsdrive-2.10~pre4~/scripts/geoinfo.pl	2007-09-15 15:11:59.000000000 +0000
+++ gpsdrive-2.10~pre4/scripts/geoinfo.pl	2008-01-08 23:15:25.000000000 +0000
@@ -45,7 +45,7 @@
 use IO::File;
 use Pod::Usage;
 
-use Utils::Debug;
+use Geo::Gpsdrive::Utils::Debug;
 
 use Geo::Gpsdrive::DBFuncs;
 use Geo::Gpsdrive::Utils;
@@ -193,7 +193,7 @@
 }
 
 if ( $do_list_areas ) {
-    print Geo::Filter::Area->list_areas()."\n";
+    print Geo::Gpsdrive::Filter::Area->list_areas()."\n";
 }
 
 pod2usage(1) if $help;
diff -urNad gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/Filter/Area.pm gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/Filter/Area.pm
--- gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/Filter/Area.pm	2007-09-14 21:47:52.000000000 +0000
+++ gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/Filter/Area.pm	2008-01-08 23:15:25.000000000 +0000
@@ -1,5 +1,5 @@
 ##################################################################
-package Geo::Filter::Area;
+package Geo::Gpsdrive::Filter::Area;
 ##################################################################
 
 use strict;
@@ -136,7 +136,7 @@
 
 # ------------------------------------------------------------------
 
-my $test_area = Geo::Filter::Area->new(area=>"uk");
+my $test_area = Geo::Gpsdrive::Filter::Area->new(area=>"uk");
 if ( $test_area->inside({lat=>10,lon=>10})) {
     Carp::confess("Area filters are not working\n");
 };
diff -urNad gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/GPX/File.pm gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/GPX/File.pm
--- gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/GPX/File.pm	2007-09-14 21:47:52.000000000 +0000
+++ gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/GPX/File.pm	2008-01-08 23:15:25.000000000 +0000
@@ -1,5 +1,5 @@
 ##################################################################
-package Geo::GPX::File;
+package Geo::Gpsdrive::GPX::File;
 ##################################################################
 
 use Exporter;
@@ -18,10 +18,10 @@
 use Date::Manip;
 use POSIX qw(strftime);
 
-use Geo::Geometry;
-use Utils::File;
-use Utils::Math;
-use Utils::Debug;
+use Geo::Gpsdrive::Geometry;
+use Geo::Gpsdrive::Utils::File;
+use Geo::Gpsdrive::Utils::Math;
+use Geo::Gpsdrive::Utils::Debug;
 
 # -----------------------------------------------------------------------------
 # Read GPS Data from GPX - File
diff -urNad gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/Geometry.pm gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/Geometry.pm
--- gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/Geometry.pm	2007-09-14 21:47:52.000000000 +0000
+++ gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/Geometry.pm	2008-01-08 23:15:25.000000000 +0000
@@ -1,5 +1,5 @@
 ##################################################################
-package Geo::Geometry;
+package Geo::Gpsdrive::Geometry;
 ##################################################################
 
 use strict;
@@ -16,9 +16,9 @@
 
 use Math::Trig;
 
-use Utils::File;
-use Utils::Math;
-use Utils::Debug;
+use Geo::Gpsdrive::Utils::File;
+use Geo::Gpsdrive::Utils::Math;
+use Geo::Gpsdrive::Utils::Debug;
 
 # ------------------------------------------------------------------
 # Distance in Km between 2 geo points with lat/lon
diff -urNad gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/Gpsdrive/OSM.pm gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/Gpsdrive/OSM.pm
--- gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/Gpsdrive/OSM.pm	2008-01-08 23:15:22.000000000 +0000
+++ gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/Gpsdrive/OSM.pm	2008-01-08 23:16:55.000000000 +0000
@@ -13,16 +13,15 @@
 use File::Path;
 use Geo::Gpsdrive::DBFuncs;
 use Geo::Gpsdrive::Utils;
-use Geo::OSM::Planet;
+use Geo::Gpsdrive::OSM::Planet;
 use Data::Dumper;
 use XML::Parser;
 use XML::Simple;
-use Geo::Filter::Area;
-use Geo::OSM::Planet;
-use Utils::Debug;
-use Utils::File;
-use Utils::LWP::Utils;
-use Utils::Math;
+use Geo::Gpsdrive::Filter::Area;
+use Geo::Gpsdrive::Utils::Debug;
+use Geo::Gpsdrive::Utils::File;
+use Geo::Gpsdrive::Utils::LWP::Utils;
+use Geo::Gpsdrive::Utils::Math;
 
 our $OSM_polite  = 10; # Wait n times as long as the request lasted
 our $AREA_FILTER;
@@ -411,7 +410,7 @@
 
     my $start_time=time();
 
-    $AREA_FILTER = Geo::Filter::Area->new( area => $area_name );
+    $AREA_FILTER = Geo::Gpsdrive::Filter::Area->new( area => $area_name );
 
     print("\rReading $file_name for $area_name\n") if $VERBOSE || $debug;
     print "$file_name:	".(-s $file_name)." Bytes\n" if $debug;
diff -urNad gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/OSM/Planet.pm gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/OSM/Planet.pm
--- gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/OSM/Planet.pm	2007-09-15 01:24:19.000000000 +0000
+++ gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/OSM/Planet.pm	2008-01-08 23:15:25.000000000 +0000
@@ -1,5 +1,5 @@
 ##################################################################
-package Geo::OSM::Planet;
+package Geo::Gpsdrive::OSM::Planet;
 ##################################################################
 
 use Exporter;
@@ -26,9 +26,9 @@
 use Storable ();
 use Data::Dumper;
 
-use Utils::File;
-use Utils::Debug;
-use Utils::LWP::Utils;
+use Geo::Gpsdrive::Utils::File;
+use Geo::Gpsdrive::Utils::Debug;
+use Geo::Gpsdrive::Utils::LWP::Utils;
 
 
 # As of planet-061220
diff -urNad gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/Tracks/GpsBabel.pm gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/Tracks/GpsBabel.pm
--- gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/Tracks/GpsBabel.pm	2007-09-14 21:47:52.000000000 +0000
+++ gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/Tracks/GpsBabel.pm	2008-01-08 23:15:25.000000000 +0000
@@ -1,5 +1,5 @@
 ##################################################################
-package Geo::Tracks::GpsBabel;
+package Geo::Gpsdrive::Tracks::GpsBabel;
 ##################################################################
 
 use Exporter;
@@ -11,11 +11,11 @@
 use warnings;
 use IO::File;
 
-use Geo::Geometry;
-use Utils::File;
-use Utils::Math;
-use Utils::Debug;
-use Geo::GPX::File;
+use Geo::Gpsdrive::Geometry;
+use Geo::Gpsdrive::Utils::File;
+use Geo::Gpsdrive::Utils::Math;
+use Geo::Gpsdrive::Utils::Debug;
+use Geo::Gpsdrive::GPX::File;
 
 
 # -----------------------------------------------------------------------------
diff -urNad gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/Tracks/Kismet.pm gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/Tracks/Kismet.pm
--- gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/Tracks/Kismet.pm	2007-09-14 21:47:52.000000000 +0000
+++ gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/Tracks/Kismet.pm	2008-01-08 23:15:25.000000000 +0000
@@ -1,5 +1,5 @@
 ##################################################################
-package Geo::Tracks::Kismet;
+package Geo::Gpsdrive::Tracks::Kismet;
 ##################################################################
 
 use Exporter;
@@ -15,10 +15,10 @@
 use Data::Dumper;
 
 use Data::Dumper;
-use Geo::Geometry;
-use Utils::Debug;
-use Utils::File;
-use Utils::Math;
+use Geo::Gpsdrive::Geometry;
+use Geo::Gpsdrive::Utils::Debug;
+use Geo::Gpsdrive::Utils::File;
+use Geo::Gpsdrive::Utils::Math;
 
 # -----------------------------------------------------------------------------
 # Read GPS Data from Kismet File
@@ -61,7 +61,7 @@
     }
     my $track=[];
     for my $elem  ( @{$content->[0]->{Kids}} ) {
-	next unless ref($elem) eq "Geo::Tracks::Kismet::gps-point";
+	next unless ref($elem) eq "Geo::Gpsdrive::Tracks::Kismet::gps-point";
 	next unless $elem->{'bssid'} eq 'GP:SD:TR:AC:KL:OG';
 	delete $elem->{Kids};
 	if ( defined($elem->{"time-sec"}) && defined($elem->{"time-usec"}) ) {
diff -urNad gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/Tracks/NMEA.pm gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/Tracks/NMEA.pm
--- gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/Tracks/NMEA.pm	2007-09-14 21:47:52.000000000 +0000
+++ gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/Tracks/NMEA.pm	2008-01-08 23:15:25.000000000 +0000
@@ -1,5 +1,5 @@
 ##################################################################
-package Geo::Tracks::NMEA;
+package Geo::Gpsdrive::Tracks::NMEA;
 ##################################################################
 
 use Exporter;
@@ -16,10 +16,10 @@
 use IO::File;
 use Math::Trig;
 
-use Geo::Geometry;
-use Utils::Debug;
-use Utils::File;
-use Utils::Math;
+use Geo::Gpsdrive::Geometry;
+use Geo::Gpsdrive::Utils::Debug;
+use Geo::Gpsdrive::Utils::File;
+use Geo::Gpsdrive::Utils::Math;
 
 # -----------------------------------------------------------------------------
 # Read GPS Data from NMEA - File
diff -urNad gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/Tracks/TRK.pm gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/Tracks/TRK.pm
--- gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/Tracks/TRK.pm	2007-09-14 21:47:52.000000000 +0000
+++ gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/Tracks/TRK.pm	2008-01-08 23:15:25.000000000 +0000
@@ -1,5 +1,5 @@
 ##################################################################
-package Geo::Tracks::TRK;
+package Geo::Gpsdrive::Tracks::TRK;
 ##################################################################
 
 use Exporter;
@@ -12,9 +12,9 @@
 
 use Data::Dumper;
 use IO::File;
-use Utils::Debug;
-use Utils::File;
-use Utils::Math;
+use Geo::Gpsdrive::Utils::Debug;
+use Geo::Gpsdrive::Utils::File;
+use Geo::Gpsdrive::Utils::Math;
 use Date::Manip;
 use Date::Parse;
 use Time::Local;
diff -urNad gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/Tracks/Tools.pm gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/Tracks/Tools.pm
--- gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/Tracks/Tools.pm	2007-09-14 21:47:52.000000000 +0000
+++ gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/Tracks/Tools.pm	2008-01-08 23:15:25.000000000 +0000
@@ -1,5 +1,5 @@
 ##################################################################
-package Geo::Tracks::Tools;
+package Geo::Gpsdrive::Tracks::Tools;
 ##################################################################
 
 use Exporter;
@@ -23,10 +23,10 @@
 use warnings;
 use Carp;
 
-use Geo::Geometry;
-use Utils::File;
-use Utils::Math;
-use Utils::Debug;
+use Geo::Gpsdrive::Geometry;
+use Geo::Gpsdrive::Utils::File;
+use Geo::Gpsdrive::Utils::Math;
+use Geo::Gpsdrive::Utils::Debug;
 
 # Copy the track structure
 sub copy_track_structure($$){
@@ -364,7 +364,7 @@
 
 =head1 NAME
 
-Geo::Tracks::Tools
+Geo::Gpsdrive::Tracks::Tools
 
 =head1 COPYRIGHT
 
diff -urNad gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Utils/Debug.pm gpsdrive-2.10~pre4/scripts/osm/perl_lib/Utils/Debug.pm
--- gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Utils/Debug.pm	2007-09-14 21:47:52.000000000 +0000
+++ gpsdrive-2.10~pre4/scripts/osm/perl_lib/Utils/Debug.pm	2008-01-08 23:15:25.000000000 +0000
@@ -1,5 +1,5 @@
 ##################################################################
-package Utils::Debug;
+package Geo::Gpsdrive::Utils::Debug;
 ##################################################################
 
 use Exporter;
@@ -19,7 +19,7 @@
 use warnings;
 
 use IO::File;
-use Utils::Math;
+use Geo::Gpsdrive::Utils::Math;
 
 
 # print the time elapsed since starting
diff -urNad gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Utils/File.pm gpsdrive-2.10~pre4/scripts/osm/perl_lib/Utils/File.pm
--- gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Utils/File.pm	2007-09-14 21:47:52.000000000 +0000
+++ gpsdrive-2.10~pre4/scripts/osm/perl_lib/Utils/File.pm	2008-01-08 23:15:25.000000000 +0000
@@ -1,5 +1,5 @@
 ##################################################################
-package Utils::File;
+package Geo::Gpsdrive::Utils::File;
 ##################################################################
 
 use Exporter;
@@ -15,7 +15,7 @@
 use warnings;
 
 use IO::File;
-use Utils::Debug;
+use Geo::Gpsdrive::Utils::Debug;
 
 use File::Basename;
 use File::Copy;
diff -urNad gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Utils/LWP/Utils.pm gpsdrive-2.10~pre4/scripts/osm/perl_lib/Utils/LWP/Utils.pm
--- gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Utils/LWP/Utils.pm	2007-09-14 21:47:52.000000000 +0000
+++ gpsdrive-2.10~pre4/scripts/osm/perl_lib/Utils/LWP/Utils.pm	2008-01-08 23:15:25.000000000 +0000
@@ -1,5 +1,5 @@
 ##################################################################
-package Utils::LWP::Utils;
+package Geo::Gpsdrive::Utils::LWP::Utils;
 ##################################################################
 
 use Exporter;
@@ -14,7 +14,7 @@
 
 use LWP::UserAgent;
 
-use Utils::Debug;
+use Geo::Gpsdrive::Utils::Debug;
 
 our $PROXY='';
 
diff -urNad gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Utils/Math.pm gpsdrive-2.10~pre4/scripts/osm/perl_lib/Utils/Math.pm
--- gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Utils/Math.pm	2007-09-14 21:47:52.000000000 +0000
+++ gpsdrive-2.10~pre4/scripts/osm/perl_lib/Utils/Math.pm	2008-01-08 23:15:25.000000000 +0000
@@ -1,5 +1,5 @@
 ##################################################################
-package Utils::Math;
+package Geo::Gpsdrive::Utils::Math;
 ##################################################################
 
 use strict;