[pulseaudio] 02/05: Disable systemd socket activation for now

[Felipe Sateler]

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

fsateler pushed a commit to branch debian/experimental
in repository pulseaudio.

commit 4512260c05e604951f03eebdd94a444e023deaf4
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Thu Nov 27 08:36:19 2014 +1100

    Disable systemd socket activation for now
    
    Conflicts:
    	debian/changelog
---
 debian/changelog | 1 +
 debian/rules     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d4465c5..59948cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ pulseaudio (5.99.1-1) UNRELEASED; urgency=medium
     pulseaudio.install to match
   * Update shlibs
   * Update symbols
+  * Disable systemd socket activation for now
 
  -- Luke Yelavich <themuso at ubuntu.com>  Tue, 25 Nov 2014 09:39:16 +1100
 
diff --git a/debian/rules b/debian/rules
index c834d4d..dd883e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,8 @@ clean::
 # 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