diff -u jack-audio-connection-kit-0.109.2/debian/rules jack-audio-connection-kit-0.109.2/debian/rules --- jack-audio-connection-kit-0.109.2/debian/rules +++ jack-audio-connection-kit-0.109.2/debian/rules @@ -33,6 +33,7 @@ DEB_CONFIGURE_EXTRA_FLAGS += --enable-dynsimd=yes endif +DEB_DH_INSTALLINIT_ARGS := -- start 99 2 3 4 5 . stop 10 0 1 6 . # to avoid stripping when nostrip is set in DEB_BUILD_OPTIONS ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) diff -u jack-audio-connection-kit-0.109.2/debian/changelog jack-audio-connection-kit-0.109.2/debian/changelog --- jack-audio-connection-kit-0.109.2/debian/changelog +++ jack-audio-connection-kit-0.109.2/debian/changelog @@ -1,3 +1,16 @@ +jack-audio-connection-kit (0.109.2-4ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes (LP: #293583): + - Redirect stderr in bash completion. + + -- Nathan Handler Tue, 04 Nov 2008 06:37:43 -0600 + +jack-audio-connection-kit (0.109.2-4) unstable; urgency=low + + * Added init script to start jackd at system startup + + -- Free Ekanayaka Wed, 17 Sep 2008 14:43:18 +0200 + jack-audio-connection-kit (0.109.2-3ubuntu1) intrepid; urgency=low * Merge from debian unstable, remaining changes (LP: #239490): only in patch2: unchanged: --- jack-audio-connection-kit-0.109.2.orig/debian/jackd.default +++ jack-audio-connection-kit-0.109.2/debian/jackd.default @@ -0,0 +1,8 @@ +# Set to "yes" to start jackd at boot +START_DAEMON=no + +# The jackd process will run under this user +USER=fred + +# Options to pass to jackd +OPTIONS="-R -d alsa -d hw" only in patch2: unchanged: --- jack-audio-connection-kit-0.109.2.orig/debian/jackd.init +++ jack-audio-connection-kit-0.109.2/debian/jackd.init @@ -0,0 +1,129 @@ +#!/bin/sh +# +# Jackd init script +# +### BEGIN INIT INFO +# Provides: jackd +# Required-Start: $network $local_fs $remote_fs +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: init-Script for system wide fetchmail daemon +### END INIT INFO +# +# A fetchmailrc file containg hosts and passwords for all local users should be +# placed in /etc/fetchmailrc. Remember to make the /etc/fetchmailrc mode 600 +# to avoid disclosing the users' passwords. +# +# This script will NOT start or stop fetchmail if the /etc/fetchmailrc file +# does not exist or /etc/default/fetchmail is set to no. + +set -e + +# Defaults +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/bin/jackd +USER= +OPTIONS="" + +PIDFILE="/var/run/jackd.pid" + +test -f /etc/default/jackd || exit 0 +. /etc/default/jackd + +OPTIONS="$OPTIONS" + +if [ ! "x$START_DAEMON" = "xyes" -a ! "$1" = "stop" ]; then + echo "Edit /etc/default/jackd to start jackd" + exit 0 +fi + +test -f $DAEMON || exit 0 + +. /lib/lsb/init-functions + +case "$1" in + start) + if test -e $PIDFILE ; then + pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1` + PIDDIR=/proc/$pid + if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then + log_failure_msg "jackd already started; not starting." + exit 0 + else + log_warning_msg "Removing stale PID file $PIDFILE." + rm -f $PIDFILE + fi + fi + log_begin_msg "Starting jackd audio server:" "jackd" + if start-stop-daemon -m -b -S -o -q -p $PIDFILE -x $DAEMON -u $USER -c $USER -a $DAEMON -- $OPTIONS; then + log_end_msg 0 + else + log_end_msg 1 + exit 1 + fi + ;; + stop) + if ! test -e $PIDFILE ; then + log_failure_msg "Pidfile not found! Is jackd running?" + exit 0 + fi + log_begin_msg "Stopping jackd audio server:" "jackd" + if start-stop-daemon -m -K -o -q -p $PIDFILE -x $DAEMON -u $USER; then + rm -f $PIDFILE + log_end_msg 0 + else + log_end_msg 1 + exit 1 + fi + ;; + force-reload|restart) + log_begin_msg "Restarting jackd audio server:" "jackd" + if ! start-stop-daemon -m -K -o -q -p $PIDFILE -x $DAEMON -u $USER; then + log_end_msg 1 + exit 1 + fi + sleep 1 + rm -f $PIDFILE || true + if start-stop-daemon -m -b -S -o -q -p $PIDFILE -x $DAEMON -u $USER -c $USER -a $DAEMON -- $OPTIONS; then + log_end_msg 0 + else + log_end_msg 1 + exit 1 + fi + ;; + try-restart) + if test -e $PIDFILE ; then + pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1` + PIDDIR=/proc/$pid + if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then + $0 restart + exit 0 + fi + fi + test -f /etc/rc`/sbin/runlevel | cut -d' ' -f2`.d/S*jackd* && $0 start + ;; + awaken) + log_begin_msg "Awakening jackd audio server:" "jackd" + if [ -s $PIDFILE ]; then + start-stop-daemon -K -s 10 -q -p $PIDFILE -x $DAEMON + log_end_msg 0 + exit 0 + else + log_end_msg 1 + exit 1 + fi + ;; + *) + log_warning_msg "Usage: /etc/init.d/jackd {start|stop|restart|force-reload|awaken|debug-run}" + log_warning_msg " start - starts system-wide jackd service" + log_warning_msg " stop - stops system-wide jackd service" + log_warning_msg " restart, force-reload - starts a new system-wide jackd service" + log_warning_msg " awaken - tell system-wide jackd to start a poll cycle immediately" + log_warning_msg " debug-run [strace [strace options...]] - start a debug run of the" + log_warning_msg " system-wide jackd service, optionally running it under strace" + exit 1 + ;; +esac + +exit 0