[pulseaudio] 03/03: Do not start pulseaudio in X session if it was already started. Closes: #743813

[Felipe Sateler]

This is an automated email from the git hooks/post-receive script.

fsateler pushed a commit to branch master
in repository pulseaudio.

commit d7cdcfcd9302012fa9809e1099c7871779908603
Author: Felipe Sateler <fsateler at debian.org>
Date:   Wed Apr 23 13:05:51 2014 -0300

    Do not start pulseaudio in X session if it was already started. Closes: #743813
---
 debian/changelog                                   |  2 ++
 .../0004-dont-start-when-already-running.patch     | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d3978f4..acb8aeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ pulseaudio (5.0-3) UNRELEASED; urgency=medium
   * Add lintian override for pulseaudio package
     - bash completion is not meant to be executable
     - neither are the pulseaudio configuration files
+  * Do not start pulseaudio in X session if it was already started.
+     Closes: #743813 
 
  -- Felipe Sateler <fsateler at debian.org>  Mon, 14 Apr 2014 10:02:36 -0300
 
diff --git a/debian/patches/0004-dont-start-when-already-running.patch b/debian/patches/0004-dont-start-when-already-running.patch
new file mode 100644
index 0000000..948837a
--- /dev/null
+++ b/debian/patches/0004-dont-start-when-already-running.patch
@@ -0,0 +1,30 @@
+Description: Do not start pulseaudio if it is already running
+Origin: https://bbs.archlinux.org/viewtopic.php?pid=1164699#p1164699
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=743813
+Forwarded: http://lists.freedesktop.org/archives/pulseaudio-discuss/2014-April/020381.html
+--- a/src/daemon/start-pulseaudio-kde.in
++++ b/src/daemon/start-pulseaudio-kde.in
+@@ -26,9 +26,9 @@ if /usr/bin/pulseaudio --check; then
+     EXIT_WITH_X_SESSION=no
+ else
+     EXIT_WITH_X_SESSION=yes
++    @PA_BINARY@ --start "$@"
+ fi
+ 
+- at PA_BINARY@ --start "$@"
+ 
+ if [ x"$DISPLAY" != x ] ; then
+ 
+--- a/src/daemon/start-pulseaudio-x11.in
++++ b/src/daemon/start-pulseaudio-x11.in
+@@ -24,9 +24,9 @@ if /usr/bin/pulseaudio --check; then
+        EXIT_WITH_X_SESSION=no
+ else
+        EXIT_WITH_X_SESSION=yes
++       @PA_BINARY@ --start "$@"
+ fi
+ 
+- at PA_BINARY@ --start "$@"
+ 
+ if [ x"$DISPLAY" != x ] ; then
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c110538..3b65b54 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 0001-raop-sink-channels.patch
 0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
 0003-exit-with-X-session.patch
+0004-dont-start-when-already-running.patch
 kfreebsd_no_lock_and_threads_synchro.patch
 asus-P5K-SE-udev-rules.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git