[SCM] jack-capture packaging branch, master, updated. upstream/0.9.54-31-g36b0e84

[adiknoth-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bdfbee75b84a21eb9f32d31def5f3f722455f15f
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Wed Aug 18 12:32:58 2010 +0200

    Remove obsolete patches.
    
    Included upstream.

diff --git a/debian/patches/03-makefile-meterbridge.patch b/debian/patches/03-makefile-meterbridge.patch
deleted file mode 100644
index 50404a3..0000000
--- a/debian/patches/03-makefile-meterbridge.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Adrian Knoth <adi at drcomp.erfurt.thur.de>
-Description: Set meterbridge path
- Without the explicit path, we'd need to have meterbridge installed
- at compile time. However, this would pull in jackd and consequently the
- current default jackd implementation, jackd2. The dep resolver then gets
- confused and cannot install libjack-dev anymore.
-Forwarded: not-needed
---- a/Makefile
-+++ b/Makefile
-@@ -12,7 +12,7 @@
- #OPTIMIZE=-O0 -g
- 
- #COMPILEFLAGS=$(OPTIMIZE) -DVERSION=\"$(VERSION)\" -DWHICH_METERBRIDGE=\"`if which meterbridge2 ; then \`which meterbridge\` ; else echo not_found ; fi`\" -Wall
--COMPILEFLAGS=$(OPTIMIZE) -DVERSION=\"$(VERSION)\" -DWHICH_METERBRIDGE=\"`echo \`which meterbridge 2>/dev/null\``\" -Wall
-+COMPILEFLAGS=$(OPTIMIZE) -DVERSION=\"$(VERSION)\" -DWHICH_METERBRIDGE=\"meterbridge\" -Wall
- LINKFLAGS=-ljack -lsndfile -lm -lpthread
- 
- targets = jack_capture jack_capture_gui2
diff --git a/debian/patches/04-meterbridge-path.patch b/debian/patches/04-meterbridge-path.patch
deleted file mode 100644
index 0fd7a07..0000000
--- a/debian/patches/04-meterbridge-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From: Adrian Knoth <adi at drcomp.erfurt.thur.de>
-Description: Get the meterbridge path from environment
-Forwarded: Yes
---- a/jack_capture.c
-+++ b/jack_capture.c
-@@ -1319,7 +1319,7 @@
-       }
-     }
- 
--    execve(WHICH_METERBRIDGE,argv,environ);
-+    execvp(WHICH_METERBRIDGE,argv);
-     exit(0);
-   }
- 

-- 
jack-capture packaging