[Pkg-nagios-changes] [SCM] Debian packaging for mod gearman. branch, master, updated. debian/1.2.2-1

[Stig Sandbeck Mathisen]

The following commit has been merged in the master branch:
commit ddcab1b0a0598605530dea82eb65df272e9107ac
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Wed Feb 8 14:48:26 2012 +0100

    Remove patch included upstream

diff --git a/debian/patches/fix_spellings.patch b/debian/patches/fix_spellings.patch
deleted file mode 100644
index b8f9b36..0000000
--- a/debian/patches/fix_spellings.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-Description: Fix some minor spelling issues found by lintian
- Lintian complains about spellign issues which are fixed by this patch. It 
- also renames a function as it uses incorrect spelling in it's name.
-Author: Michael Fladischer <FladischerMichael at fladi.at>
-Last-Update: 2012-01-12
-Forwarded: no
-
---- a/common/gearman.c
-+++ b/common/gearman.c
-@@ -269,7 +269,7 @@
-     if(free_uniq)
-         free(uniq);
- 
--    gm_log( GM_LOG_TRACE, "add_job_to_queue() finished sucessfully: %d %d\n", ret1, ret2 );
-+    gm_log( GM_LOG_TRACE, "add_job_to_queue() finished successfully: %d %d\n", ret1, ret2 );
-     return GM_OK;
- }
- 
---- a/include/worker.h
-+++ b/include/worker.h
-@@ -124,7 +124,7 @@
- void setup_child_communicator(void);
- 
- /**
-- * finish and clean all childs and shared memory segments, then exit.
-+ * finish and clean all children and shared memory segments, then exit.
-  *
-  * @param[in] sig - signal which caused the exit
-  *
-@@ -164,7 +164,7 @@
-  *
-  * @return nothing
-  */
--void stop_childs(int mode);
-+void stop_children(int mode);
- 
- /**
-  * main loop to maintain the child population
-@@ -174,7 +174,7 @@
- void monitor_loop(void);
- 
- /**
-- * check and start new worker childs if level is too low
-+ * check and start new worker children if level is too low
-  *
-  * @return nothing
-  */
---- a/worker/worker.c
-+++ b/worker/worker.c
-@@ -156,7 +156,7 @@
-     /* start status worker */
-     make_new_child(GM_WORKER_STATUS);
- 
--    /* setup childs */
-+    /* setup children */
-     for(x=0; x < mod_gm_opt->min_worker; x++) {
-         make_new_child(GM_WORKER_MULTI);
-     }
-@@ -583,8 +583,8 @@
-     if(mod_gm_opt->pidfile != NULL)
-         unlink(mod_gm_opt->pidfile);
- 
--    /* stop all childs */
--    stop_childs(GM_WORKER_STOP);
-+    /* stop all children */
-+    stop_children(GM_WORKER_STOP);
- 
-     /* detach shm */
-     if(shmdt(shm) < 0)
-@@ -596,20 +596,20 @@
- }
- 
- 
--/* stop all childs */
--void stop_childs(int mode) {
-+/* stop all children */
-+void stop_children(int mode) {
-     int status, chld;
-     int waited = 0;
-     int x, curpid;
- 
--    gm_log( GM_LOG_TRACE, "stop_childs(%d)\n", mode);
-+    gm_log( GM_LOG_TRACE, "stop_children(%d)\n", mode);
- 
-     /* ignore some signals for now */
-     signal(SIGTERM, SIG_IGN);
-     signal(SIGINT,  SIG_IGN);
- 
-     /*
--     * send term signal to our childs
-+     * send term signal to our children
-      * children will finish the current job and exit
-      */
-     killpg(0, SIGTERM);
-@@ -633,7 +633,7 @@
-         count_current_worker(GM_DISABLED);
-         if(current_number_of_workers == 0)
-             return;
--        gm_log( GM_LOG_TRACE, "still waiting (%d) %d childs missing...\n", waited, current_number_of_workers);
-+        gm_log( GM_LOG_TRACE, "still waiting (%d) %d children missing...\n", waited, current_number_of_workers);
-     }
- 
-     if(mode == GM_WORKER_STOP) {
-@@ -669,7 +669,7 @@
-             }
-         }
- 
--        /* count childs a last time */
-+        /* count children a last time */
-         count_current_worker(GM_DISABLED);
-         if(current_number_of_workers == 0)
-             return;
-@@ -763,10 +763,10 @@
- 
-     /*
-      * restart workers gracefully:
--     * send term signal to our childs
-+     * send term signal to our children
-      * children will finish the current job and exit
-      */
--    stop_childs(GM_WORKER_RESTART);
-+    stop_children(GM_WORKER_RESTART);
- 
-     /* start status worker */
-     make_new_child(GM_WORKER_STATUS);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a0acb8f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_spellings.patch

-- 
Debian packaging for mod gearman.