[pulseaudio] 01/01: Sync with wily archive

[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 1548c78480f35d12398e1b12331a82d0e39d408a
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Tue Oct 13 10:06:42 2015 +1100

    Sync with wily archive
---
 debian/changelog | 11 +++++++++--
 debian/rules     |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9842956..a14ba8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
-pulseaudio (1:6.0-0ubuntu11) UNRELEASED; urgency=medium
+pulseaudio (1:6.0-0ubuntu12) wily; urgency=medium
+
+  * debian/rules: disable bluez4 support, it's not useful and leads to
+    syslog warnings
+
+ -- Sebastien Bacher <seb128 at ubuntu.com>  Tue, 22 Sep 2015 18:19:45 +0200
+
+pulseaudio (1:6.0-0ubuntu11) wily; urgency=medium
 
   * debian/patches/04*:
     Add support for trust-store in Ubuntu touch
 
- -- David Henningsson <david.henningsson at canonical.com>  Wed, 02 Sep 2015 10:00:30 +0200
+ -- David Henningsson <david.henningsson at canonical.com>  Wed, 02 Sep 2015 10:33:41 +0200
 
 pulseaudio (1:6.0-0ubuntu10~gcc5.3) wily; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 763b9bd..c99a9b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,7 @@ DEB_CONFIGURE_EXTRA_FLAGS = --enable-x11 \
   --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
   --with-module-dir=\$${prefix}/lib/pulse-$(DEB_UPSTREAM_VERSION)/modules \
   --with-zsh-completion-dir=\$${datadir}/zsh/vendor-completions \
+  --disable-bluez4 \
 
 ifeq ($(words $(sort $(filter stage1,$(DEB_BUILD_PROFILES)))),1)
   DEB_CONFIGURE_EXTRA_FLAGS += --disable-bluez

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