[SCM] pulseaudio packaging branch, master, updated. debian/2.1-2-6-gf9ea758

[sjoerd at users.alioth.debian.org]

The branch, master has been updated
       via  f9ea7581f56194eae788bc69d222cdcc521c482d (commit)
       via  60b97cdbee9d0b8148252751bad9c7cae22ad5c8 (commit)
      from  d3a90104f4ce1341a560f4255d712c1ce6076e88 (commit)


- Shortlog ------------------------------------------------------------
f9ea758 Don't claim to support reload from the init script (Closes: #690736)
60b97cd Clarify init script message indicating the use of system sessions (Closes: #644809)

Summary of changes:
 debian/pulseaudio.init |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit f9ea7581f56194eae788bc69d222cdcc521c482d
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Nov 4 12:52:36 2012 +0100

    Don't claim to support reload from the init script (Closes: #690736)

diff --git a/debian/pulseaudio.init b/debian/pulseaudio.init
index 63ddb94..f7b0bc9 100644
--- a/debian/pulseaudio.init
+++ b/debian/pulseaudio.init
@@ -59,7 +59,7 @@ case "$1" in
 	start|stop)
 		pulseaudio_${1}
 		;;
-	restart|reload|force-reload)
+	restart|force-reload)
 		if [ -s $PIDFILE ] && kill -0 $(cat $PIDFILE) >/dev/null 2>&1; then
 			pulseaudio_stop
 			pulseaudio_start
@@ -75,7 +75,7 @@ case "$1" in
 		status_of_proc -p $PIDFILE "$DAEMON" "system-wide PulseAudio" && exit 0 || exit $?
 		;;
 	*)
-		echo "Usage: /etc/init.d/pulseaudio {start|stop|force-stop|restart|reload|force-reload|status}"
+		echo "Usage: /etc/init.d/pulseaudio {start|stop|force-stop|restart|force-reload|status}"
 		exit 1
 		;;
 esac

commit 60b97cdbee9d0b8148252751bad9c7cae22ad5c8
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Nov 4 12:05:50 2012 +0100

    Clarify init script message indicating the use of system sessions (Closes: #644809)

diff --git a/debian/pulseaudio.init b/debian/pulseaudio.init
index 921fd06..63ddb94 100644
--- a/debian/pulseaudio.init
+++ b/debian/pulseaudio.init
@@ -26,7 +26,7 @@ PULSEAUDIO_SYSTEM_START=0
 DISALLOW_MODULE_LOADING=1
 test -f /etc/default/pulseaudio && . /etc/default/pulseaudio
 if [ "$PULSEAUDIO_SYSTEM_START" != "1" ]; then
-	log_warning_msg "PulseAudio configured for per-user sessions"
+	log_action_msg "PulseAudio not started: Configured for per-user sessions"
 	exit 0
 fi
 

-- 
pulseaudio packaging