[SCM] pulseaudio packaging branch, master, updated. debian/0.9.21-1-5-g9c33887

[sjoerd at users.alioth.debian.org]

The branch, master has been updated
       via  9c3388799a7df3ed08c2409caab0bcf2a82a18ea (commit)
       via  1b0d5c512dac47f5d8aac05f8044b918d53be0c1 (commit)
      from  584458f1a07ab284471f0ce2f52752cf28126f8c (commit)


- Shortlog ------------------------------------------------------------
9c33887 Install device-manager module for KDE's benefit
1b0d5c5 Close the whole list of merged bugs

Summary of changes:
 debian/changelog                                   |   12 +++++++++---
 ...-start-pulseaudio-from-the-KDE-specific-d.patch |   20 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 debian/pulseaudio.install                          |    3 +++
 4 files changed, 33 insertions(+), 3 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 9c3388799a7df3ed08c2409caab0bcf2a82a18ea
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Jun 27 15:26:04 2010 +0100

    Install device-manager module for KDE's benefit
    
    Install a KDE specific startup file and module-device-manager. Thanks to Daniel Schaal and Zsolt Rizsanyi for patches and tips. (Closes: #570487)
    
    * Install a KDE specific startup file and module-device-manager.
      Thanks to Daniel Schaal and Zsolt Rizsanyi for patches and tips.
      (Closes: #570487)
    * d/p/0004-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
      + Added. When running KDE use the KDE specific autostart desktop file
      instead of the generic pulseaudio-x11 file

diff --git a/debian/changelog b/debian/changelog
index 3a040f3..f7606ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,14 @@ pulseaudio (0.9.21-2) UNRELEASED; urgency=low
   * debian/patches/0003-Re-bootstrap.patch
     + Added. Update configure so we don't have to re-run autotools when
     building the package (Closes: #576457, #576546, #576769)
-
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 27 Jun 2010 13:40:56 +0100
+  * Install a KDE specific startup file and module-device-manager.
+    Thanks to Daniel Schaal and Zsolt Rizsanyi for patches and tips.
+    (Closes: #570487)
+  * d/p/0004-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
+    + Added. When running KDE use the KDE specific autostart desktop file
+    instead of the generic pulseaudio-x11 file
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 27 Jun 2010 15:18:37 +0100
 
 pulseaudio (0.9.21-1.2) unstable; urgency=high
 
diff --git a/debian/patches/0004-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch b/debian/patches/0004-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
new file mode 100644
index 0000000..45bb1e8
--- /dev/null
+++ b/debian/patches/0004-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
@@ -0,0 +1,20 @@
+From 0c3f62b960f0f07fa5f9703c4b51d26febca2095 Mon Sep 17 00:00:00 2001
+From: Zsolt Rizsanyi <rizsanyi at users.sourceforge.net>
+Date: Sun, 27 Jun 2010 15:16:13 +0100
+Subject: [PATCH 4/4] In KDE only start pulseaudio from the KDE specific desktop file
+
+---
+ src/daemon/pulseaudio.desktop.in |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/daemon/pulseaudio.desktop.in b/src/daemon/pulseaudio.desktop.in
+index 99bdbd0..47b2eb4 100644
+--- a/src/daemon/pulseaudio.desktop.in
++++ b/src/daemon/pulseaudio.desktop.in
+@@ -6,5 +6,6 @@ _Comment=Start the PulseAudio Sound System
+ Exec=start-pulseaudio-x11
+ Terminal=false
+ Type=Application
++NotShowIn=KDE;
+ Categories=
+ GenericName=
diff --git a/debian/patches/series b/debian/patches/series
index e777b97..ff02b5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch
 0002-CVE-2009-1299.patch
 0003-Re-bootstrap.patch
+0004-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
diff --git a/debian/pulseaudio.install b/debian/pulseaudio.install
index b925148..e954ce5 100644
--- a/debian/pulseaudio.install
+++ b/debian/pulseaudio.install
@@ -3,8 +3,10 @@ etc/pulse/system.pa
 etc/pulse/daemon.conf
 etc/dbus-1/system.d/pulseaudio-system.conf
 etc/xdg/autostart/pulseaudio.desktop
+etc/xdg/autostart/pulseaudio-kde.desktop
 usr/bin/pulseaudio
 usr/bin/start-pulseaudio-x11
+usr/bin/start-pulseaudio-kde
 usr/lib/pulse-*/modules/libalsa-util.so
 usr/lib/pulse-*/modules/libcli.so
 usr/lib/pulse-*/modules/libprotocol-cli.so
@@ -16,6 +18,7 @@ usr/lib/pulse-*/modules/module-alsa-sink.so
 usr/lib/pulse-*/modules/module-alsa-source.so
 usr/lib/pulse-*/modules/module-always-sink.so
 usr/lib/pulse-*/modules/module-console-kit.so
+usr/lib/pulse-*/modules/module-device-manager.so
 usr/lib/pulse-*/modules/module-device-restore.so
 usr/lib/pulse-*/modules/module-stream-restore.so
 usr/lib/pulse-*/modules/module-cli-protocol-tcp.so

commit 1b0d5c512dac47f5d8aac05f8044b918d53be0c1
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Jun 27 14:53:00 2010 +0100

    Close the whole list of merged bugs

diff --git a/debian/changelog b/debian/changelog
index 6244c6a..3a040f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ pulseaudio (0.9.21-2) UNRELEASED; urgency=low
   * Import NMU patches into git
   * debian/patches/0003-Re-bootstrap.patch
     + Added. Update configure so we don't have to re-run autotools when
-    building the package (Closes: #576457)
+    building the package (Closes: #576457, #576546, #576769)
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sun, 27 Jun 2010 13:40:56 +0100
 

-- 
pulseaudio packaging