Merge lp:~eday/gearmand/fixes into lp:gearmand/1.0

[Eric Day]

=== modified file 'configure.ac'
--- configure.ac	2009-11-06 00:38:02 +0000
+++ configure.ac	2009-12-02 05:25:18 +0000
@@ -14,7 +14,7 @@
 
 PANDORA_CANONICAL_TARGET(require-cxx)
 
-GEARMAN_LIBRARY_VERSION=2:1:0
+GEARMAN_LIBRARY_VERSION=3:0:0
 #                       | | |
 #                +------+ | +---+
 #                |        |     |
 
=== modified file 'gearmand/gearmand.c'
--- gearmand/gearmand.c	2009-10-29 22:01:39 +0000
+++ gearmand/gearmand.c	2009-12-02 05:25:18 +0000
@@ -160,7 +160,7 @@
   MCO("version", 'V', NULL, "Display the version of gearmand and exit.")
   MCO("worker-wakeup", 'w', "WORKERS",
       "Number of workers to wakeup for each job received. The default is to "
-      "wakeup all avaiable workers.")
+      "wakeup all available workers.")
 
   /* Make sure none of the gearman_conf_module_add_option calls failed. */
   if (gearman_conf_return(&conf) != GEARMAN_SUCCESS)
 
=== modified file 'libgearman/libgearman.ver'
--- libgearman/libgearman.ver	2009-09-29 03:57:09 +0000
+++ libgearman/libgearman.ver	2009-12-02 05:25:18 +0000
@@ -1,1 +1,1 @@
-libgearman_2 { global: *; };
+libgearman_3 { global: *; };
 
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2009-10-11 07:24:42 +0000
+++ tests/Makefile.am	2009-12-02 05:25:18 +0000
@@ -27,7 +27,7 @@
 SQLITE_RECORD= ./sqlite_test > sqlite_test.rec
 SQLITE_RUN= ./sqlite_test > sqlite_test.res
 SQLITE_CHECK= diff ${top_srcdir}/tests/sqlite_test.rec sqlite_test.res
-SQLITE_RM= rm gearman.sql
+SQLITE_RM= rm -f gearman.sql gearman.sql-journal
 SQLITE_VALGRIND= libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  sqlite_test
 sqlite_test_SOURCES= test.c test_gearmand.c sqlite_test.c
 endif