[SCM] jack-capture/master: Refresh debian/patches/{01-makefile-prefix, 02-makefile-compile-option}.patch, remove 04-freewheel_mode_fix.patch as it's applied upstream.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5701346ca7561dea5bf9e5951b1c6cc0f37ba36e
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Nov 14 05:48:17 2011 +0100

    Refresh debian/patches/{01-makefile-prefix,02-makefile-compile-option}.patch, remove 04-freewheel_mode_fix.patch as it's applied upstream.

diff --git a/debian/patches/01-makefile-prefix.patch b/debian/patches/01-makefile-prefix.patch
index 1564024..a302663 100644
--- a/debian/patches/01-makefile-prefix.patch
+++ b/debian/patches/01-makefile-prefix.patch
@@ -14,4 +14,4 @@ Forwarded: no
 +prefix = /usr
  bindir = $(prefix)/bin
  
- VERSION=0.9.57
+ VERSION=0.9.61
diff --git a/debian/patches/02-makefile-compile-option.patch b/debian/patches/02-makefile-compile-option.patch
index 2f15bee..d50bb10 100644
--- a/debian/patches/02-makefile-compile-option.patch
+++ b/debian/patches/02-makefile-compile-option.patch
@@ -8,7 +8,7 @@ Forwarded: no
 
 --- jack-capture.orig/Makefile
 +++ jack-capture/Makefile
-@@ -8,7 +8,7 @@ VERSION=0.9.57
+@@ -8,7 +8,7 @@ VERSION=0.9.61
  CC=gcc
  CPP=g++
  
@@ -16,8 +16,8 @@ Forwarded: no
 +OPTIMIZE=-O2
  #OPTIMIZE=-O0 -g
  
- COMPILEFLAGS=$(OPTIMIZE) -DVERSION=\"$(VERSION)\" -Wall
-@@ -58,7 +58,7 @@ jack_capture: setformat.c jack_capture.c
+ COMPILEFLAGS=$(OPTIMIZE) -DVERSION=\"$(VERSION)\" -Wall -Wextra -Wno-unused
+@@ -57,7 +57,7 @@ jack_capture: setformat.c jack_capture.c
  
  
  jack_capture_gui2: jack_capture_gui2.cpp
diff --git a/debian/patches/04-freewheel_mode_fix.patch b/debian/patches/04-freewheel_mode_fix.patch
deleted file mode 100644
index a4d8861..0000000
--- a/debian/patches/04-freewheel_mode_fix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Fix recording when in freewheel mode.
-Author: Filipe Lopes <falktx at gmail.com>
-Acked-by: Alessio Treglia <alessio at debian.org>
-Forwarded: yes
----
- jack_capture.c |   12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
---- jack-capture.orig/jack_capture.c
-+++ jack-capture/jack_capture.c
-@@ -129,6 +129,8 @@ static bool jack_has_been_shut_down=fals
- static int64_t unreported_overruns=0;
- static int total_overruns=0;
- 
-+volatile int freewheel_mode=0;
-+
- 
- /* Disk thread */
- #if HAVE_LAME
-@@ -1505,7 +1507,13 @@ static void stop_connection_thread(void)
- }
- 
- static int graphordercallback(void *arg){
--  wake_up_connection_thread();
-+  if (!freewheel_mode)
-+    wake_up_connection_thread();
-+  return 0;
-+}
-+
-+static int freewheelcallback(int starting, void *arg){
-+  freewheel_mode = starting;
-   return 0;
- }
- 
-@@ -1825,6 +1833,8 @@ void init_various(void){
- 
-     jack_set_graph_order_callback(client,graphordercallback,NULL);
- 
-+    jack_set_freewheel_callback(client,freewheelcallback,NULL);
-+
-     if (jack_activate(client)) {
-       fprintf (stderr,"\nCan not activate client");
-       exit(-2);

-- 
jack-capture packaging