Author: nd-guest
Date: 2007-10-03 20:35:08 +0000 (Wed, 03 Oct 2007)
New Revision: 1160

Added:
   packages/gpsdrive/trunk/debian/patches/03-manpage.dpatch
   packages/gpsdrive/trunk/debian/patches/40-backported.dpatch
   packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch
   packages/gpsdrive/trunk/debian/patches/60-sql.dpatch
Removed:
   packages/gpsdrive/trunk/debian/patches/01old.dpatch
   packages/gpsdrive/trunk/debian/patches/02configure.dpatch
   packages/gpsdrive/trunk/debian/patches/03manpage.dpatch
   packages/gpsdrive/trunk/debian/patches/04missing_includes.dpatch
   packages/gpsdrive/trunk/debian/patches/05start_gpsd.dpatch
Modified:
   packages/gpsdrive/trunk/debian/patches/00list
   packages/gpsdrive/trunk/debian/patches/30-icons.dpatch
Log:
- Remove old patches, merge remaining patches in 03-manpage and 60-sql.
- Backport some bugfixes from svn.
- Change shebang line in mapnik_gentiles to use python2.5.


Modified: packages/gpsdrive/trunk/debian/patches/00list
===================================================================
--- packages/gpsdrive/trunk/debian/patches/00list       2007-10-03 11:23:20 UTC 
(rev 1159)
+++ packages/gpsdrive/trunk/debian/patches/00list       2007-10-03 20:35:08 UTC 
(rev 1160)
@@ -1,4 +1,8 @@
 01-make
+03-manpage
 10-mapnikdir
 20-homedir
 30-icons
+40-backported
+50-scripts
+60-sql

Deleted: packages/gpsdrive/trunk/debian/patches/01old.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/01old.dpatch 2007-10-03 11:23:20 UTC 
(rev 1159)
+++ packages/gpsdrive/trunk/debian/patches/01old.dpatch 2007-10-03 20:35:08 UTC 
(rev 1160)
@@ -1,118 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01old.dpatch by  <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Former patches to gpsdrive.
-## DP: Switch over to use libmysqlclient.so.15
-## DP: Bugfix in friendsd.c by security team (#337495)
-
[EMAIL PROTECTED]@
-diff -urNad gpsdrive-2.09~/README.SQL gpsdrive-2.09/README.SQL
---- gpsdrive-2.09~/README.SQL  2007-07-17 13:58:06.000000000 +0200
-+++ gpsdrive-2.09/README.SQL   2007-07-17 14:54:09.000000000 +0200
-@@ -7,7 +7,7 @@
- Compiling:
- ----------
- There is no MySQL needed for compiling, the needed library
--libmysqlclient.so.10 will be loaded at runtime, if found.
-+libmysqlclient.so.15 will be loaded at runtime, if found.
- 
- Running and first initialization:
- ---------------------------------
-diff -urNad gpsdrive-2.09~/man/gpsdrive.1 gpsdrive-2.09/man/gpsdrive.1
---- gpsdrive-2.09~/man/gpsdrive.1      2007-07-17 13:58:06.000000000 +0200
-+++ gpsdrive-2.09/man/gpsdrive.1       2007-07-17 14:52:45.000000000 +0200
-@@ -633,7 +633,7 @@
- menu.
- 
- GpsDrive use MySQL automatically if it finds the shared library 
--.I libmysqlclient.so.10 
-+.I libmysqlclient.so.15
- and the MySQL Server is running and a connection to the database is possible. 
For first use you have to run 
- .B create.sql
- once.
-diff -urNad gpsdrive-2.09~/src/friendsd.c gpsdrive-2.09/src/friendsd.c
---- gpsdrive-2.09~/src/friendsd.c      2007-07-17 13:58:05.000000000 +0200
-+++ gpsdrive-2.09/src/friendsd.c       2007-07-17 15:00:28.000000000 +0200
-@@ -364,7 +364,7 @@
-           fprintf (stderr, "%d clients, last: %s[%s]:\n",
-                    listnum, hname, fromaddr);
- 
--        fprintf (stderr, txt);
-+        fprintf (stderr, "%s", txt);
- /*       printf ("sende\n%s, L´┐Żnge %d, clilen %d", txt, l,clilen);  */
-         if ((nosent = sendto (sockfd, txt, l, 0, pcli_addr, clilen)) != l)
-           {
-diff -urNad gpsdrive-2.10+pre2~/src/gpsdrive.c 
gpsdrive-2.10+pre2/src/gpsdrive.c
---- gpsdrive-2.10+pre2~/src/gpsdrive.c 2007-07-17 16:37:22.000000000 +0200
-+++ gpsdrive-2.10+pre2/src/gpsdrive.c  2007-07-17 16:39:24.000000000 +0200
-@@ -10498,28 +10498,28 @@
-       handle = dlopen ("/usr/local/lib/libmysqlclient.dll", RTLD_LAZY);
-       if (!handle)
-       handle =
--        dlopen ("@PREFIX@/lib/mysql/libmysqlclient.10.dylib", RTLD_LAZY);
-+        dlopen ("@PREFIX@/lib/mysql/libmysqlclient.15.dylib", RTLD_LAZY);
-       if (!handle)
-       handle = dlopen ("/usr/lib/libmysqlclient.so", RTLD_LAZY);
-       if (!handle)
-       handle = dlopen ("libmysqlclient.so", RTLD_LAZY);
-       if (!handle)
--      handle = dlopen ("libmysqlclient.so.10", RTLD_LAZY);
-+      handle = dlopen ("libmysqlclient.so.15", RTLD_LAZY);
-       if (!handle)
--      handle = dlopen ("/opt/lib/mysql/libmysqlclient.so.10", RTLD_LAZY);
-+      handle = dlopen ("/opt/lib/mysql/libmysqlclient.so.15", RTLD_LAZY);
-       if (!handle)
--      handle = dlopen ("/opt/mysql/lib/libmysqlclient.so.10", RTLD_LAZY);
-+      handle = dlopen ("/opt/mysql/lib/libmysqlclient.so.15", RTLD_LAZY);
-       if (!handle)
--      handle = dlopen ("/usr/lib/mysql/libmysqlclient.so.10", RTLD_LAZY);
-+      handle = dlopen ("/usr/lib/mysql/libmysqlclient.so.15", RTLD_LAZY);
-       if (!handle)
--      handle = dlopen ("/usr/lib/libmysqlclient.so.10", RTLD_LAZY);
-+      handle = dlopen ("/usr/lib/libmysqlclient.so.15", RTLD_LAZY);
-       if (!handle)
-       handle =
--        dlopen ("/usr/local/lib/mysql/libmysqlclient.so.10", RTLD_LAZY);
-+        dlopen ("/usr/local/lib/mysql/libmysqlclient.so.15", RTLD_LAZY);
-       if (!handle)
--      handle = dlopen ("/usr/local/mysql/libmysqlclient.so.10", RTLD_LAZY);
-+      handle = dlopen ("/usr/local/mysql/libmysqlclient.so.15", RTLD_LAZY);
-       if (!handle)
--      handle = dlopen ("/usr/local/lib/libmysqlclient.so.10", RTLD_LAZY);
-+      handle = dlopen ("/usr/local/lib/libmysqlclient.so.15", RTLD_LAZY);
-       if (!handle)
-       handle = dlopen ("/sw/lib/libmysqlclient.dylib", RTLD_LAZY);
- 
-diff -urNad gpsdrive-2.09~/src/gpsdrive.h gpsdrive-2.09/src/gpsdrive.h
---- gpsdrive-2.09~/src/gpsdrive.h      2007-07-17 13:58:05.000000000 +0200
-+++ gpsdrive-2.09/src/gpsdrive.h       2007-07-17 14:54:28.000000000 +0200
-@@ -237,7 +237,7 @@
-                                            const char *db,
-                                            unsigned int port,
-                                            const char *unix_socket,
--                                           unsigned int clientflag);
-+                                           unsigned long clientflag);
- void    (*dl_mysql_close)(MYSQL *sock);
- int     (*dl_mysql_query)(MYSQL *mysql, const char *q);
- my_ulonglong (*dl_mysql_affected_rows)(MYSQL *mysql);
-diff -urNad gpsdrive-2.09~/src/mysql/mysql.h gpsdrive-2.09/src/mysql/mysql.h
---- gpsdrive-2.09~/src/mysql/mysql.h   2007-07-17 13:58:05.000000000 +0200
-+++ gpsdrive-2.09/src/mysql/mysql.h    2007-07-17 14:59:32.000000000 +0200
-@@ -229,14 +229,14 @@
-                                          const char *db,
-                                          unsigned int port,
-                                          const char *unix_socket,
--                                         unsigned int clientflag);
-+                                         unsigned long clientflag);
- #else
- MYSQL *               STDCALL mysql_real_connect(MYSQL *mysql, const char 
*host,
-                                          const char *user,
-                                          const char *passwd,
-                                          unsigned int port,
-                                          const char *unix_socket,
--                                         unsigned int clientflag);
-+                                         unsigned long clientflag);
- #endif
- void          STDCALL mysql_close(MYSQL *sock);
- int           STDCALL mysql_select_db(MYSQL *mysql, const char *db);

Deleted: packages/gpsdrive/trunk/debian/patches/02configure.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/02configure.dpatch   2007-10-03 
11:23:20 UTC (rev 1159)
+++ packages/gpsdrive/trunk/debian/patches/02configure.dpatch   2007-10-03 
20:35:08 UTC (rev 1160)
@@ -1,61 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02configure.dpatch by  <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: remove gcc >= 3.x check
-## DP: remove documentation from install target
-
[EMAIL PROTECTED]@
-diff -urNad gpsdrive-2.10~pre2~/Makefile.am gpsdrive-2.10~pre2/Makefile.am
---- gpsdrive-2.10~pre2~/Makefile.am    2004-07-02 21:47:02.000000000 +0000
-+++ gpsdrive-2.10~pre2/Makefile.am     2007-07-29 14:49:03.000000000 +0000
-@@ -2,9 +2,9 @@
- #AUTOMAKE_OPTIONS=dist-bzip2
- SUBDIRS =  src po man intl 
- 
--EXTRA_DIST = TODO GPS-receivers LEEME depcomp LISEZMOI README.FreeBSD  
README.gpspoint2gspdrive FAQ.gpsdrive FAQ.gpsdrive.fr README.SQL create.sql  
NMEA.txt wp2sql README.kismet LISEZMOI.FreeBSD LISEZMOI.kismet LISEZMOI.SQL 
CREDITS gpsdrive.desktop README.nasamaps
-+EXTRA_DIST = 
- 
--pkgdata_DATA = TODO GPS-receivers LEEME AUTHORS CREDITS README LISEZMOI 
README.FreeBSD   README.gpspoint2gspdrive FAQ.gpsdrive FAQ.gpsdrive.fr 
README.SQL create.sql  NMEA.txt wp2sql README.kismet README.nasamaps
-+pkgdata_DATA = 
- 
- appsdir = $(datadir)/applications
- apps_DATA = gpsdrive.desktop
-diff -urNad gpsdrive-2.10~pre2~/Makefile.in gpsdrive-2.10~pre2/Makefile.in
---- gpsdrive-2.10~pre2~/Makefile.in    2004-07-17 14:24:04.000000000 +0000
-+++ gpsdrive-2.10~pre2/Makefile.in     2007-07-29 14:49:26.000000000 +0000
-@@ -220,8 +220,8 @@
- # Makefile.am in main dir
- #AUTOMAKE_OPTIONS=dist-bzip2
- SUBDIRS = src po man intl 
--EXTRA_DIST = TODO GPS-receivers LEEME depcomp LISEZMOI README.FreeBSD  
README.gpspoint2gspdrive FAQ.gpsdrive FAQ.gpsdrive.fr README.SQL create.sql  
NMEA.txt wp2sql README.kismet LISEZMOI.FreeBSD LISEZMOI.kismet LISEZMOI.SQL 
CREDITS gpsdrive.desktop README.nasamaps
--pkgdata_DATA = TODO GPS-receivers LEEME AUTHORS CREDITS README LISEZMOI 
README.FreeBSD   README.gpspoint2gspdrive FAQ.gpsdrive FAQ.gpsdrive.fr 
README.SQL create.sql  NMEA.txt wp2sql README.kismet README.nasamaps
-+EXTRA_DIST = 
-+pkgdata_DATA = 
- appsdir = $(datadir)/applications
- apps_DATA = gpsdrive.desktop
- all: config.h
-diff -urNad gpsdrive-2.10~pre2~/configure gpsdrive-2.10~pre2/configure
---- gpsdrive-2.10~pre2~/configure      2007-07-29 14:47:22.000000000 +0000
-+++ gpsdrive-2.10~pre2/configure       2007-07-29 14:48:36.000000000 +0000
-@@ -20853,20 +20853,6 @@
- 
- echo "Using $CC compiler"
- 
--if test "$CC" = "gcc" ; then
--
--if $CC -dumpversion|egrep -q "^3\.*"; then
--echo "GCC ok"
--else
--echo "*****************************************"
--echo "You need a gcc >= 3.x to compile GpsDrive"
--echo "*****************************************"
--exit
--fi
--
--fi
--
--
- UNAMEP=`uname -p`
- ARCHP=`arch`
- CFLAGS="$CFLAGS"

Added: packages/gpsdrive/trunk/debian/patches/03-manpage.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/03-manpage.dpatch                    
        (rev 0)
+++ packages/gpsdrive/trunk/debian/patches/03-manpage.dpatch    2007-10-03 
20:35:08 UTC (rev 1160)
@@ -0,0 +1,172 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03-manpage.dpatch by Andreas Putzo <[EMAIL PROTECTED]>
+##
+## DP: Fix typos in gpsdrive.1 (#414240). 
+
[EMAIL PROTECTED]@
+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-03 18:47:32.000000000 +0000
+@@ -6,7 +6,7 @@
+ 
+ .SH About this manual page
+ 
+-This manual page explain the basic functions of GpsDrive and some
++This manual page explains the basic functions of GpsDrive and some
+ additional info.
+ 
+ In GpsDrive you find tooltips for nearly all buttons, there is also a
+@@ -30,7 +30,7 @@
+ 
+ GpsDrive was tested with a GARMIN GPS III, a Crux II GPS PCMCIA
+ card and a Navilock USB receiver. All Garmin GPS reveivers with a serial 
output should be
+-usable. Other GPS reveivers that sends NMEA protocol over the
++usable. Other GPS receivers that sends NMEA protocol over the
+ 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.
+ .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
+ .TP
+@@ -144,9 +144,9 @@
+ .IR -s
+ .TP
+ .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
++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
+ 
+@@ -247,7 +247,7 @@
+ from your shell, if you want another language see section 
+ .I LOCALISATION
+ 
+-On some distribution you may find a "GpsDrive" entry in your Gnome or
++On some distributions you may find a "GpsDrive" entry in your Gnome or
+ KDE menu.
+ 
+ It is important that you have installed GpsDrive as root, so it can
+@@ -265,13 +265,13 @@
+ 
+ If you have connected a GPS-Receiver, you see in the 
+ .I GPS Info
+-window how much satellites are in view. You can click on this image to switch 
to the 
++window how many satellites are in view. You can click on this image to switch 
to the 
+ .I Satellite position view.
+ .br
+ You must have at least 3 satellites in view. If you want to see your
+ altitude, you need at least 4 satellites.  The antenna of your GPS
+ receiver must have free sight to the sky, so you cannot use it
+-indoor. More satellites gives you a better accuracy.
++indoors. More satellites gives you a better accuracy.
+ 
+ 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 @@
+ 
+ This mode is entered if you have a GPS receiver connected. The cursor is at 
the position your receiver sends.
+ 
+-The black and a red arrow shows your position on the map. The 
++Black and a red arrows show your position on the map. The 
+ .B black arrow
+ is pointing to your selected target, the 
+ .B red arrow
+@@ -309,7 +309,7 @@
+ .B not your real position
+ and is marked as an rectangle.
+ 
+-You can set the position by simple left-mouse click on the map.
++You can set the position by a simple left-mouse click on the map.
+ 
+ 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 @@
+ 
+ .SH MAP DOWNLOAD
+ 
+-You can easily download maps from internet with the
++You can easily download maps from the internet with the
+ .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 @@
+ Vienna.
+ 
+ 
+-There is also the programs
++There is also the program
+ .IR gpsfetchmap.pl
+ provided to download multiple maps for a bigger area.
+ .br
+@@ -365,7 +365,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! 
+-You will risk being blocked by thier servers, and possibly cause
++You will risk being blocked by these servers, and possibly cause
+ trouble for the gpsdrive project.
+ 
+ File formats:
+@@ -391,12 +391,12 @@
+ prefix in subdirectories of $HOME/.gpsdrive/ which end in "_map" or
+ "_top".
+ 
+-There is an "import assistant" built in. Use this to import your maps.
++There is an "import assistant" built in. Use it to import your maps.
+ 
+ .SH Importing waypoints:
+ 
+ 
+-The easiest way is to use the script "wpget" which does all for you if
++The easiest way is to use the script "wpget" which does everything for you if
+ 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 @@
+ 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
+-fullfilled, if you did install the program as root and /usr/local/bin
++fulfilled, if you did install the program as root and /usr/local/bin
+ is in your path.
+ 
+ The manual way:
+@@ -434,7 +434,7 @@
+ 
+ .SH PROXY SERVER
+ If you must access the internet via a proxy server, you have to set the
+-enviroment variable
++enviromental variable
+ .B HTTP_PROXY
+ or
+ .B http_proxy
+@@ -546,8 +546,8 @@
+ Gpsdrive supports
+ .IR kismet.
+ Kismet is a 802.11b wireless network (WLAN) sniffer. If you have
+-kismet running, gpsdrive will detect it and program start and shows
+-new WLAN accesspoints in realtime on the map. SQL mode is necessary to
++kismet running, gpsdrive will detect it and program starts and shows
++new WLAN access points in real time on the map. SQL mode is necessary to
+ 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 @@
+ 
+ When you start GpsDrive it will detect the server on port 1314 and
+ puts out some status information as speech. You also have an
+-additonal button (Mute) to switch off sound output.
++additional button (Mute) to switch off sound output.
+ 
+ GpsDrive tries to select the correct language for your locale.
+ The -l option can force the languages for speech


Property changes on: packages/gpsdrive/trunk/debian/patches/03-manpage.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: packages/gpsdrive/trunk/debian/patches/03manpage.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/03manpage.dpatch     2007-10-03 
11:23:20 UTC (rev 1159)
+++ packages/gpsdrive/trunk/debian/patches/03manpage.dpatch     2007-10-03 
20:35:08 UTC (rev 1160)
@@ -1,257 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03manpage.dpatch by  <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes typo in manpage. Closes: #414240.
-
[EMAIL PROTECTED]@
-diff -urNad gpsdrive-2.10+pre2~/man/gpsdrive.1 
gpsdrive-2.10+pre2/man/gpsdrive.1
---- gpsdrive-2.10+pre2~/man/gpsdrive.1 2007-07-17 21:07:37.000000000 +0000
-+++ gpsdrive-2.10+pre2/man/gpsdrive.1  2007-07-17 21:08:59.000000000 +0000
-@@ -6,7 +6,7 @@
- 
- .SH About this manual page
- 
--This manual page explain the basic functions of GpsDrive and some
-+This manual page explains the basic functions of GpsDrive and some
- additional info.
- 
- In GpsDrive you find tooltips for nearly all buttons, there is also a
-@@ -25,12 +25,12 @@
- 
- GpsDrive displays your position provided from your NMEA capable GPS
- receiver on a zoomable map . The maps are autoselected depending on
--your position. You can set prefered scale, which the program tries to
-+your position. You can set preferred scale, which the program tries to
- get from available maps.
- 
- GpsDrive was tested with a GARMIN GPS III, a Crux II GPS PCMCIA
--card and a Navilock USB receiver. All Garmin GPS reveivers with a serial 
output should be
--usable. Other GPS reveivers that sends NMEA protocol over the
-+card and a Navilock USB receiver. All Garmin GPS receivers with a serial 
output should be
-+usable. Other GPS receivers that sends NMEA protocol over the
- 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.
- .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
- .TP
-@@ -144,8 +144,8 @@
- .IR -s
- .TP
- .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
-+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 friendsd
- , which is included. More details are in section 
- .I FRIENDSD server
-@@ -170,7 +170,7 @@
- from your currently used waypoint list.
- .TP
- .B \-q 
--Disables SQL support. Only usefull if you have SQL support compiled in.
-+Disables SQL support. Only useful if you have SQL support compiled in.
- .TP
- .B \-z
- Don't show zoom and scaling on the map.
-@@ -211,7 +211,7 @@
- .br
- You can force the use of gpsd by adding the
- .B \-n
--commandline parameter, even if you enabled the direct serial connection
-+command line parameter, even if you enabled the direct serial connection
- in the settings menu.
- 
- .br
-@@ -315,7 +315,7 @@
- from your shell, if you want another language see section 
- .I LOCALISATION
- 
--On some distribution you may find a "GpsDrive" entry in your Gnome or
-+On some distributions you may find a "GpsDrive" entry in your Gnome or
- KDE menu.
- 
- It is important that you have installed GpsDrive as root, so it can
-@@ -333,15 +333,15 @@
- 
- If you have connected a GPS-Receiver, you see in the 
- .I GPS Info
--window how much satellites are in view. You can click on this image to switch 
to the 
-+window how many satellites are in view. You can click on this image to switch 
to the 
- .I Satellite position view.
- .br
- You must have at least 3 satellites in view. If you want to see your
- altitude, you need at least 4 satellites.  The antenna of your GPS
- receiver must have free sight to the sky, so you cannot use it
--indoor. More satellites gives you a better accuracy.
-+indoors. More satellites gives you a better accuracy.
- 
--If your receiver have not enough satellites with usable signal, the
-+If your receiver has not enough satellites with usable signals, the
- GPS Info window is red. If your signal is ok and gives a valid
- position, the GPS Info window is green.
- 
-@@ -351,7 +351,7 @@
- 
- This mode is entered if you have a GPS receiver connected. The cursor is at 
the position your receiver sends.
- 
--The black and a red arrow shows your position on the map. The 
-+Black and red arrows show your position on the map. The 
- .B black arrow
- is pointing to your selected target, the 
- .B red arrow
-@@ -371,13 +371,13 @@
- This mode is activated by clicking on the "Pos. mode" button or if you
- "Jump" to a target in the FIND menu.
- 
--At this mode, you can temporary change the position for looking around and
-+In this mode, you can temporarily change the position for looking around and
- jump to another positions (i.e. for downloading maps). In this mode this
- is 
- .B not your real position
- and is marked as an rectangle.
- 
--You can set the position by simple left-mouse click on the map.
-+You can set the position by a simple left-mouse click on the map.
- 
- 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
-@@ -387,11 +387,11 @@
- 
- .SH MAP DOWNLOAD
- 
--You can easily download maps from internet with the
-+You can easily download maps from the internet with the
- .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
--directory for your maps, but you have set the directory in the
-+directory for your maps, but you have to set the directory in the
- settings menu.
- 
- .SH About maps
-@@ -421,15 +421,15 @@
- Vienna.
- 
- 
--There is also the programs
-+There is also the program
- .IR gpsfetchmap.pl
- provided to download multiple maps for a bigger area.
- .br
- .B Please consider the copyright information 
- www.expedia.com if you want to use their maps!
- .br
--.B Don't missuse this service by downloading more maps as you need! 
--You will risc that you will be blocked by this servers.
-+.B Don't misuse this service by downloading more maps than you need! 
-+You will risk being blocked by these servers.
- 
- File formats:
- 
-@@ -451,12 +451,12 @@
- and top_* for topographical maps. If not, gpsdrive won't
- display the maps.
- 
--There is an "import assistant" build in. Use this to import your maps.
-+There is an "import assistant" built in. Use it to import your maps.
- 
- .SH Importing waypoints:
- 
- 
--The easiest way is to use the script "wpget" which does all for you if
-+The easiest way is to use the script "wpget" which does everything for you if
- 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
-@@ -465,7 +465,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
--fullfilled, if you did install the program as root and /usr/local/bin
-+fulfilled, if you did install the program as root and /usr/local/bin
- is in your path.
- 
- The manual way:
-@@ -494,7 +494,7 @@
- 
- .SH PROXY SERVER
- If you must access the internet via a proxy server, you have to set the
--enviroment variable
-+environmental variable
- .B HTTP_PROXY
- or
- .B http_proxy
-@@ -514,7 +514,7 @@
- position. If you click with the left button near the border, GpsDrive will
- scroll the map or load the next map if you are on the margin of the map.
- 
--The middle mouse button switches back to normal mode, or select the
-+The middle mouse button switches back to normal mode, or selects the
- "Pos. mode" menu entry. The same if you select a target with the right
- mouse button.  Shift-left-mouse-button and shift-right-mouse-button
- changes the map scale.
-@@ -548,7 +548,7 @@
- predefined. 
- .SH Icons for waypoints
- You can define freely your waypoint type names. But there are special
--names, which results in special icons display in GpsDrive:
-+names, which display special icons in GpsDrive:
- .TP
- .B WLAN
- open WLAN accesspoint
-@@ -572,7 +572,7 @@
- Shop
- .TP
- .B Monu
--Monument, touristic attraction
-+Monument, a tourist attraction
- .TP
- .B Speedtrap
- Speedtrap (Radar), gives warning if this is in front of you
-@@ -618,7 +618,7 @@
- The PNG image can have transparency, and should have a size around
- 16x16 until 32x32, bigger icons may result in a performance hit.
- 
--Your user defined waypoints override the built-in waypoint icons.
-+Your user-defined waypoints override the built-in waypoint icons.
- 
- .SH SQL support
- 
-@@ -626,7 +626,7 @@
- support. This needs to install a SQL server on your machine. At the
- moment, only MySQL is supported.
- 
--Don't be afraid, MySQL don't need much resources, is very fast, but makes the
-+Don't be afraid, MySQL doesn't need much resources, is very fast, but makes 
the
- management (including selection of waypoint types) of the waypoints
- much easier. In SQL mode you can select the shown waypoints in the
- .B setup
-@@ -676,8 +676,8 @@
- Gpsdrive supports
- .IR kismet.
- Kismet is a 802.11b wireless network (WLAN) sniffer. If you have
--kismet running, gpsdrive will detect it and program start and shows
--new WLAN accesspoints in realtime on the map. SQL mode is necessary to
-+kismet running, gpsdrive will detect it and program starts and shows
-+new WLAN access points in real time on the map. SQL mode is necessary to
- run Gpsdrive in Kismet mode. 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 new
-@@ -724,7 +724,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
--additonal button (Mute) to switch off sound output.
-+additional button (Mute) to switch off sound output.
- 
- GpsDrive tries to select the correct language for your locale.
- The -l option can force the languages for speech

Deleted: packages/gpsdrive/trunk/debian/patches/04missing_includes.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/04missing_includes.dpatch    
2007-10-03 11:23:20 UTC (rev 1159)
+++ packages/gpsdrive/trunk/debian/patches/04missing_includes.dpatch    
2007-10-03 20:35:08 UTC (rev 1160)
@@ -1,43 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04missing_includes.dpatch by  <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Added header dependencies. 
-## DP: Closes: #417498. FTBFS with GCC 4.3: missing #includes
-
[EMAIL PROTECTED]@
-diff -urNad gpsdrive-2.10+pre2~/src/garmin_application.cpp 
gpsdrive-2.10+pre2/src/garmin_application.cpp
---- gpsdrive-2.10+pre2~/src/garmin_application.cpp     2007-07-17 
19:12:38.000000000 +0000
-+++ gpsdrive-2.10+pre2/src/garmin_application.cpp      2007-07-17 
19:13:55.000000000 +0000
-@@ -30,6 +30,7 @@
- #include <algorithm>
- #include <stdio.h>
- #include <assert.h>
-+#include <string.h>
- 
- namespace garmin 
- {
-diff -urNad gpsdrive-2.10+pre2~/src/garmin_data.cpp 
gpsdrive-2.10+pre2/src/garmin_data.cpp
---- gpsdrive-2.10+pre2~/src/garmin_data.cpp    2007-07-17 19:12:38.000000000 
+0000
-+++ gpsdrive-2.10+pre2/src/garmin_data.cpp     2007-07-17 19:14:12.000000000 
+0000
-@@ -16,6 +16,8 @@
- // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- // GNU General Public License for more details.
- 
-+#include <string.h>
-+
- #include "garmin_data.h" 
- #include "garmin_util.h" 
- 
-diff -urNad gpsdrive-2.10+pre2~/src/garmin_data.h 
gpsdrive-2.10+pre2/src/garmin_data.h
---- gpsdrive-2.10+pre2~/src/garmin_data.h      2007-07-17 19:12:38.000000000 
+0000
-+++ gpsdrive-2.10+pre2/src/garmin_data.h       2007-07-17 19:14:32.000000000 
+0000
-@@ -19,6 +19,8 @@
- #ifndef _garmin_data
- #define _garmin_data
- 
-+#include <string.h>
-+
- #include "garmin_types.h"
- 
- namespace garmin {

Deleted: packages/gpsdrive/trunk/debian/patches/05start_gpsd.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/05start_gpsd.dpatch  2007-10-03 
11:23:20 UTC (rev 1159)
+++ packages/gpsdrive/trunk/debian/patches/05start_gpsd.dpatch  2007-10-03 
20:35:08 UTC (rev 1160)
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05start_gpsd.dpatch by  <[EMAIL PROTECTED]>
-##
-## DP: Make gpsdrive aware of debian's gpsd command line options.
-
[EMAIL PROTECTED]@
-diff -urNad gpsdrive-2.10+pre2~/src/gpsdrive.c 
gpsdrive-2.10+pre2/src/gpsdrive.c
---- gpsdrive-2.10+pre2~/src/gpsdrive.c 2007-07-18 16:44:51.000000000 +0000
-+++ gpsdrive-2.10+pre2/src/gpsdrive.c  2007-07-18 16:57:44.000000000 +0000
-@@ -2309,12 +2309,14 @@
-     {
-       g_snprintf (s2, sizeof (s2), "%d", t[serialspeed]);
-       if (usedgps)
--      g_snprintf (s, sizeof (s), "gpsd -p %s -c -d %s -s %s -r %s",
--                  serialdev, dgpsserver, s2, dgpsport);
-+      g_snprintf (s, sizeof (s), "gpsd -d dgpsip://%s:%s %s",
-+                  dgpsserver, dgpsport, serialdev);
-       else
--      g_snprintf (s, sizeof (s), "gpsd -p %s -s %s", serialdev, s2);
-+      g_snprintf (s, sizeof (s), "gpsd %s", serialdev);
-+      /*
-       if (earthmate)
-       g_strlcat (s, " -T e -s 9600", sizeof (s));
-+    */
-       system (s);
-       gtk_button_set_label (GTK_BUTTON (startgpsbt), _("Stop GPSD"));
-       gtk_tooltips_set_tip (GTK_TOOLTIPS (temptooltips), startgpsbt,

Modified: packages/gpsdrive/trunk/debian/patches/30-icons.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/30-icons.dpatch      2007-10-03 
11:23:20 UTC (rev 1159)
+++ packages/gpsdrive/trunk/debian/patches/30-icons.dpatch      2007-10-03 
20:35:08 UTC (rev 1160)
@@ -2,7 +2,7 @@
 ## 30-icons.dpatch by Andreas Putzo <[EMAIL PROTECTED]>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## 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

Added: packages/gpsdrive/trunk/debian/patches/40-backported.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/40-backported.dpatch                 
        (rev 0)
+++ packages/gpsdrive/trunk/debian/patches/40-backported.dpatch 2007-10-03 
20:35:08 UTC (rev 1160)
@@ -0,0 +1,80 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40-backported.dpatch by Andreas Putzo <[EMAIL PROTECTED]>
+##
+## DP: Bugfixes from gpsdrive VCS.
+## DP: r1713: use poi_type_name as title for POI when no title is available .
+## DP: r1716: gpsdrive sets textdomain too late.
+## DP: r1717: include src/main_gui.c into the series of files to extract
+## DP:        translatable strings from, so that all of the GUI can get
+## DP:        translated.
+## DP: r1733: Adapt font path to debian files.
+
[EMAIL PROTECTED]@
+diff -urNad gpsdrive-2.10~pre4~/po/POTFILES.in 
gpsdrive-2.10~pre4/po/POTFILES.in
+--- gpsdrive-2.10~pre4~/po/POTFILES.in 2007-09-14 21:47:47.000000000 +0000
++++ gpsdrive-2.10~pre4/po/POTFILES.in  2007-10-03 12:24:09.000000000 +0000
+@@ -21,6 +21,7 @@
+ src/lib_map/map_port.c
+ src/lib_map/map_render.c
+ src/lib_map/map_transform.c
++src/main_gui.c
+ src/map_handler.c
+ src/map_projection.c
+ src/navigation.c
+diff -urNad gpsdrive-2.10~pre4~/src/gpsdrive.c 
gpsdrive-2.10~pre4/src/gpsdrive.c
+--- gpsdrive-2.10~pre4~/src/gpsdrive.c 2007-09-15 01:24:15.000000000 +0000
++++ gpsdrive-2.10~pre4/src/gpsdrive.c  2007-10-03 12:23:00.000000000 +0000
+@@ -2985,6 +2985,10 @@
+ main (int argc, char *argv[])
+ {
+ 
++    bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
++    bind_textdomain_codeset (PACKAGE, "utf8");
++    textdomain (GETTEXT_PACKAGE);
++
+     gchar buf[500];
+ 
+     current.needtosave = FALSE;
+@@ -3167,14 +3171,6 @@
+      */
+     loadmapconfig ();
+ 
+-    /* PORTING */
+-    {
+-      gchar *p;
+-      p = bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+-      bind_textdomain_codeset (PACKAGE, "utf8");
+-      p = textdomain (GETTEXT_PACKAGE);
+-      p = textdomain (NULL);
+-    }
+ 
+     /*    Setting locale for correct Umlauts */
+     gtk_set_locale ();
+diff -urNad gpsdrive-2.10~pre4~/src/mapnik.cpp 
gpsdrive-2.10~pre4/src/mapnik.cpp
+--- gpsdrive-2.10~pre4~/src/mapnik.cpp 2007-09-14 21:47:13.000000000 +0000
++++ gpsdrive-2.10~pre4/src/mapnik.cpp  2007-10-03 12:28:29.000000000 +0000
+@@ -118,7 +118,9 @@
+     // Both datasorce_cache and font_engine are 'singletons'.
+    
+     
datasource_cache::instance()->register_datasources("/usr/lib/mapnik/input/");
+-    
freetype_engine::instance()->register_font("/usr/lib/mapnik/fonts/DejaVuSans.ttf");
++    // XXX We should make the fontname and path a config option
++    
freetype_engine::instance()->register_font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf");
++
+     
+     MapnikMap.WidthInt = 1280;
+     MapnikMap.HeightInt = 1024;
+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-15 15:12:03.000000000 +0000
++++ gpsdrive-2.10~pre4/src/poi.c       2007-10-03 12:18:30.000000000 +0000
+@@ -907,6 +907,10 @@
+                               g_strlcpy(t_description, t_desc_en, 
sizeof(t_description));
+                       if (strcmp(t_title, "n/a")==0)
+                               g_strlcpy(t_title, t_title_en, sizeof(t_title));
++            /* if also no english title is available,
++             * use the poi_type_name as title */
++            if (strcmp(t_title, "n/a")==0)
++                    g_strlcpy(t_title, t_name, sizeof(t_title));
+ 
+ 
+                       g_strlcpy (poi_type_list[index].description,


Property changes on: packages/gpsdrive/trunk/debian/patches/40-backported.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch                    
        (rev 0)
+++ packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch    2007-10-03 
20:35:08 UTC (rev 1160)
@@ -0,0 +1,15 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50-scripts.dpatch by Andreas Putzo <[EMAIL PROTECTED]>
+##
+## DP: Update shebang line of gpsdrive_mapnik_gentiles.py to use python 2.5 
(needed by mapnik).
+
[EMAIL PROTECTED]@
+diff -urNad gpsdrive-2.10~pre4~/scripts/mapnik/gpsdrive_mapnik_gentiles-in.py 
gpsdrive-2.10~pre4/scripts/mapnik/gpsdrive_mapnik_gentiles-in.py
+--- gpsdrive-2.10~pre4~/scripts/mapnik/gpsdrive_mapnik_gentiles-in.py  
2007-09-15 15:11:59.000000000 +0000
++++ gpsdrive-2.10~pre4/scripts/mapnik/gpsdrive_mapnik_gentiles-in.py   
2007-10-03 13:59:45.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.5
+ """GpsDrive Generate Mapnik Tiles
+ 
+ Generates 1280x1024 Mapniktiles for GpsDrive


Property changes on: packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/gpsdrive/trunk/debian/patches/60-sql.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/60-sql.dpatch                        
        (rev 0)
+++ packages/gpsdrive/trunk/debian/patches/60-sql.dpatch        2007-10-03 
20:35:08 UTC (rev 1160)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60-sql.dpatch by Andreas Putzo <[EMAIL PROTECTED]>
+##
+## DP: Moved remaining patches from 01old.dpatch.
+
[EMAIL PROTECTED]@
+diff -urNad gpsdrive-2.10~pre4~/Documentation/README.SQL 
gpsdrive-2.10~pre4/Documentation/README.SQL
+--- gpsdrive-2.10~pre4~/Documentation/README.SQL       2007-09-14 
21:47:42.000000000 +0000
++++ gpsdrive-2.10~pre4/Documentation/README.SQL        2007-10-03 
17:04:32.000000000 +0000
+@@ -8,7 +8,7 @@
+ ----------
+ 
+ There is no MySQL needed for compiling, the needed library
+-libmysqlclient.so.10 will be loaded at runtime, if found.
++libmysqlclient.so will be loaded at runtime, if found.
+ 
+ Running and first initialization:
+ ---------------------------------
+diff -urNad gpsdrive-2.10~pre4~/src/gpsdrive.h 
gpsdrive-2.10~pre4/src/gpsdrive.h
+--- gpsdrive-2.10~pre4~/src/gpsdrive.h 2007-09-14 21:47:13.000000000 +0000
++++ gpsdrive-2.10~pre4/src/gpsdrive.h  2007-10-03 17:04:05.000000000 +0000
+@@ -247,7 +247,7 @@
+                                            const char *db,
+                                            unsigned int port,
+                                            const char *unix_socket,
+-                                           unsigned int clientflag);
++                                           unsigned long clientflag);
+ void    (*dl_mysql_close)(MYSQL *sock);
+ int     (*dl_mysql_query)(MYSQL *mysql, const char *q);
+ my_ulonglong (*dl_mysql_affected_rows)(MYSQL *mysql);


Property changes on: packages/gpsdrive/trunk/debian/patches/60-sql.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

Reply via email to