Author: nd-guest Date: 2008-01-08 22:07:43 +0000 (Tue, 08 Jan 2008) New Revision: 1334
Added: packages/gpsdrive/trunk/debian/patches/80-dbus.dpatch packages/gpsdrive/trunk/debian/patches/90-usage.dpatch Modified: packages/gpsdrive/trunk/debian/changelog packages/gpsdrive/trunk/debian/control packages/gpsdrive/trunk/debian/patches/00list packages/gpsdrive/trunk/debian/patches/03-manpage.dpatch packages/gpsdrive/trunk/debian/rules Log: * Enable dbus * Fix usage and manpage Modified: packages/gpsdrive/trunk/debian/changelog =================================================================== --- packages/gpsdrive/trunk/debian/changelog 2008-01-08 20:43:47 UTC (rev 1333) +++ packages/gpsdrive/trunk/debian/changelog 2008-01-08 22:07:43 UTC (rev 1334) @@ -1,3 +1,20 @@ +gpsdrive (2.10~pre4-2) UNRELEASED; urgency=low + + * Enable DBUS support. All gps receivers supported by + gpsd should work with this interface. + - Added 80-dbus.dpatch + - Added libdubs-glib-1-dev to Build-Depends + - Changed debian/rules to use --enable-dbus + * Add 90-usage.dpatch to fix usage output + (Closes: #456152) + * Update 03-manpage.dpatch. + - Reflect usage changes. + - Changed mailinglist. + - Changed AUTHORS. + - Minor cosmetic changes. + + -- Andreas Putzo <[EMAIL PROTECTED]> Tue, 08 Jan 2008 22:04:10 +0000 + gpsdrive (2.10~pre4-1) unstable; urgency=low * New upstream release. Modified: packages/gpsdrive/trunk/debian/control =================================================================== --- packages/gpsdrive/trunk/debian/control 2008-01-08 20:43:47 UTC (rev 1333) +++ packages/gpsdrive/trunk/debian/control 2008-01-08 22:07:43 UTC (rev 1334) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Andreas Putzo <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5), automake1.9, libtool, pkg-config, libpcre3-dev, libgtk2.0-dev,libart-2.0-dev, libxml2-dev, libmysqlclient15-dev, autotools-dev, dpatch, libmapnik-dev, libboost-dev, libboost-filesystem-dev, libboost-serialization-dev +Build-Depends: debhelper (>= 5), automake1.9, libtool, pkg-config, libpcre3-dev, libgtk2.0-dev,libart-2.0-dev, libxml2-dev, libmysqlclient15-dev, autotools-dev, dpatch, libmapnik-dev, libboost-dev, libboost-filesystem-dev, libboost-serialization-dev, libdbus-glib-1-dev Standards-Version: 3.7.2 Homepage: http://gpsdrive.de Modified: packages/gpsdrive/trunk/debian/patches/00list =================================================================== --- packages/gpsdrive/trunk/debian/patches/00list 2008-01-08 20:43:47 UTC (rev 1333) +++ packages/gpsdrive/trunk/debian/patches/00list 2008-01-08 22:07:43 UTC (rev 1334) @@ -7,3 +7,5 @@ 50-scripts 60-sql 70-perl +80-dbus +90-usage Modified: packages/gpsdrive/trunk/debian/patches/03-manpage.dpatch =================================================================== --- packages/gpsdrive/trunk/debian/patches/03-manpage.dpatch 2008-01-08 20:43:47 UTC (rev 1333) +++ packages/gpsdrive/trunk/debian/patches/03-manpage.dpatch 2008-01-08 22:07:43 UTC (rev 1334) @@ -7,7 +7,7 @@ @DPATCH@ diff -urNad gpsdrive-2.10~pre4~/man/convert-waypoints.pl.1 gpsdrive-2.10~pre4/man/convert-waypoints.pl.1 --- gpsdrive-2.10~pre4~/man/convert-waypoints.pl.1 2007-09-15 17:13:54.000000000 +0000 -+++ gpsdrive-2.10~pre4/man/convert-waypoints.pl.1 2007-10-16 19:41:22.000000000 +0000 ++++ gpsdrive-2.10~pre4/man/convert-waypoints.pl.1 2008-01-08 20:47:21.000000000 +0000 @@ -131,7 +131,7 @@ .IX Title "CONVERT-WAYPOINTS 1" .TH CONVERT-WAYPOINTS 1 "2007-09-14" "perl v5.8.8" "User Contributed Perl Documentation" @@ -19,7 +19,7 @@ \&\fBconvert-waypoints\fR is converting old waypoint info from the database table 'waypoints' diff -urNad gpsdrive-2.10~pre4~/man/friendsd2.1 gpsdrive-2.10~pre4/man/friendsd2.1 --- gpsdrive-2.10~pre4~/man/friendsd2.1 2007-09-15 15:12:05.000000000 +0000 -+++ gpsdrive-2.10~pre4/man/friendsd2.1 2007-10-16 19:39:42.000000000 +0000 ++++ gpsdrive-2.10~pre4/man/friendsd2.1 2008-01-08 20:47:21.000000000 +0000 @@ -1,6 +1,6 @@ .TH FRIENDSD2 1 .SH NAME @@ -30,7 +30,7 @@ diff -urNad gpsdrive-2.10~pre4~/man/geo-code.1 gpsdrive-2.10~pre4/man/geo-code.1 --- gpsdrive-2.10~pre4~/man/geo-code.1 2007-09-14 21:47:43.000000000 +0000 -+++ gpsdrive-2.10~pre4/man/geo-code.1 2007-10-16 19:39:30.000000000 +0000 ++++ gpsdrive-2.10~pre4/man/geo-code.1 2008-01-08 20:47:21.000000000 +0000 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33. .TH GEO-CODE "1" "09.10.2003" "geo-code" "User Commands" @@ -42,7 +42,7 @@ .IP diff -urNad gpsdrive-2.10~pre4~/man/geoinfo.pl.1 gpsdrive-2.10~pre4/man/geoinfo.pl.1 --- gpsdrive-2.10~pre4~/man/geoinfo.pl.1 2007-09-15 17:13:54.000000000 +0000 -+++ gpsdrive-2.10~pre4/man/geoinfo.pl.1 2007-10-16 19:41:42.000000000 +0000 ++++ gpsdrive-2.10~pre4/man/geoinfo.pl.1 2008-01-08 20:47:21.000000000 +0000 @@ -131,7 +131,7 @@ .IX Title "GEOINFO 1" .TH GEOINFO 1 "2007-09-15" "perl v5.8.8" "User Contributed Perl Documentation" @@ -54,7 +54,7 @@ \&\fBgeoinfo.pl\fR is a program to download and convert waypoints diff -urNad gpsdrive-2.10~pre4~/man/gpsdrive.1 gpsdrive-2.10~pre4/man/gpsdrive.1 --- gpsdrive-2.10~pre4~/man/gpsdrive.1 2007-09-14 21:47:43.000000000 +0000 -+++ gpsdrive-2.10~pre4/man/gpsdrive.1 2007-10-16 19:40:10.000000000 +0000 ++++ gpsdrive-2.10~pre4/man/gpsdrive.1 2008-01-08 20:54:10.000000000 +0000 @@ -1,12 +1,12 @@ .TH GPSDRIVE 1 .SH NAME @@ -79,29 +79,154 @@ serial output should also work with GpsDrive. These GPS receivers are reported to work with gpsdrive: -@@ -132,7 +132,7 @@ - Displays, where the menu should be hidden. +@@ -89,34 +89,32 @@ + .B \-d + Shows some debugging information. .TP - .BI \-s "\| height\^" +-.B \-D +-Shows a lot of debugging information. If you have problems or program +-crashes, send this output to the author. You should also combine this +-with -d. See also the section +-.I BUGS ++.B \-D <level> ++Shows a lot of debugging information. You should also combine this with -d. ++.br ++See also the section ++.I BUGS. ++.TP ++.B \-T ++Do some internal unit tests (don't start gpsdrive). ++.TP ++.B \-e ++use festival-lite (flite) for speech output. + .TP + .B \-v +-Shows program version together with the CVS version of the mainfile +-gpsdrive.c. If you send a bug report, also include this output. ++Shows program version. + .TP + .B \-h + Displays a short help message. + .TP +-.BI \-o "\| outputfile\^" ++.B \-o <outputfile> + With this option, you can + .IR write + the NMEA sentences to a PTY master, file or serial device. This is + useful if you use GpsDrive in simulation mode to provide other GPS + applications with test data. + .TP +-.BI \-t "\| device\^" +-Serial port device (e.g. +-.IR /dev/ttyS0 +-). You can also set it in the +-.IR setup +-menu. +-.TP +-.BI \-l "\| language\^" ++.B \-l <language> + Sets the language for the speech output. You have to provide the voice + files in festival yourself (see below). At the moment + .IR german +@@ -126,58 +124,66 @@ + .IR english + are provided. + .TP +-.B \-x +-Creates own window for the menu buttons, status and map. This is +-helpful on small displays like the Compaq iPaq or on Head Mounted +-Displays, where the menu should be hidden. +-.TP +-.BI \-s "\| height\^" -Set the height of the screen, if autodetection don't satisfy you, -+Set the height of the screen, if autodetection doesn't satisfy you, - .IR height - is i.e. 768,600,480,200 +-.IR height +-is i.e. 768,600,480,200 +-.TP +-.BI \-r "\| width\^" +-Set the +-.IR width +-of the screen, if autodetection don't satisfy you. Works +-only in combination with +-.IR -s ++.B \-g <geometry> ++Set the geometry of the screen, if autodetection doesn't satisfy you, ++.IR geometry ++is i.e. 1024x768, 800x600, 640x480 .TP -@@ -144,9 +144,9 @@ - .IR -s - .TP - .BI \-f "\| friendsserver\^" +-.BI \-f "\| friendsserver\^" -Define a friendsserver to exchange position information with other -people. You can also set it in the Settings/Friends menu. You can start your own friendsserver with the program -.B friendsd ++.B \-f <friends server> +Define a friends server to exchange position information with other +people. You can also set it in the Settings/Friends menu. You can start your own friends server with the program +.B friendsd2 , which is included. More details are in section .I FRIENDSD server +- ++.TP ++.B \-X ++Use DBUS for communication with gpsd. This disables socket communication. ++Try this option if gpsdrive fails to interpret output of the gps receiver correctly. + .TP + .B \-1 + Set special mode if you only have 1 mouse button, i.e. on touchpads. + .TP + .B \-a +-Disable display of battery status. Some implementations of the APM-BIOS +-are broken, so use this option if gpsdrive crashes. ++Display APM stuff (battery status, temperature) + .TP +-.BI \-b "\| servername\^" ++.B \-b <nmea server> + Use a remote NMEA server. You can start gpsd on another + .IR host + , which has the GPS receiver connected and display the position on + your local machine. + .TP +-.BI \-c "\| waypointname\^" ++.B \-c <waypoint> + Initial position for simulation mode. Specify a + .IR "waypoint name" + from your currently used waypoint list. + .TP ++.B \-M <mode> ++Set GUI mode. <mode> may be 'desktop' (default), 'pda' or 'car'. ++.TP ++.B \-i ++Ignore NMEA checksum (risky, only for broken GPS receivers). ++.TP + .B \-q +-Disables SQL support. Only useful if you have SQL support compiled in. ++Disables SQL support. + .TP +-.B \-z +-Don't show zoom and scaling on the map. ++.B \-F ++Force display of position even if it is invalid. + .TP +-.BI \-n +-Disables the direct serial connection. You have to use Garmin mode +-or start gpsd ++.B \-S ++Don't show splash screen. ++.TP ++.B \-P ++Start in Position Mode ++.TP ++.B \-W <x> ++Set to 1 to switch WAAS/EGNOS on, set to 0 to switch it off. ++.TP ++.B \-H <altitude> ++Correct altitude. ++.TP ++.B \-C <file> ++Set config file to <file>. ++ + .br -@@ -247,7 +247,7 @@ + +@@ -247,7 +253,7 @@ from your shell, if you want another language see section .I LOCALISATION @@ -110,7 +235,7 @@ KDE menu. It is important that you have installed GpsDrive as root, so it can -@@ -265,13 +265,13 @@ +@@ -265,13 +271,13 @@ If you have connected a GPS-Receiver, you see in the .I GPS Info @@ -126,7 +251,7 @@ If your receiver has not enough satellites with usable signal, the GPS Info window is red. If your signal is ok and gives a valid -@@ -283,7 +283,7 @@ +@@ -283,7 +289,7 @@ This mode is entered if you have a GPS receiver connected. The cursor is at the position your receiver sends. @@ -135,7 +260,7 @@ .B black arrow is pointing to your selected target, the .B red arrow -@@ -309,7 +309,7 @@ +@@ -309,7 +315,7 @@ .B not your real position and is marked as an rectangle. @@ -144,7 +269,7 @@ You can leave the position mode by by clicking on the "Pos. mode" button or middle-mouse click or right-mouse click (which also sets -@@ -323,7 +323,7 @@ +@@ -323,7 +329,7 @@ .SH MAP DOWNLOAD @@ -153,7 +278,7 @@ .B Download button. GpsDrive stores an index of your maps in the file map_koord.txt in your ~/.gpsdrive directory. You can also use any -@@ -357,7 +357,7 @@ +@@ -357,7 +363,7 @@ Vienna. @@ -162,7 +287,7 @@ .IR gpsfetchmap.pl provided to download multiple maps for a bigger area. .br -@@ -365,7 +365,7 @@ +@@ -365,7 +371,7 @@ www.expedia.com if you want to use their maps! .br .B Don't misuse this service by downloading more maps as you need! @@ -171,7 +296,7 @@ trouble for the gpsdrive project. File formats: -@@ -391,12 +391,12 @@ +@@ -391,12 +397,12 @@ prefix in subdirectories of $HOME/.gpsdrive/ which end in "_map" or "_top". @@ -186,7 +311,7 @@ you use a GARMIN receiver. You can use the program "garble" (included in the package) to read out your waypoints from the Garmin GPS (Transfer mode must be set to -@@ -405,7 +405,7 @@ +@@ -405,7 +411,7 @@ Scripts: "wpget" is a script which calls "garble" in the proper way. Be sure to have "wpget", "wpcvt" and "garble" in your path. This is @@ -195,7 +320,7 @@ is in your path. The manual way: -@@ -434,7 +434,7 @@ +@@ -434,7 +440,7 @@ .SH PROXY SERVER If you must access the internet via a proxy server, you have to set the @@ -204,7 +329,7 @@ .B HTTP_PROXY or .B http_proxy -@@ -546,8 +546,8 @@ +@@ -546,8 +552,8 @@ Gpsdrive supports .IR kismet. Kismet is a 802.11b wireless network (WLAN) sniffer. If you have @@ -215,7 +340,7 @@ use Gpsdrive with Kismet. WLAN accesspoints which are already stored in the SQL database from prior wardrivings are ignored. If you have voice output in gpsdrive, you hear information about the newly -@@ -594,7 +594,7 @@ +@@ -594,7 +600,7 @@ When you start GpsDrive it will detect the server on port 1314 and puts out some status information as speech. You also have an @@ -224,9 +349,68 @@ GpsDrive tries to select the correct language for your locale. The -l option can force the languages for speech +@@ -659,12 +665,10 @@ + + .SH MAILING LIST + The address for the mailing list is +-.B [EMAIL PROTECTED] +- +-Subscribing can be done by sending a mail containing +-.B subscribe gpsdrive +- +-to [EMAIL PROTECTED] ++.B [EMAIL PROTECTED] ++.br ++You can browse the archive or subscribe at ++http://lists.gpsdrivers.org/mailman/listinfo/gpsdrive + + .SH BUGS + Please send bug reports to the author. Report version (gpsdrive -v), +@@ -696,9 +700,15 @@ + + and send me this output. + +-.SH AUTHOR +-Fritz Ganter ++.SH AUTHORS ++Fritz Ganter, ++.br ++Joerg Ostertag, ++.br ++Gpsdrive Development Team + .br ++and others. ++.PP + http://www.gpsdrive.de + .SH WARRANTY + This program is distributed in the hope that it will be useful, +@@ -707,11 +717,21 @@ + GNU General Public License for more details. + + .SH COPYRIGHT +-Copyright (c) 2001-2004 by Fritz Ganter ++Copyright (c) 2001-2006 by Fritz Ganter ++.br ++Copyright (c) 2006-2007 The GpsDrive Development Team + .br + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + +- ++.SH SEE ALSO ++.PP ++.B gpsd(8), ++.B friendsd(1), ++.B gpsfetchmap(1), ++.B osm2pgsql(1), ++.B kismet(1), ++.B festival(1), ++.B flite(1) diff -urNad gpsdrive-2.10~pre4~/man/gpsfetchmap.pl.1 gpsdrive-2.10~pre4/man/gpsfetchmap.pl.1 --- gpsdrive-2.10~pre4~/man/gpsfetchmap.pl.1 2007-09-15 17:13:54.000000000 +0000 -+++ gpsdrive-2.10~pre4/man/gpsfetchmap.pl.1 2007-10-16 19:42:04.000000000 +0000 ++++ gpsdrive-2.10~pre4/man/gpsfetchmap.pl.1 2008-01-08 20:47:21.000000000 +0000 @@ -131,7 +131,7 @@ .IX Title "GPSFETCHMAP 1" .TH GPSFETCHMAP 1 "2007-09-15" "perl v5.8.8" "User Contributed Perl Documentation" @@ -238,7 +422,7 @@ \&\fBgpsfetchmap\fR is a program to download maps from a mapserver for use with gpsdrive. diff -urNad gpsdrive-2.10~pre4~/man/gpspoint2gpsdrive.pl.1 gpsdrive-2.10~pre4/man/gpspoint2gpsdrive.pl.1 --- gpsdrive-2.10~pre4~/man/gpspoint2gpsdrive.pl.1 2007-09-15 17:13:54.000000000 +0000 -+++ gpsdrive-2.10~pre4/man/gpspoint2gpsdrive.pl.1 2007-10-16 19:39:30.000000000 +0000 ++++ gpsdrive-2.10~pre4/man/gpspoint2gpsdrive.pl.1 2008-01-08 20:47:21.000000000 +0000 @@ -131,7 +131,7 @@ .IX Title "GPSPOINT2GPSDRIVE 1" .TH GPSPOINT2GPSDRIVE 1 "2007-09-14" "perl v5.8.8" "User Contributed Perl Documentation" @@ -250,7 +434,7 @@ \&\fBgpspoint2gpsdrive.pl\fR diff -urNad gpsdrive-2.10~pre4~/man/poi-manager.pl.1 gpsdrive-2.10~pre4/man/poi-manager.pl.1 --- gpsdrive-2.10~pre4~/man/poi-manager.pl.1 2007-09-15 17:13:54.000000000 +0000 -+++ gpsdrive-2.10~pre4/man/poi-manager.pl.1 2007-10-16 19:39:30.000000000 +0000 ++++ gpsdrive-2.10~pre4/man/poi-manager.pl.1 2008-01-08 20:47:21.000000000 +0000 @@ -130,6 +130,8 @@ .\" .IX Title "POI-MANAGER 1" Added: packages/gpsdrive/trunk/debian/patches/80-dbus.dpatch =================================================================== --- packages/gpsdrive/trunk/debian/patches/80-dbus.dpatch (rev 0) +++ packages/gpsdrive/trunk/debian/patches/80-dbus.dpatch 2008-01-08 22:07:43 UTC (rev 1334) @@ -0,0 +1,109 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80-dbus.dpatch by Andreas Putzo <[EMAIL PROTECTED]> +## +## DP: Fix DBUS support + [EMAIL PROTECTED]@ +diff -urNad gpsdrive-2.10~pre4~/src/gps_handler.c gpsdrive-2.10~pre4/src/gps_handler.c +--- gpsdrive-2.10~pre4~/src/gps_handler.c 2007-09-14 21:47:13.000000000 +0000 ++++ gpsdrive-2.10~pre4/src/gps_handler.c 2007-12-17 22:38:52.000000000 +0000 +@@ -371,6 +371,7 @@ + { + struct tm time; + time_t ttime; ++ double direction; + + if (!early && (dbus_current_fix.mode==-1)) { + /* We have handled this one, so clean the mode and bail out */ +@@ -416,10 +417,10 @@ + coords.current_lon = dbus_current_fix.longitude; + /* Handle speed */ + if (__finite(dbus_current_fix.speed)) +- groundspeed = dbus_current_fix.speed * 3.6; // Convert m/s to km/h ++ current.groundspeed = dbus_current_fix.speed * 3.6; // Convert m/s to km/h + else if (dbus_old_fix.mode>1) { + gdouble timediff = dbus_current_fix.time-dbus_old_fix.time; +- groundspeed = (timediff>0)?(calcdist2(dbus_old_fix.longitude, dbus_old_fix.latitude) * 3600 / timediff) : 0.0; ++ current.groundspeed = (timediff>0)?(calcdist2(dbus_old_fix.longitude, dbus_old_fix.latitude) * 3600 / timediff) : 0.0; + } + /* Handle bearing */ + if (__finite(dbus_current_fix.track)) +@@ -435,7 +436,7 @@ + } + if ( mydebug + gps_handler_debug > 80 ) + g_print("gps_handler: DBUS fix: %6.0f %10.6f/%10.6f sp:%5.2f(%5.2f) crs:%5.1f(%5.2f)\n", dbus_current_fix.time, +- dbus_current_fix.latitude, dbus_current_fix.longitude, dbus_current_fix.speed, groundspeed, ++ dbus_current_fix.latitude, dbus_current_fix.longitude, dbus_current_fix.speed, current.groundspeed, + dbus_current_fix.track, direction * 180 / M_PI); + /* Handle altitude */ + if (dbus_current_fix.mode>2) { +@@ -453,46 +454,31 @@ + } + + static DBusHandlerResult dbus_handle_gps_fix (DBusMessage* message) { +- DBusMessageIter iter; +- //double temp_time; +- //char b[100]; ++ ++ DBusError error; ++ double temp_time; + struct dbus_gps_fix fix; +- //gint32 mode; +- //gdouble dump; +- +- if (!dbus_message_iter_init (message, &iter)) { +- /* we have a problem */ +- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +- } + +- /* Fill the fix struct */ +- fix.time = floor(dbus_message_iter_get_double (&iter)); +- dbus_message_iter_next (&iter); +- fix.mode = dbus_message_iter_get_int32 (&iter); +- dbus_message_iter_next (&iter); +- fix.ept = dbus_message_iter_get_double (&iter); +- dbus_message_iter_next (&iter); +- fix.latitude = dbus_message_iter_get_double (&iter); +- dbus_message_iter_next (&iter); +- fix.longitude = dbus_message_iter_get_double (&iter); +- dbus_message_iter_next (&iter); +- fix.eph = dbus_message_iter_get_double (&iter); +- dbus_message_iter_next (&iter); +- fix.altitude = dbus_message_iter_get_double (&iter); +- dbus_message_iter_next (&iter); +- fix.epv = dbus_message_iter_get_double (&iter); +- dbus_message_iter_next (&iter); +- fix.track = dbus_message_iter_get_double (&iter); +- dbus_message_iter_next (&iter); +- fix.epd = dbus_message_iter_get_double (&iter); +- dbus_message_iter_next (&iter); +- fix.speed = dbus_message_iter_get_double (&iter); +- dbus_message_iter_next (&iter); +- fix.eps = dbus_message_iter_get_double (&iter); +- dbus_message_iter_next (&iter); +- fix.climb = dbus_message_iter_get_double (&iter); +- dbus_message_iter_next (&iter); +- fix.epc = dbus_message_iter_get_double (&iter); ++ dbus_error_init(&error); ++ ++ dbus_message_get_args(message, ++ &error, ++ DBUS_TYPE_DOUBLE, &temp_time, ++ DBUS_TYPE_INT32, &fix.mode, ++ DBUS_TYPE_DOUBLE, &fix.ept, ++ DBUS_TYPE_DOUBLE, &fix.latitude, ++ DBUS_TYPE_DOUBLE, &fix.longitude, ++ DBUS_TYPE_DOUBLE, &fix.eph, ++ DBUS_TYPE_DOUBLE, &fix.altitude, ++ DBUS_TYPE_DOUBLE, &fix.epv, ++ DBUS_TYPE_DOUBLE, &fix.track, ++ DBUS_TYPE_DOUBLE, &fix.epd, ++ DBUS_TYPE_DOUBLE, &fix.speed, ++ DBUS_TYPE_DOUBLE, &fix.eps, ++ DBUS_TYPE_DOUBLE, &fix.climb, ++ DBUS_TYPE_DOUBLE, &fix.epc, ++ DBUS_TYPE_INVALID); ++ fix.time = floor(temp_time); + + if ( mydebug + gps_handler_debug > 80 ) { + g_print("gps_handler: DBUS raw: ti:%6.0f mode:%d ept:%f %10.6f/%10.6f eph:%f\n", fix.time, fix.mode, fix.ept, fix.latitude, fix.longitude, fix.eph); Property changes on: packages/gpsdrive/trunk/debian/patches/80-dbus.dpatch ___________________________________________________________________ Name: svn:executable + * Added: packages/gpsdrive/trunk/debian/patches/90-usage.dpatch =================================================================== --- packages/gpsdrive/trunk/debian/patches/90-usage.dpatch (rev 0) +++ packages/gpsdrive/trunk/debian/patches/90-usage.dpatch 2008-01-08 22:07:43 UTC (rev 1334) @@ -0,0 +1,48 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 90-usage.dpatch by Andreas Putzo <[EMAIL PROTECTED]> +## +## DP: Correct usage() output. + [EMAIL PROTECTED]@ +diff -urNad gpsdrive-2.10~pre4~/src/gpsdrive.c gpsdrive-2.10~pre4/src/gpsdrive.c +--- gpsdrive-2.10~pre4~/src/gpsdrive.c 2007-12-18 22:08:34.000000000 +0000 ++++ gpsdrive-2.10~pre4/src/gpsdrive.c 2007-12-18 22:09:55.000000000 +0000 +@@ -2738,30 +2738,27 @@ + _("-D X set debug Level to X\n"), + _("-T do some internal unit Tests(don't start gpsdrive)\n"), + _("-e use Festival-Lite (flite) for speech output\n"), +- _("-o serial device, pty master, or file for NMEA *output*\n"), +- _("-f X Select friends server, X is i.e. friendsd.gpsdrive.de\n"), ++ _("-o thing serial device, pty master, or file for NMEA *output*\n"), ++ _("-f server Select friends server, X is i.e. friendsd.gpsdrive.de\n"), + #ifdef DBUS_ENABLE + _("-X Use DBUS for communication with gpsd. This disables serial and socket communication\n"), + #endif +- _("-l LANG Select language of the voice,\n" +- " LANG may be english, spanish or german\n"), +- _("-s HEIGHT set height of the screen, if autodetection\n" +- " don't satisfy you, X is i.e. 768,600,480,200\n"), +- _("-r WIDTH set width of the screen, only with -s\n"), ++ _("-l lang. Select language of the voice,\n" ++ " language may be 'english', 'spanish' or 'german'\n"), ++ _("-g geom. set window geometry, e.g. 800x600\n"), + _("-1 have only 1 button mouse, for example using touchscreen\n"), + _("-a display APM Stuff ( battery status, Temperature)\n"), + _("-b Server Servername for NMEA server (if gpsd runs on another host)\n"), + _("-c WP set start position in simulation mode to waypoint name WP\n"), +- _("-x create separate window for menu\n"), +- _("-M mode set guimode to desktop, pda or car\n"), ++ _("-M mode set GUI mode; mode may be 'desktop' (default), 'pda' or 'car'\n"), + _("-i ignore NMEA checksum (risky, only for broken GPS receivers\n"), + _("-q disable SQL support\n"), + _("-F force display of position even it is invalid\n"), + _("-S don't show splash screen\n"), +- _("-P start in Pos Mode\n"), ++ _("-P start in Position Mode\n"), + _("-W x set x to 1 to switch WAAS/EGNOS on, set to 0 to switch off\n"), + _("-H ALT correct altitude, adding this value (ALT) to altitude\n"), +- _("-C file set config file (--config-file)\n")); ++ _("-C file set config file (--config-file)\n")); + + } + Property changes on: packages/gpsdrive/trunk/debian/patches/90-usage.dpatch ___________________________________________________________________ Name: svn:executable + * Modified: packages/gpsdrive/trunk/debian/rules =================================================================== --- packages/gpsdrive/trunk/debian/rules 2008-01-08 20:43:47 UTC (rev 1333) +++ packages/gpsdrive/trunk/debian/rules 2008-01-08 22:07:43 UTC (rev 1334) @@ -48,6 +48,7 @@ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ --enable-mapnik \ + --enable-dbus \ CFLAGS="$(CFLAGS)" _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
