[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.8-1-3-g363fb2d

[sjoerd at users.alioth.debian.org]

The branch, master has been updated
       via  363fb2d4379f831914f1b7e7b9fa7b79f338de35 (commit)
      from  b2abd64aa12c6013fcd2596f53e94f280f4ff58e (commit)


- Shortlog ------------------------------------------------------------
363fb2d * debian/patches/0007-Change-config-to-not-fail-if-loading-of-esd-gconf-o.patch

Summary of changes:
 debian/changelog                                   |    4 +-
 ...fig-to-not-fail-if-loading-of-esd-gconf-o.patch |   41 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 45 insertions(+), 1 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 363fb2d4379f831914f1b7e7b9fa7b79f338de35
Author: Sjoerd Simons <sjoerd at luon.net>
Date:   Fri Jan 4 12:49:49 2008 +0100

    * debian/patches/0007-Change-config-to-not-fail-if-loading-of-esd-gconf-o.patch
      - Added. Don't fail to load if esd, gconf or x11-publish fail.
        (Closes: 456590)

diff --git a/debian/changelog b/debian/changelog
index ee1e03c..755084d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,9 @@ pulseaudio (0.9.8-2) UNRELEASED; urgency=low
     - Removed. Obsoleted by the two previous patches
   * debian/patches/0005-make-sure-to-create-.pulse-before-using-any-config.patch
     - Renamed to 0004-make-sure-to-create-.pulse-before-using-any-config.patch
-  * debian/patches/
+  * debian/patches/0007-Change-config-to-not-fail-if-loading-of-esd-gconf-o.patch
+    - Added. Don't fail to load if esd, gconf or x11-publish fail. 
+      (Closes: 456590)
 
  -- Sjoerd Simons <sjoerd at debian.org>  Fri, 04 Jan 2008 12:13:08 +0100
 
diff --git a/debian/patches/0007-Change-config-to-not-fail-if-loading-of-esd-gconf-o.patch b/debian/patches/0007-Change-config-to-not-fail-if-loading-of-esd-gconf-o.patch
new file mode 100644
index 0000000..39b2252
--- /dev/null
+++ b/debian/patches/0007-Change-config-to-not-fail-if-loading-of-esd-gconf-o.patch
@@ -0,0 +1,41 @@
+From 6cfd9de5d5e1fcfe718b790700418b98e4b5f447 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+Date: Fri, 4 Jan 2008 12:47:46 +0100
+Subject: [PATCH] Change config to not fail if loading of esd, gconf or x11-publish fails
+
+---
+ src/daemon/default.pa.in |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
+index b09d0f2..7afd800 100755
+--- a/src/daemon/default.pa.in
++++ b/src/daemon/default.pa.in
+@@ -46,7 +46,9 @@ load-module module-detect
+ .endif
+ 
+ ### Load several protocols
++.nofail
+ load-module module-esound-protocol-unix socket="/tmp/.esd/socket"
++.fail
+ load-module module-native-protocol-unix
+ 
+ ### Network access (may be configured with paprefs, so leave this commented
+@@ -79,6 +81,8 @@ load-module module-suspend-on-idle
+ #load-module module-x11-bell sample=x11-bell
+ 
+ ### Publish connection data in the X11 root window
++.nofail
++
+ .ifexists @PA_DLSEARCHPATH@/module-x11-publish at PA_SOEXT@
+ load-module module-x11-publish
+ .endif
+@@ -95,6 +99,8 @@ load-module module-x11-publish
+ load-module module-gconf
+ .endif
+ 
++.fail
++
+ ### Make some devices default
+ #set-default-sink output
+ #set-default-source input
diff --git a/debian/patches/series b/debian/patches/series
index 4079a68..7878d22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-make-sure-to-create-.pulse-before-using-any-config.patch
 0005-Don-t-add-protocol-fields-introduced-in-version-12-w.patch
 0006-Implement-opcodes-added-in-version-12-in-the-tunnel.patch
+0007-Change-config-to-not-fail-if-loading-of-esd-gconf-o.patch

-- 
pulseaudio packaging