[SCM] jack-capture packaging branch, master, updated. upstream/0.9.54-20-gc1d5c43

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

The following commit has been merged in the master branch:
commit 20fe535bfb06530e98d688ed1aaf7caa04f765fc
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Tue Aug 17 20:40:07 2010 +0200

    Don't hardcode meterbridge path.
    
    This patch itself isn't very useful, yet, it also relies on on
    04-meterbridge-path.patch.

diff --git a/debian/patches/03-makefile-meterbridge.patch b/debian/patches/03-makefile-meterbridge.patch
new file mode 100644
index 0000000..50404a3
--- /dev/null
+++ b/debian/patches/03-makefile-meterbridge.patch
@@ -0,0 +1,18 @@
+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

-- 
jack-capture packaging