[pulseaudio] 19/19: Disable systemd socket activation for now

[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 8209b8373107e7999192ec206c05ce4cdfec6896
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Thu Nov 27 08:36:19 2014 +1100

    Disable systemd socket activation for now
---
 debian/changelog | 3 ++-
 debian/rules     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b72ad88..e26bd27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pulseaudio (1:5.99.1-0ubuntu1~vivid1) UNRELEASED; urgency=medium
+pulseaudio (1:5.99.1-0ubuntu1~vivid2) UNRELEASED; urgency=medium
 
   * Merge from Debian unstable, remaining changes:
     - epoch (my stupid fault :S)
@@ -53,6 +53,7 @@ pulseaudio (1:5.99.1-0ubuntu1~vivid1) UNRELEASED; urgency=medium
   * Update symbols
   * Refreshed patches, and dropped patches that were either applied upstream
     or are obsolete
+  * Disable systemd socket activation for now
 
  -- Luke Yelavich <themuso at ubuntu.com>  Wed, 19 Nov 2014 11:21:32 +1100
 
diff --git a/debian/rules b/debian/rules
index b025014..1dee76a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,7 +61,8 @@ debian/stamp-post-patches:
 # normal directory as pulseaudio is foreign
 DEB_CONFIGURE_EXTRA_FLAGS = --enable-x11 \
   --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
-  --with-module-dir=\$${prefix}/lib/pulse-$(DEB_UPSTREAM_VERSION)/modules
+  --with-module-dir=\$${prefix}/lib/pulse-$(DEB_UPSTREAM_VERSION)/modules \
+  --disable-systemd-daemon
 
 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