[pulseaudio] 01/01: Upload bell.ogg sample via pactl for module-x11-bell

[Luke Yelavich]

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

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit eab54909295a9141f982929971f7052890b20f66
Author: Michael Terry <mterry at ubuntu.com>
Date:   Wed Mar 29 14:24:19 2017 -0400

    Upload bell.ogg sample via pactl for module-x11-bell
    
    Upload bell.ogg sample via pactl for module-x11-bell.  Original patch y Daniel
    Hahler.
---
 debian/changelog                               | 11 +++++++++++
 debian/control                                 |  2 +-
 debian/patches/0006-load-module-x11-bell.patch |  9 +++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6ca239c..389a1dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+pulseaudio (1:10.0-1ubuntu2) zesty; urgency=medium
+
+  * debian/patches/0006-load-module-x11-bell.patch:
+    - Upload bell.ogg sample via pactl for module-x11-bell.  Original patch
+      by Daniel Hahler. (LP: #769314)
+  * debian/control:
+    - Add ubuntu-sounds to Suggests list, since it ships the sound used by
+      default in above patch now.
+
+ -- Michael Terry <mterry at ubuntu.com>  Wed, 29 Mar 2017 14:24:19 -0400
+
 pulseaudio (1:10.0-1ubuntu1) zesty; urgency=medium
 
   * Merge with Debian experimental:
diff --git a/debian/control b/debian/control
index 870f7ed..607e15f 100644
--- a/debian/control
+++ b/debian/control
@@ -64,7 +64,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, adduser,
 Conflicts: pulseaudio-module-udev (<< 1:9.0-2), pulseaudio-module-x11 (<< 1:9.0-2)
 Replaces: pulseaudio-module-udev (<< 1:9.0-2), pulseaudio-module-x11 (<< 1:9.0-2)
 Recommends: rtkit
-Suggests: udev [linux-any], pavumeter, pavucontrol, paman, paprefs
+Suggests: udev [linux-any], pavumeter, pavucontrol, paman, paprefs, ubuntu-sounds
 Description: PulseAudio sound server
  PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
  WIN32 systems. It is a drop in replacement for the ESD sound server with
diff --git a/debian/patches/0006-load-module-x11-bell.patch b/debian/patches/0006-load-module-x11-bell.patch
index 5b070a3..79fee9b 100644
--- a/debian/patches/0006-load-module-x11-bell.patch
+++ b/debian/patches/0006-load-module-x11-bell.patch
@@ -1,12 +1,13 @@
-Index: pulseaudio/src/daemon/start-pulseaudio-x11.in
+Index: pulseaudio-10.0/src/daemon/start-pulseaudio-x11.in
 ===================================================================
---- pulseaudio.orig/src/daemon/start-pulseaudio-x11.in
-+++ pulseaudio/src/daemon/start-pulseaudio-x11.in
-@@ -20,6 +20,7 @@ set -e
+--- pulseaudio-10.0.orig/src/daemon/start-pulseaudio-x11.in
++++ pulseaudio-10.0/src/daemon/start-pulseaudio-x11.in
+@@ -20,6 +20,8 @@ set -e
  if [ x"$DISPLAY" != x ] ; then
  
      @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null
 +    @PACTL_BINARY@ load-module module-x11-bell "display=$DISPLAY" "sample=bell.ogg" > /dev/null
++    @PACTL_BINARY@ upload-sample /usr/share/sounds/ubuntu/stereo/bell.ogg bell.ogg > /dev/null
      @PACTL_BINARY@ load-module module-x11-cork-request "display=$DISPLAY" > /dev/null
  
      if [ x"$KDE_FULL_SESSION" = x"true" ]; then

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