Author: nd-guest
Date: 2008-12-26 22:03:56 +0000 (Fri, 26 Dec 2008)
New Revision: 1830

Modified:
   packages/gpsdrive/branches/etch/README.SQL
   packages/gpsdrive/branches/etch/configure
   packages/gpsdrive/branches/etch/man/gpsdrive.1
   packages/gpsdrive/branches/etch/src/friendsd.c
   packages/gpsdrive/branches/etch/src/gpsdrive.c
   packages/gpsdrive/branches/etch/src/gpsdrive.h
   packages/gpsdrive/branches/etch/src/mysql/mysql.h
Log:
forgot to apply diff.gz


Modified: packages/gpsdrive/branches/etch/README.SQL
===================================================================
--- packages/gpsdrive/branches/etch/README.SQL  2008-12-26 14:30:20 UTC (rev 
1829)
+++ packages/gpsdrive/branches/etch/README.SQL  2008-12-26 22:03:56 UTC (rev 
1830)
@@ -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:
 ---------------------------------

Modified: packages/gpsdrive/branches/etch/configure
===================================================================
--- packages/gpsdrive/branches/etch/configure   2008-12-26 14:30:20 UTC (rev 
1829)
+++ packages/gpsdrive/branches/etch/configure   2008-12-26 22:03:56 UTC (rev 
1830)
@@ -9511,20 +9511,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"

Modified: packages/gpsdrive/branches/etch/man/gpsdrive.1
===================================================================
--- packages/gpsdrive/branches/etch/man/gpsdrive.1      2008-12-26 14:30:20 UTC 
(rev 1829)
+++ packages/gpsdrive/branches/etch/man/gpsdrive.1      2008-12-26 22:03:56 UTC 
(rev 1830)
@@ -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.

Modified: packages/gpsdrive/branches/etch/src/friendsd.c
===================================================================
--- packages/gpsdrive/branches/etch/src/friendsd.c      2008-12-26 14:30:20 UTC 
(rev 1829)
+++ packages/gpsdrive/branches/etch/src/friendsd.c      2008-12-26 22:03:56 UTC 
(rev 1830)
@@ -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)
            {

Modified: packages/gpsdrive/branches/etch/src/gpsdrive.c
===================================================================
--- packages/gpsdrive/branches/etch/src/gpsdrive.c      2008-12-26 14:30:20 UTC 
(rev 1829)
+++ packages/gpsdrive/branches/etch/src/gpsdrive.c      2008-12-26 22:03:56 UTC 
(rev 1830)
@@ -10496,22 +10496,22 @@
       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);
 

Modified: packages/gpsdrive/branches/etch/src/gpsdrive.h
===================================================================
--- packages/gpsdrive/branches/etch/src/gpsdrive.h      2008-12-26 14:30:20 UTC 
(rev 1829)
+++ packages/gpsdrive/branches/etch/src/gpsdrive.h      2008-12-26 22:03:56 UTC 
(rev 1830)
@@ -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);

Modified: packages/gpsdrive/branches/etch/src/mysql/mysql.h
===================================================================
--- packages/gpsdrive/branches/etch/src/mysql/mysql.h   2008-12-26 14:30:20 UTC 
(rev 1829)
+++ packages/gpsdrive/branches/etch/src/mysql/mysql.h   2008-12-26 22:03:56 UTC 
(rev 1830)
@@ -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);


_______________________________________________
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