[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.10-1-2-gddc05c5

[sjoerd at users.alioth.debian.org]

The branch, master has been updated
       via  ddc05c5d35fe620d8f7d27bea1af6b578329bb4e (commit)
      from  0b39dfd11766d56420de92543c7dde5d23e72c68 (commit)


- Shortlog ------------------------------------------------------------
ddc05c5 debian/patches/0004-load-module-gconf-earlier.patch

Summary of changes:
 debian/changelog                                   |    6 ++-
 ...ocket-to-tmp-.esd-socket-to-match-up-with.patch |    2 +-
 .../patches/0004-load-module-gconf-earlier.patch   |   45 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 4 files changed, 52 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit ddc05c5d35fe620d8f7d27bea1af6b578329bb4e
Author: Sjoerd Simons <sjoerd at luon.net>
Date:   Sat May 10 19:27:35 2008 +0200

    debian/patches/0004-load-module-gconf-earlier.patch
    
    * debian/patches/0004-load-module-gconf-earlier.patch
      - Added. Load module-gconf before module-volume-restore and
      module-device-restore. Otherwise setting virtual sinks/sources as default
      won't be persistent

diff --git a/debian/changelog b/debian/changelog
index 38bba33..b9cdfde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,12 @@ pulseaudio (0.9.10-2) UNRELEASED; urgency=low
   * debian/patches/0003-Define-PULSE_INTERNAL.patch
     - Added. Let the daemon put PULSE_INTERNAL in its environment so things
     can detect when called from within pulseaudio
+  * debian/patches/0004-load-module-gconf-earlier.patch
+    - Added. Load module-gconf before module-volume-restore and
+    module-device-restore. Otherwise setting virtual sinks/sources as default
+    won't be persistent
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 27 Apr 2008 21:43:47 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 10 May 2008 18:35:53 +0200
 
 pulseaudio (0.9.10-1) unstable; urgency=low
 
diff --git a/debian/patches/0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch b/debian/patches/0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
index 7850af3..87b0b51 100644
--- a/debian/patches/0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
+++ b/debian/patches/0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
@@ -1,4 +1,4 @@
-From 4ca50fb382e88a8da101ff069d099e9f25412468 Mon Sep 17 00:00:00 2001
+From 6ec4a2caba74203b6814635beec957a899645410 Mon Sep 17 00:00:00 2001
 From: CJ van den Berg <cj at vdbonline.com>
 Date: Wed, 31 Oct 2007 13:59:31 +0100
 Subject: [PATCH] Set ESD socket to /tmp/.esd/socket to match up with libesd
diff --git a/debian/patches/0004-load-module-gconf-earlier.patch b/debian/patches/0004-load-module-gconf-earlier.patch
new file mode 100644
index 0000000..4ea107c
--- /dev/null
+++ b/debian/patches/0004-load-module-gconf-earlier.patch
@@ -0,0 +1,45 @@
+From c10991788a48ffb8d47a9d6fa8684086ee6e6c5a Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+Date: Sat, 10 May 2008 18:35:08 +0200
+Subject: [PATCH] load module-gconf earlier
+
+---
+ src/daemon/default.pa.in |   18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
+index be46526..47ea7ab 100755
+--- a/src/daemon/default.pa.in
++++ b/src/daemon/default.pa.in
+@@ -64,6 +64,15 @@ load-module module-native-protocol-unix
+ #load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 description="RTP Multicast Sink"
+ #load-module module-rtp-send source=rtp.monitor
+ 
++### Load additional modules from GConf settings. This can be configured with the paprefs tool.
++### Please keep in mind that the modules configured by paprefs might conflict with manually
++### loaded modules.
++.ifexists module-gconf at PA_SOEXT@
++.nofail
++load-module module-gconf
++.fail
++.endif
++
+ ### Automatically restore the volume of playback streams
+ load-module module-volume-restore
+ 
+@@ -85,15 +94,6 @@ load-module module-suspend-on-idle
+ # Instead we load this via /etc/xdg/autostart/ and "pactl load-module" now
+ # load-module module-x11-xsmp
+ 
+-### Load additional modules from GConf settings. This can be configured with the paprefs tool.
+-### Please keep in mind that the modules configured by paprefs might conflict with manually
+-### loaded modules.
+-.ifexists module-gconf at PA_SOEXT@
+-.nofail
+-load-module module-gconf
+-.fail
+-.endif
+-
+ ### Publish connection data in the X11 root window
+ .ifexists module-x11-publish at PA_SOEXT@
+ .nofail
diff --git a/debian/patches/series b/debian/patches/series
index e0d7dec..f46d847 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
 0002-Fix-library-search-path-to-include-lib-and-usr-lib.patch
 0003-Define-PULSE_INTERNAL.patch
+0004-load-module-gconf-earlier.patch

-- 
pulseaudio packaging