[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.7-3-23-g99427e7

[neurocyte-guest at users.alioth.debian.org]

The branch, master has been updated
       via  99427e7f5c3ad2c022dc819f1bda56935e42a467 (commit)
      from  b266279f98c13f17a4f461907c147fce3a3ca9f2 (commit)


- Shortlog ------------------------------------------------------------
99427e7 Cherry-pick r2078 from upstream to fix module-volume-restore

Summary of changes:
 debian/changelog                                   |    3 ++
 ...-to-create-.pulse-before-using-any-config.patch |   31 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 35 insertions(+), 0 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 99427e7f5c3ad2c022dc819f1bda56935e42a467
Author: CJ van den Berg <cj at vdbonline.com>
Date:   Thu Nov 29 22:12:47 2007 +0100

    Cherry-pick r2078 from upstream to fix module-volume-restore

diff --git a/debian/changelog b/debian/changelog
index 0168eda..246bcb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ pulseaudio (0.9.8-1) UNRELEASED; urgency=low
     + Added, svn commit r2074 from upstream.
   * debian/patches/0004-Force-module-tunnel-to-use-protocol-version-11.patch:
     + Added, fixes protocol errors in module-tunnel.
+  * debian/pa..es/0005-make-sure-to-create-.pulse-before-using-any-config.patch:
+    + Added, fixes module-volume-restore so that volumes are restored across
+      daemon restarts.
   * debian/pulseaudio.manpages: Add manpages default.pa.5, pulse-client.conf.5
       and pulse-daemon.conf.5
   * debian/pulseaudio-utils.manpages: Add manpages pabrowse.1, pacat.1,
diff --git a/debian/patches/0005-make-sure-to-create-.pulse-before-using-any-config.patch b/debian/patches/0005-make-sure-to-create-.pulse-before-using-any-config.patch
new file mode 100644
index 0000000..c6f63cf
--- /dev/null
+++ b/debian/patches/0005-make-sure-to-create-.pulse-before-using-any-config.patch
@@ -0,0 +1,31 @@
+From dcff2dd5a7b6ae0c0a4aa0944fdad9501eeb84d3 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart at poettering.net>
+Date: Sat, 24 Nov 2007 16:22:23 +0000
+Subject: [PATCH] make sure to create ~/.pulse before using any configuration file from it
+
+git-svn-id: svn://svn.0pointer.net/pulseaudio/trunk@2078 fefdeb5f-60dc-0310-8127-8f9354f1896f
+---
+ src/pulsecore/core-util.c |    9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
+index c1b7f53..03c4a51 100644
+--- a/src/pulsecore/core-util.c
++++ b/src/pulsecore/core-util.c
+@@ -1129,8 +1129,15 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env
+ 
+         if ((e = getenv("PULSE_CONFIG_PATH")))
+             fn = lfn = pa_sprintf_malloc("%s/%s", e, local);
+-        else if (pa_get_home_dir(h, sizeof(h)))
++        else if (pa_get_home_dir(h, sizeof(h))) {
++            char *d;
++
++            d = pa_sprintf_malloc("%s/.pulse", h);
++            mkdir(d, 0755);
++            pa_xfree(d);
++
+             fn = lfn = pa_sprintf_malloc("%s/.pulse/%s", h, local);
++        }
+ 
+         if (lfn) {
+             FILE *f;
diff --git a/debian/patches/series b/debian/patches/series
index da63a00..996c821 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Double-esound-maximum-sample-size.patch
 0003-fix-uploading-of-samples-into-PA.-Problem-discovered.patch
 0004-Force-module-tunnel-to-use-protocol-version-11.patch
+0005-make-sure-to-create-.pulse-before-using-any-config.patch

-- 
pulseaudio packaging