#! /bin/sh /usr/share/dpatch/dpatch-run
## 30-icons.dpatch by Andreas Putzo <andreas@putzo.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add map-icon paths for debian.

@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: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"},
     {"%s/gpsdrive/pixmaps/", "/usr/share"},
+    {"/usr/share/icons/openstreetmap/"},
     {"END", NULL}
   };
 
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: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)
 	{
 		g_snprintf (iconsxml_file, sizeof (iconsxml_file),
-			"%s/map-icons/icons.xml", DATADIR);
+			"%s/gpsdrive/map-icons/icons.xml", DATADIR);
 		xml_reader = xmlNewTextReaderFilename(iconsxml_file);
 	}
 	if (xml_reader == NULL)