[SCM] pulseaudio packaging branch, master, updated. debian/4.0-6-11-gc789e3b

[rbalint at users.alioth.debian.org]

The branch, master has been updated
       via  c789e3b9536340eca193c81fcb45180e73a9b05b (commit)
       via  b6cab0d66205f5ef4c72d81b3be8c3b94974fb62 (commit)
      from  303163b4486798c45d5a9c212cb8efe554a912e7 (commit)


- Shortlog ------------------------------------------------------------
c789e3b Make PA init script start PA unconditionally upon restart (Closes: #738143)
b6cab0d Fix upgrade not creating the symlink to /etc/pulse/alsa-mixer

Summary of changes:
 debian/pulseaudio.init     | 2 +-
 debian/pulseaudio.postinst | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
-----------------------------------------------------------------------
Details of changes:

commit c789e3b9536340eca193c81fcb45180e73a9b05b
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Wed Mar 26 15:13:26 2014 +0100

    Make PA init script start PA unconditionally upon restart (Closes: #738143)

diff --git a/debian/pulseaudio.init b/debian/pulseaudio.init
index f7b0bc9..528ea94 100644
--- a/debian/pulseaudio.init
+++ b/debian/pulseaudio.init
@@ -62,8 +62,8 @@ case "$1" in
 	restart|force-reload)
 		if [ -s $PIDFILE ] && kill -0 $(cat $PIDFILE) >/dev/null 2>&1; then
 			pulseaudio_stop
-			pulseaudio_start
 		fi
+		pulseaudio_start
 		;;
 	force-stop)
 		pulseaudio_stop

commit b6cab0d66205f5ef4c72d81b3be8c3b94974fb62
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Wed Mar 26 14:28:35 2014 +0100

    Fix upgrade not creating the symlink to /etc/pulse/alsa-mixer

diff --git a/debian/pulseaudio.postinst b/debian/pulseaudio.postinst
index a0f4b9d..ccb9459 100644
--- a/debian/pulseaudio.postinst
+++ b/debian/pulseaudio.postinst
@@ -27,6 +27,11 @@ case "$1" in
     if ! getent group pulse-access >/dev/null; then
       addgroup --quiet --system pulse-access
     fi
+    # fix upgrade not creating the symlink due to existing dir
+    if test -d /usr/share/pulseaudio/alsa-mixer; then
+	rm -r /usr/share/pulseaudio/alsa-mixer
+	ln -s /etc/pulse/alsa-mixer /usr/share/pulseaudio/alsa-mixer
+    fi
   ;;
   abort-upgrade|abort-remove|abort-deconfigure)
   ;;

-- 
pulseaudio packaging