[DebianGIS-dev] r1188 - in packages/gpsdrive/trunk/debian: . patches
nd-guest at alioth.debian.org
nd-guest at alioth.debian.org
Mon Oct 15 10:57:56 UTC 2007
Author: nd-guest
Date: 2007-10-15 10:57:56 +0000 (Mon, 15 Oct 2007)
New Revision: 1188
Added:
packages/gpsdrive/trunk/debian/patches/70-perl.dpatch
Modified:
packages/gpsdrive/trunk/debian/changelog
packages/gpsdrive/trunk/debian/gpsdrive-scripts.install
packages/gpsdrive/trunk/debian/patches/00list
Log:
- Add patch to move perl modules to gpsdrive dir, updated install file
- Updated changelog
Modified: packages/gpsdrive/trunk/debian/changelog
===================================================================
--- packages/gpsdrive/trunk/debian/changelog 2007-10-15 10:56:18 UTC (rev 1187)
+++ packages/gpsdrive/trunk/debian/changelog 2007-10-15 10:57:56 UTC (rev 1188)
@@ -2,25 +2,33 @@
* New upstream release.
* Split the package to lower dependencies (-scripts) and
- disk space (map-icons).
+ disk space usage (map-icons).
* Repackage upstream tarball to remove the debian/ dir.
Added get-orig-source target to debian/rules.
+ * Removed gpsfetchmap.pl from upstream tarball due to license issues.
+ A new version has been released under GPL which will be installed from
+ debian/scripts/gpsfetchmap.pl now. Updated the manpage for that reason.
* Updated debian/copyright.
* Add Homepage field in debian/control.
* Bumped to debhelper compat level 5.
* Removed some docs and install some of the scripts as examples.
* Added Build-Depends on automake1.9.
+ * Add 01-make.dpatch to remove unneeded dirs from Makefile.{am,in}
+ and to remove checks for perl modules in configure.ac
+ * Add 03-manpage.dpatch, merged typo fixes for manpage from old patch.
+ * Add 10-mapnikdir.dpatch to install mapnik files in gpsdrive dir.
+ * Add 20-homedir.dpatch to avoid overriding files in user's homedir.
* Add 30-icons.dpatch so that the icons are found.
* Add 40-backported.dpatch to include some bugfixes from upstream VCS.
- * Add 50-scripts.dpatch.
+ * Add 50-scripts.dpatch to use python2.5.
+ * Add 60-sql.dpatch, merged from old patch.
+ * Add 70-perl.dpatch to avoid namespace clashes for the perl modules.
* Removed 04_missing_includes.dpatch - package builds fine with gcc-4.3.
* Removed 05_start_gpsd.dpatch - feature has been removed.
* Removed debian/man dir.
- * Removed gpsfetchmap.pl from upstream tarball due to license issues.
- A new version has been released under GPL which will be installed from
- debian/scripts/gpsfetchmap.pl now. Updated the manpage for that reason.
+ * Added postgres and osm2pgsql do Suggests in debian/control.
- -- Andreas Putzo <andreas at putzo.net> Fri, 05 Oct 2007 11:34:41 +0000
+ -- Andreas Putzo <andreas at putzo.net> Mon, 15 Oct 2007 10:52:17 +0000
gpsdrive (2.10~pre2-2) unstable; urgency=low
Modified: packages/gpsdrive/trunk/debian/gpsdrive-scripts.install
===================================================================
--- packages/gpsdrive/trunk/debian/gpsdrive-scripts.install 2007-10-15 10:56:18 UTC (rev 1187)
+++ packages/gpsdrive/trunk/debian/gpsdrive-scripts.install 2007-10-15 10:57:56 UTC (rev 1188)
@@ -7,9 +7,9 @@
usr/bin/gpsreplay
usr/bin/poi-manager.pl
usr/bin/gpsdrive_mapnik_gentiles.py
-usr/share/perl5/Geo/Filter/*
-usr/share/perl5/Geo/GPX/*
-usr/share/perl5/Geo/Geometry.pm
+usr/share/perl5/Geo/Filter/* usr/share/perl5/Geo/Gpsdrive/Filter
+usr/share/perl5/Geo/GPX/* usr/share/perl5/Geo/Gpsdrive/GPX
+usr/share/perl5/Geo/Geometry.pm usr/share/perl5/Geo/Gpsdrive
usr/share/perl5/Geo/Gpsdrive/*
-usr/share/perl5/Geo/OSM/Planet.pm
-usr/share/perl5/Utils/*
+usr/share/perl5/Geo/OSM/Planet.pm usr/share/perl5/Geo/Gpsdrive/OSM
+usr/share/perl5/Utils/* usr/share/perl5/Geo/Gpsdrive/Utils
Modified: packages/gpsdrive/trunk/debian/patches/00list
===================================================================
--- packages/gpsdrive/trunk/debian/patches/00list 2007-10-15 10:56:18 UTC (rev 1187)
+++ packages/gpsdrive/trunk/debian/patches/00list 2007-10-15 10:57:56 UTC (rev 1188)
@@ -6,3 +6,4 @@
40-backported
50-scripts
60-sql
+70-perl
Added: packages/gpsdrive/trunk/debian/patches/70-perl.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/70-perl.dpatch (rev 0)
+++ packages/gpsdrive/trunk/debian/patches/70-perl.dpatch 2007-10-15 10:57:56 UTC (rev 1188)
@@ -0,0 +1,335 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70-perl.dpatch by Andreas Putzo <andreas at putzo.net>
+##
+## DP: Move perl modules to Geo::Gpsdrive for now.
+
+ at 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 2007-10-15 09:25:20.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;
+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 2007-10-15 09:07:42.000000000 +0000
+@@ -1,5 +1,5 @@
+ ##################################################################
+-package Geo::Filter::Area;
++package Geo::Gpsdrive::Filter::Area;
+ ##################################################################
+
+ use strict;
+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 2007-10-15 08:57:57.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 2007-10-15 08:56:47.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 2007-10-15 08:51:45.000000000 +0000
++++ gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/Gpsdrive/OSM.pm 2007-10-15 09:08:27.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;
+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 2007-10-15 09:04:18.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 2007-10-15 09:08:58.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 2007-10-15 09:10:33.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 2007-10-15 09:09:20.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 2007-10-15 09:09:28.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 2007-10-15 09:10:57.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 2007-10-15 08:54:45.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 2007-10-15 08:55:12.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 2007-10-15 08:55:49.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 2007-10-15 08:55:26.000000000 +0000
+@@ -1,5 +1,5 @@
+ ##################################################################
+-package Utils::Math;
++package Geo::Gpsdrive::Utils::Math;
+ ##################################################################
+
+ use strict;
Property changes on: packages/gpsdrive/trunk/debian/patches/70-perl.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-grass-devel
mailing list