Author: nd-guest
Date: 2007-09-29 21:39:10 +0000 (Sat, 29 Sep 2007)
New Revision: 1138
Added:
packages/gpsdrive/trunk/debian/patches/30-icons.dpatch
Modified:
packages/gpsdrive/trunk/debian/control
packages/gpsdrive/trunk/debian/gpsdrive.install
packages/gpsdrive/trunk/debian/patches/00list
Log:
* Tell gpsdrive where the icons and poi descriptions can be found.
* Add icon package as dependency.
* Remove old patches from 00list.
Modified: packages/gpsdrive/trunk/debian/control
===================================================================
--- packages/gpsdrive/trunk/debian/control 2007-09-29 16:32:30 UTC (rev
1137)
+++ packages/gpsdrive/trunk/debian/control 2007-09-29 21:39:10 UTC (rev
1138)
@@ -8,7 +8,7 @@
Package: gpsdrive
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, openstreetmap-map-icons-square |
openstreetmap-map-icons-classic
Recommends: gpsd
Suggests: gpsdrive-scripts, libmysqlclient15off, imagemagick
Description: Car navigation system
Modified: packages/gpsdrive/trunk/debian/gpsdrive.install
===================================================================
--- packages/gpsdrive/trunk/debian/gpsdrive.install 2007-09-29 16:32:30 UTC
(rev 1137)
+++ packages/gpsdrive/trunk/debian/gpsdrive.install 2007-09-29 21:39:10 UTC
(rev 1138)
@@ -6,3 +6,4 @@
usr/share/gpsdrive/pixmaps/*
usr/share/gpsdrive/poi/*
usr/share/gpsdrive/mapnik/osm.xml
+usr/share/map-icons/icons.xml usr/share/gpsdrive/map-icons/
Modified: packages/gpsdrive/trunk/debian/patches/00list
===================================================================
--- packages/gpsdrive/trunk/debian/patches/00list 2007-09-29 16:32:30 UTC
(rev 1137)
+++ packages/gpsdrive/trunk/debian/patches/00list 2007-09-29 21:39:10 UTC
(rev 1138)
@@ -1,9 +1,4 @@
-#01old.dpatch
-#02configure.dpatch
-#03manpage.dpatch
-#04missing_includes.dpatch
-#05start_gpsd.dpatch
-#06libtool.dpatch
01-make
10-mapnikdir
20-homedir
+30-icons
Added: packages/gpsdrive/trunk/debian/patches/30-icons.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/30-icons.dpatch
(rev 0)
+++ packages/gpsdrive/trunk/debian/patches/30-icons.dpatch 2007-09-29
21:39:10 UTC (rev 1138)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30-icons.dpatch by Andreas Putzo <[EMAIL PROTECTED]>
+##
+## DP: Add icon search path
+## DP: Point gpsdrive to its icons.xml file
+
[EMAIL PROTECTED]@
+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
+@@ -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:20:29.000000000 +0000
++++ gpsdrive-2.10~pre4/src/poi.c 2007-09-29 21:20:46.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)
Property changes on: packages/gpsdrive/trunk/debian/patches/30-icons.dpatch
___________________________________________________________________
Name: svn:executable
+ *
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
