[pulseaudio] 01/01: Build with webrtc, because it is now in main. (LP: #1261666)

[David Henningsson]

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

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

commit 56ad4b80831070ac1e1e9fb0311ae01a4b8a7261
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Mon Dec 8 13:39:09 2014 +0100

    Build with webrtc, because it is now in main. (LP: #1261666)
    
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>
---
 debian/changelog          | 1 -
 debian/control            | 1 +
 debian/pulseaudio.install | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 566ab43..7ea634f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ pulseaudio (1:5.99.1-2ubuntu1~vivid1) UNRELEASED; urgency=medium
 
   * Merge from Debian experimental, remaining changes:
     - epoch (my stupid fault :S)
-    - Remove libwebrtc-audio-processing-dev build dep, its in universe
     - Don't ship the consolekit module, and explicitly depend on the PAM
       systemd module
     - Add a module to allow pulseaudio to use the Android audio HAL
diff --git a/debian/control b/debian/control
index e4b1574..d9ff1e0 100644
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,7 @@ Build-Depends: debhelper (>= 9),
     libsystemd-journal-dev [linux-any],
     libtdb-dev [!hurd-any],
     libudev-dev (>= 143) [linux-any],
+    libwebrtc-audio-processing-dev,
     libwrap0-dev,
     libx11-xcb-dev,
     libxcb1-dev (>= 1.6),
diff --git a/debian/pulseaudio.install b/debian/pulseaudio.install
index 81830d8..17b0dd3 100644
--- a/debian/pulseaudio.install
+++ b/debian/pulseaudio.install
@@ -12,6 +12,7 @@ usr/lib/pulse-*/modules/libprotocol-http.so
 usr/lib/pulse-*/modules/libprotocol-native.so
 usr/lib/pulse-*/modules/libprotocol-simple.so
 usr/lib/pulse-*/modules/librtp.so
+usr/lib/pulse-*/modules/libwebrtc-util.so
 usr/lib/pulse-*/modules/module-alsa-sink.so
 usr/lib/pulse-*/modules/module-alsa-source.so
 usr/lib/pulse-*/modules/module-always-sink.so

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