[SCM] idjc packaging branch, master, updated. debian/0.8.2-4-9-g9d0ec1a

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 57e00df9842b1e5e5ac9abf1c606c36c1520fb25
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jul 26 11:55:36 2010 +0200

    Drop idjcmixer_sigsegv.patch patch, applied upstream.

diff --git a/debian/patches/idjcmixer_sigsegv.patch b/debian/patches/idjcmixer_sigsegv.patch
deleted file mode 100644
index 80a7b44..0000000
--- a/debian/patches/idjcmixer_sigsegv.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Author: Gabriel M. Beddingfield <gabrbedd at gmail.com>
-Description: Fix segmentation fault at idjcmixer startup.
-Bug: http://sourceforge.net/support/tracker.php?aid=2996992
-Bug-Debian: http://bugs.debian.org/580262
-Forwarded: yes
----
- c/idjcmixer.c |   12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
---- idjc.orig/c/idjcmixer.c
-+++ idjc/c/idjcmixer.c
-@@ -98,7 +98,7 @@ int left_samples_total, right_samples_to
- int main_play;
- /* if the main app segfaults or similar this counter will see that the mixer terminates */
- int timeout;
--int shutdown;
-+int g_shutdown;
- /* flag set when jack closes the client thread for example when the jackd is closed */
- int jack_closed_f;
- /* flag to indicate whether to use the player reading function which supports speed variance */
-@@ -533,10 +533,10 @@ void process_audio(jack_nframes_t nframe
- 
-    if (timeout > 8000)
-       {
--      if (!shutdown)
-+      if (!g_shutdown)
-          {
-          fprintf(stderr, "timeout exceeded\n");
--         shutdown = TRUE;
-+         g_shutdown = TRUE;
-          }
-       plr_l->command = CMD_COMPLETE;
-       plr_r->command = CMD_COMPLETE;
-@@ -587,10 +587,10 @@ void process_audio(jack_nframes_t nframe
-    if (!(lp_lc && lp_rc && rp_lc && rp_rc && jp_lc && jp_rc && ip_lc && ip_rc &&
-          lp_lcf && lp_rcf && rp_lcf && rp_rcf && jp_lcf && jp_rcf && ip_lcf && ip_rcf))
-       {
--      if (!shutdown)
-+      if (!g_shutdown)
-          {
-          printf("Malloc failure in process audio\n");
--         shutdown = TRUE;
-+         g_shutdown = TRUE;
-          }
-       plr_l->command = CMD_COMPLETE;
-       plr_r->command = CMD_COMPLETE;
-@@ -1705,7 +1705,7 @@ int main(int argc, char **argv)
-       
-    while (kvp_parse(kvpdict, fp))
-       {
--      if (jack_closed_f == TRUE || shutdown == TRUE)
-+      if (jack_closed_f == TRUE || g_shutdown == TRUE)
-          break;
-          
-       if (!strcmp(action, "sync"))
diff --git a/debian/patches/series b/debian/patches/series
index 32419ae..ea92ff8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 desktop_file.patch
 idjc_script.patch
 server_window_size.patch
-idjcmixer_sigsegv.patch
 fix-bashism-in-configure.patch
 idjc-twolame.patch

-- 
idjc packaging