[SCM] qjackctl/master: Handle conflicts between PulseAudio and JACK

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b1419fadf148e83fb3acf1893999db5bfce61586
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed May 11 13:54:50 2011 +0200

    Handle conflicts between PulseAudio and JACK
    
    - Install a script to launch qjackctl (now renamed in
      /usr/lib/qjackctl/qjackctl.real) through pasuspender if installed.

diff --git a/debian/launcher.sh b/debian/launcher.sh
new file mode 100755
index 0000000..6ec8799
--- /dev/null
+++ b/debian/launcher.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# laucher.sh - Disable PulseAudio before launching a JACKD based program
+# Copyright © 2011 Alessio Treglia <alessio at debian.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+PROGRAM="/usr/lib/qjackctl/qjackctl.real"
+PASUSPENDER="`whereis -b pasuspender | cut -d ':' -f 2 | tr -d ' '`"
+
+( [ -x "${PASUSPENDER}" ] && ${PASUSPENDER} -- ${PROGRAM} ${@} ) || ${PROGRAM} ${@}
+
+exit 0
diff --git a/debian/rules b/debian/rules
index 34ef686..75c7ac3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,3 +25,7 @@ install/qjackctl::
 	# Fix end-of-lines, convert CRLF to LF.
 	dos2unix -ascii \
 		debian/qjackctl/usr/share/applications/qjackctl.desktop
+	# Move qjackctl to /usr/lib/qjackctl
+	mkdir -p debian/qjackctl/usr/lib/qjackctl/
+	mv debian/usr/bin/qjackctl debian/usr/lib/qjackctl/qjackctl.real
+	install -m 0755 debian/launcher.sh debian/usr/bin/qjackctl

-- 
qjackctl packaging