[DebianGIS-dev] r1139 - in packages/gpsdrive/trunk/debian: . patches

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2007-09-29 22:27:52 +0000 (Sat, 29 Sep 2007)
New Revision: 1139

Modified:
   packages/gpsdrive/trunk/debian/changelog
   packages/gpsdrive/trunk/debian/gpsdrive-scripts.install
   packages/gpsdrive/trunk/debian/patches/30-icons.dpatch
Log:
* added icon path for perl modules.
* added missing Geo::OSM::Planet module.


Modified: packages/gpsdrive/trunk/debian/changelog
===================================================================
--- packages/gpsdrive/trunk/debian/changelog	2007-09-29 21:39:10 UTC (rev 1138)
+++ packages/gpsdrive/trunk/debian/changelog	2007-09-29 22:27:52 UTC (rev 1139)
@@ -1,12 +1,13 @@
 gpsdrive (2.10~pre4-1) UNRELEASED; urgency=low
 
   * New upstream release.
-  * Split the package to lower dependencies (-scripts) and 
+  * Split the package to lower dependencies (-scripts) and
     disk space (map-icons).
   * Repackage upstream tarball to remove the debian/ dir.
     Added get-orig-source target to debian/rules.
+  * Add 30-icons.dpatch so that the icons are found. 
 
- -- Andreas Putzo <andreas at putzo.net>  Sat, 29 Sep 2007 16:23:17 +0000
+ -- Andreas Putzo <andreas at putzo.net>  Sat, 29 Sep 2007 21:40:04 +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-09-29 21:39:10 UTC (rev 1138)
+++ packages/gpsdrive/trunk/debian/gpsdrive-scripts.install	2007-09-29 22:27:52 UTC (rev 1139)
@@ -9,3 +9,4 @@
 usr/bin/poi-manager.pl
 usr/bin/gpsdrive_mapnik_gentiles.py
 usr/share/perl5/Geo/Gpsdrive/*
+usr/share/perl5/Geo/OSM/Planet.pm                               

Modified: packages/gpsdrive/trunk/debian/patches/30-icons.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/30-icons.dpatch	2007-09-29 21:39:10 UTC (rev 1138)
+++ packages/gpsdrive/trunk/debian/patches/30-icons.dpatch	2007-09-29 22:27:52 UTC (rev 1139)
@@ -1,13 +1,35 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 30-icons.dpatch by Andreas Putzo <andreas at putzo.net>
 ##
-## DP: Add icon search path
-## DP: Point gpsdrive to its icons.xml file
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
 
 @DPATCH@
+diff -urNad gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/Gpsdrive/DB_Defaults.pm gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/Gpsdrive/DB_Defaults.pm
+--- gpsdrive-2.10~pre4~/scripts/osm/perl_lib/Geo/Gpsdrive/DB_Defaults.pm	2007-09-15 15:12:11.000000000 +0000
++++ gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/Gpsdrive/DB_Defaults.pm	2007-09-29 21:54:55.000000000 +0000
+@@ -52,6 +52,7 @@
+     $icon_file = '/usr/local/share/map-icons/icons.xml' unless -s $icon_file;
+     $icon_file = '/usr/share/map-icons/icons.xml'       unless -s $icon_file;
+     $icon_file = '/opt/gpsdrive/icons.xml'              unless -s $icon_file;
++    $icon_file = '/usr/share/gpsdrive/map-icons/icons.xml' unless -s $icon_file;
+     die "no Icon File found" unless -s $icon_file;
+ 
+     our $title = ''; our $title_en = '';
+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-09-15 18:04:02.000000000 +0000
++++ gpsdrive-2.10~pre4/scripts/osm/perl_lib/Geo/Gpsdrive/OSM.pm	2007-09-29 21:57:27.000000000 +0000
+@@ -574,6 +574,7 @@
+ 		 "data/map-icons/icons.xml",
+ 		 "/usr/local/map-icons/icons.xml",
+ 		 "/usr/local/share/map-icons/icons.xml",
++         "/usr/share/gpsdrive/map-icons/icons.xml",
+ 		 ) {
+ 	unless ( $icons_filename && -s $icons_filename ){
+ 	    print STDERR "Checking icons-file: $fn\n"
 diff -urNad gpsdrive-2.10~pre4~/src/icons.c gpsdrive-2.10~pre4/src/icons.c
---- gpsdrive-2.10~pre4~/src/icons.c	2007-09-29 21:20:29.000000000 +0000
-+++ gpsdrive-2.10~pre4/src/icons.c	2007-09-29 21:21:01.000000000 +0000
+--- gpsdrive-2.10~pre4~/src/icons.c	2007-09-29 21:32:42.000000000 +0000
++++ gpsdrive-2.10~pre4/src/icons.c	2007-09-29 21:53:08.000000000 +0000
 @@ -219,6 +219,7 @@
      {"%s/gpsdrive/pixmaps/", (gchar *) DATADIR},
      {"%s/map-icons/", "/usr/share"},
@@ -17,8 +39,8 @@
    };
  
 diff -urNad gpsdrive-2.10~pre4~/src/poi.c gpsdrive-2.10~pre4/src/poi.c
---- gpsdrive-2.10~pre4~/src/poi.c	2007-09-29 21:20:29.000000000 +0000
-+++ gpsdrive-2.10~pre4/src/poi.c	2007-09-29 21:20:46.000000000 +0000
+--- gpsdrive-2.10~pre4~/src/poi.c	2007-09-29 21:32:42.000000000 +0000
++++ gpsdrive-2.10~pre4/src/poi.c	2007-09-29 21:53:08.000000000 +0000
 @@ -713,7 +713,7 @@
  	if (xml_reader == NULL)
  	{