[pulseaudio] 01/12: Merge remote-tracking branch 'origin/master' into ubuntu-pulse7-ppa
Luke Yelavich
themuso-guest at moszumanska.debian.org
Sun Nov 1 23:18:50 UTC 2015
This is an automated email from the git hooks/post-receive script.
themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.
commit e86f41026d7c06dc4c681ed17060d3855167183f
Merge: 26e7346 be72406
Author: Luke Yelavich <themuso at ubuntu.com>
Date: Mon Sep 21 11:03:36 2015 +1000
Merge remote-tracking branch 'origin/master' into ubuntu-pulse7-ppa
.tarball-version | 2 +-
.version | 2 +-
LICENSE | 3 +
Makefile.am | 4 +-
Makefile.in | 81 +-
NEWS | 48 +
aclocal.m4 | 122 +-
bootstrap.sh | 2 +-
build-aux/compile | 2 +-
build-aux/config.guess | 192 +-
build-aux/config.sub | 30 +-
build-aux/depcomp | 2 +-
build-aux/install-sh | 366 +-
build-aux/ltmain.sh | 4 +-
build-aux/missing | 2 +-
build-aux/test-driver | 15 +-
config.h.in | 3 +
configure | 182 +-
configure.ac | 30 +-
debian/changelog | 99 +-
debian/control | 5 +-
.../0001-Fix-test-suite-failure-on-Alpha.patch | 40 +
debian/patches/series | 2 +-
debian/pulseaudio-esound-compat.install | 1 +
debian/pulseaudio-esound-compat.manpages | 1 -
debian/pulseaudio-utils.install | 7 +
debian/pulseaudio-utils.manpages | 7 -
debian/pulseaudio.install | 33 +-
debian/pulseaudio.maintscript | 1 +
debian/pulseaudio.manpages | 5 -
debian/rules | 14 +-
debian/shlibs.local | 4 +-
doxygen/Makefile.in | 26 +-
man/Makefile.am | 19 +-
man/Makefile.in | 99 +-
man/pacat.1 | 4 +-
man/pacat.1.xml.in | 10 +-
man/paplay.1 | 46 -
man/paplay.1.xml.in | 125 -
man/pulse-cli-syntax.5 | 12 +-
man/pulse-cli-syntax.5.xml.in | 19 +-
man/pulse-daemon.conf.5 | 6 +-
man/pulse-daemon.conf.5.xml.in | 21 +-
man/pulseaudio.1 | 4 +-
man/pulseaudio.1.xml.in | 6 +-
po/LINGUAS | 2 +
po/it.po | 3875 +++++++++---------
po/ko.po | 3012 ++++++++++++++
po/oc.po | 4137 ++++++++++++++++++++
po/sk.po | 1239 +++---
po/tr.po | 1390 ++++---
po/uk.po | 1183 +++---
src/.gitignore | 1 +
src/Makefile.am | 27 +-
src/Makefile.in | 557 ++-
src/daemon/daemon-conf.c | 5 +-
src/daemon/daemon-conf.h | 1 +
src/daemon/daemon.conf.in | 3 +-
src/daemon/main.c | 15 +-
src/modules/alsa/alsa-mixer.c | 150 +-
src/modules/alsa/alsa-mixer.h | 10 +
src/modules/alsa/alsa-sink.c | 14 +-
src/modules/alsa/alsa-source.c | 14 +-
src/modules/alsa/alsa-ucm.c | 269 +-
src/modules/alsa/alsa-ucm.h | 19 +-
src/modules/alsa/alsa-util.c | 15 +
.../alsa/mixer/paths/analog-output-lineout.conf | 20 +
.../mixer/paths/analog-output-speaker-always.conf | 8 +
.../alsa/mixer/paths/analog-output-speaker.conf | 8 +
src/modules/alsa/mixer/profile-sets/default.conf | 13 +-
src/modules/alsa/module-alsa-card.c | 45 +-
src/modules/bluetooth/module-bluez4-discover.c | 8 +-
src/modules/bluetooth/module-bluez5-device.c | 2 +-
src/modules/dbus/iface-card.c | 69 +-
src/modules/dbus/iface-client.c | 34 +-
src/modules/dbus/iface-core.c | 653 +--
src/modules/dbus/iface-device.c | 121 +-
src/modules/dbus/iface-module.c | 41 +-
src/modules/dbus/iface-sample.c | 41 +-
src/modules/dbus/iface-stream.c | 179 +-
src/modules/dbus/module-dbus-protocol.c | 5 -
src/modules/echo-cancel/adrian-aec.c | 4 +
src/modules/echo-cancel/module-echo-cancel.c | 28 +-
src/modules/gconf/module-gconf.c | 14 +-
src/modules/macosx/module-coreaudio-device.c | 13 +-
src/modules/module-always-sink.c | 13 +-
src/modules/module-card-restore.c | 33 +-
src/modules/module-combine-sink.c | 108 +-
src/modules/module-detect.c | 2 +-
src/modules/module-device-manager.c | 8 +-
src/modules/module-device-restore.c | 55 +-
src/modules/module-equalizer-sink.c | 9 +-
src/modules/module-filter-apply.c | 56 +-
src/modules/module-filter-heuristics.c | 22 +-
src/modules/module-loopback.c | 2 +-
src/modules/module-rescue-streams.c | 5 +-
src/modules/module-stream-restore.c | 48 +-
src/modules/module-suspend-on-idle.c | 89 +-
src/modules/module-switch-on-connect.c | 12 +-
src/modules/module-switch-on-port-available.c | 44 +-
src/modules/module-tunnel.c | 26 +-
src/modules/module-virtual-surround-sink.c | 2 +-
src/modules/oss/module-oss.c | 2 +-
src/modules/udev-util.c | 11 +-
src/modules/xen/module-xenpv-sink.c | 7 +-
src/pulse/context.c | 11 +-
src/pulse/mainloop.h | 4 +-
src/pulse/pulseaudio.h | 33 +
src/pulse/stream.c | 18 +-
src/pulse/version.h | 4 +-
src/pulsecore/core-scache.c | 16 +-
src/pulsecore/core-util.c | 106 +-
src/pulsecore/core-util.h | 4 +
src/pulsecore/core.c | 1 +
src/pulsecore/core.h | 9 +
src/pulsecore/cpu-arm.c | 1 +
src/pulsecore/device-port.c | 14 +-
src/pulsecore/dynarray.c | 51 +-
src/pulsecore/dynarray.h | 25 +-
src/pulsecore/filter/biquad.c | 117 +
src/pulsecore/filter/biquad.h | 45 +
src/pulsecore/filter/crossover.c | 97 +
src/pulsecore/filter/crossover.h | 29 +
src/pulsecore/filter/lfe-filter.c | 198 +
src/pulsecore/filter/lfe-filter.h | 39 +
src/pulsecore/memblock.h | 5 +-
src/pulsecore/module.c | 24 +
src/pulsecore/module.h | 4 +
src/pulsecore/namereg.c | 2 +
src/pulsecore/packet.c | 55 +-
src/pulsecore/packet.h | 20 +-
src/pulsecore/pdispatch.c | 9 +-
src/pulsecore/protocol-native.c | 55 +-
src/pulsecore/pstream-util.c | 13 +-
src/pulsecore/pstream.c | 169 +-
src/pulsecore/resampler.c | 86 +-
src/pulsecore/resampler.h | 11 +
src/pulsecore/resampler/soxr.c | 167 +
src/pulsecore/rtpoll.c | 10 +-
src/pulsecore/rtpoll.h | 4 -
src/pulsecore/sink-input.c | 10 +-
src/pulsecore/sink.c | 13 +-
src/pulsecore/sink.h | 2 +
src/pulsecore/socket-server.c | 151 +-
src/pulsecore/socket-server.h | 1 -
src/pulsecore/socket.h | 13 +-
src/pulsecore/source-output.c | 4 +-
src/pulsecore/source.c | 13 +-
src/pulsecore/source.h | 2 +
src/pulsecore/tagstruct.c | 507 ++-
src/pulsecore/tagstruct.h | 4 +-
src/pulsecore/thread-mq.c | 32 +-
src/pulsecore/tokenizer.c | 3 -
src/pulsecore/winerrno.h | 89 +
src/tests/lfe-filter-test.c | 196 +
src/tests/remix-test.c | 3 +-
src/tests/resampler-test.c | 9 +-
src/tests/srbchannel-test.c | 21 +-
src/utils/pacat.c | 20 +-
src/utils/pacmd.c | 2 +-
src/utils/pactl.c | 36 +-
src/utils/padsp.c | 7 +-
162 files changed, 15991 insertions(+), 6109 deletions(-)
diff --cc debian/changelog
index 9842956,1efb871..7137292
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,134 -1,69 +1,231 @@@
- pulseaudio (1:6.0-0ubuntu11) UNRELEASED; urgency=medium
++pulseaudio 1:(6.99.1-2ubuntu1) UNRELEASED; urgency=medium
++
++ * Merge from Debian experimental, remaining changes:
++ - epoch (my stupid fault :S)
++ - 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
++ - Adjust gbp.conf file to point to the ubuntu branch for package builds
++ - Disable module-role-cork by default
++ - Load module-x11-bell in the start-pulseaudio-x11 script
++ - Hide pulseaudio from startup apps dialog
++ - Quit daemon if pid file is removed
++ - Avoid abort when poll descriptor is 0, such as when using it with the
++ audioflinger bridge, like done in ubuntu touch
++ - change default rlimit_rttime value to 200 ms
++ - Don't probe UCM profiles, trust that the profile writer knows what they
++ are doing
++ - Add card hook to allow modules to do something before a profile becomes
++ active
++ - Add an option to the bluez4 discovery module to set the profile
++ - Allow leaving bluetooth transport running while sink and source are
++ suspended.
++ - Add option to module-switch-on-connect to skip abstract devices
++ - Add property to module-device-restore to skip store/restore
++ - Add missing fields for sink_input/source_output info struct to the vala
++ bindings
++ - Add example upstart job to run pulseaudio in system mode
++ - Add a build/run autopkgtest for libpulse-dev
++
++ -- Luke Yelavich <themuso at ubuntu.com> Mon, 21 Sep 2015 11:01:11 +1000
++
+ pulseaudio (6.99.1-2) experimental; urgency=medium
+
+ * Fix test suite failure on alpha. Patch from Michael Cree.
+ Closes: #798248
+
+ -- Felipe Sateler <fsateler at debian.org> Thu, 10 Sep 2015 20:44:53 -0300
+
+ pulseaudio (6.99.1-1) experimental; urgency=medium
+
+ * New upstream release candidate
+ - Drop 0001-core-util-pactl-Make-one-localised-and-one-non-
+ local.patch, was picked from upstream
+ * Change the bash completion install dir to /usr/share
+
+ -- Felipe Sateler <fsateler at debian.org> Thu, 03 Sep 2015 23:29:12 -0300
+
+ pulseaudio (6.0-5) unstable; urgency=medium
+
+ * Module udev detect is linux-only, so don't install on !linux.
+
+ -- Felipe Sateler <fsateler at debian.org> Mon, 03 Aug 2015 14:29:09 -0300
+
+ pulseaudio (6.0-4) unstable; urgency=medium
+
+ * Specify systemd user unit dir explicitly.
+ The pkgconfig file lives in package systemd, which we don't want to
+ build-depend on.
+
+ -- Felipe Sateler <fsateler at debian.org> Mon, 03 Aug 2015 10:17:23 -0300
+
+ pulseaudio (6.0-3) unstable; urgency=medium
+
+ * Do not build bluez4 module, it is no longer available.
+ Closes: #788293
+ * Pass --disable-hal-compat to configure instead of building a module we do
+ not install
+ * Use dh-exec instead of manual .install mangling
+ * Do not use dh_installman to install manpages, upstream already installs
+ them correctly.
+ * libpulse-dev: drop Depends on libavahi-client-dev
+ * debian/rules: use DEB_DH_INSTALL_SOURCEDIR instead of deprecated DEB_DH_INSTALL_ARGS
+ * Install (but not enable) systemd user units on linux archs.
+ Closes: #794226
+
+ -- Felipe Sateler <fsateler at debian.org> Fri, 31 Jul 2015 19:53:59 -0300
+
+ pulseaudio (6.0-2) unstable; urgency=medium
+
+ * Pick upstream patch that creates a localised version of pa_yes_no
+ - This fixes a problem when that function was used to create module
+ loading arguments.
+ * Upload to unstable
+
+ -- Felipe Sateler <fsateler at debian.org> Mon, 27 Apr 2015 11:17:20 -0300
+
+ pulseaudio (6.0-1) experimental; urgency=medium
+
+ [ Luke Yelavich ]
+ * New upstream release
+ * Remove pulseaudio-kde autostart file on upgrade (Closes: #776331)
+
+ [ Felipe Sateler ]
+ * Upload to experimental
+
+ -- Felipe Sateler <fsateler at debian.org> Fri, 13 Mar 2015 22:45:13 -0300
+
++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
+
+pulseaudio (1:6.0-0ubuntu10~gcc5.3) wily; urgency=medium
+
+ * debian/rules: don't disable bluez5
+
+ -- Sebastien Bacher <seb128 at ubuntu.com> Thu, 13 Aug 2015 17:34:42 +0200
+
+pulseaudio (1:6.0-0ubuntu10~gcc5.2) wily; urgency=medium
+
+ * No-change rebuild against libjack-jackd2-0v5
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Tue, 11 Aug 2015 07:01:56 +0000
+
+pulseaudio (1:6.0-0ubuntu10~gcc5.1) wily; urgency=medium
+
+ * No-change test rebuild for g++5 ABI transition
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Wed, 15 Jul 2015 15:57:11 +0000
+
+pulseaudio (1:6.0-0ubuntu9) wily; urgency=medium
+
+ * 0312-lfe-filter-test-Use-S16NE-format.patch:
+ Fix build failure on powerpc
+
+ -- David Henningsson <david.henningsson at canonical.com> Thu, 28 May 2015 11:02:48 +0200
+
+pulseaudio (1:6.0-0ubuntu8) wily; urgency=medium
+
+ * 0311-tests-add-tolerant-variation-for-comparing-the-rewin.patch:
+ Fix build failure on i386
+
+ -- David Henningsson <david.henningsson at canonical.com> Mon, 25 May 2015 14:45:41 +0200
+
+pulseaudio (1:6.0-0ubuntu7) wily; urgency=medium
+
+ * debian/patches/0300-lfe-filter-Import-code-from-the-Chrome-OS-audio-serv.patch
+ * debian/patches/0301-lfe-filter-Enable-LFE-filter-in-the-resampler.patch
+ * debian/patches/0302-lfe-filter-Cleanup-and-refactor.patch
+ * debian/patches/0303-lfe-filter-change-the-crossover-frequency-as-a-param.patch
+ * debian/patches/0304-memblock-Change-pa_memblock_new_malloced-to-an-inlin.patch
+ * debian/patches/0305-lfe-filter-Add-rewind-support.patch
+ * debian/patches/0306-resampler-Make-some-basic-functions-for-rewinding.patch
+ * debian/patches/0307-tests-adding-lfe-filter-test.patch
+ * debian/patches/0308-daemon-conf-enable-the-lfe-remixing-by-default.patch
+ * debian/patches/0309-resampler-Allow-disabling-the-LFE-filter-by-setting-.patch
+ * debian/patches/0310-resampler-Rename-lfe_filter_required-to-lfe_remixed.patch
+ - Add lfe filter patches
+ (LP: #1286021)
+
+ -- Hui Wang <hui.wang at canonical.com> Wed, 13 May 2015 15:06:28 +0800
+
+pulseaudio (1:6.0-0ubuntu6) vivid; urgency=medium
+
+ * debian/patches/0099-pa-yes-no.patch:
+ - Fix pulseaudio failure to load in some non-English
+ locales (LP: #1445358)
+
+ -- David Henningsson <david.henningsson at canonical.com> Mon, 20 Apr 2015 16:19:10 +0200
+
+pulseaudio (1:6.0-0ubuntu5) vivid; urgency=medium
+
+ * debian/patches/0211-corking-a-sink-input-stream-when-stalled.patch:
+ - Identifying and corking a sink-input stream when it gets stalled
+ (LP: #1391230)
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com> Tue, 07 Apr 2015 00:40:56 -0300
+
+pulseaudio (1:6.0-0ubuntu4) vivid; urgency=medium
+
+ * Move the previously tweaked volume config changes from the rules file
+ to a patch. We are no longer tweaking settings based on architecture,
+ so such config changes can now be aplied statically. These settings
+ were also not being applied since the merge with Debian and updating to
+ pulse 6. (LP: #1424195)
+
+ -- Luke Yelavich <themuso at ubuntu.com> Mon, 23 Feb 2015 10:03:37 +1100
+
+pulseaudio (1:6.0-0ubuntu3) vivid; urgency=medium
+
+ * Adding libwebrtc-audio-processing-dev as build dep again, now in main
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com> Wed, 18 Feb 2015 20:42:43 -0200
+
+pulseaudio (1:6.0-0ubuntu2) vivid; urgency=medium
+
+ * Remove libwebrtc-audio-processing-dev build dep, its in universe
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com> Wed, 18 Feb 2015 10:58:54 -0200
+
+pulseaudio (1:6.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+ * Remove pulseaudio-kde autostart file on upgrade (Closes: #776331)
+ * Merge from Debian experimental, remaining changes:
+ - epoch (my stupid fault :S)
+ - 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
+ - Adjust gbp.conf file to point to the ubuntu branch for package builds
+ - Disable module-role-cork by default
+ - Load module-x11-bell in the start-pulseaudio-x11 script
+ - Hide pulseaudio from startup apps dialog
+ - Quit daemon if pid file is removed
+ - Avoid abort when poll descriptor is 0, such as when using it with the
+ audioflinger bridge, like done in ubuntu touch
+ - change default rlimit_rttime value to 200 ms
+ - Don't probe UCM profiles, trust that the profile writer knows what they
+ are doing
+ - Add card hook to allow modules to do something before a profile becomes
+ active
+ - Add an option to the bluez4 discovery module to set the profile
+ - Allow leaving bluetooth transport running while sink and source are
+ suspended.
+ - Add option to module-switch-on-connect to skip abstract devices
+ - Add property to module-device-restore to skip store/restore
+ - Add missing fields for sink_input/source_output info struct to the vala
+ bindings
+ - Add example upstart job to run pulseaudio in system mode
+ - Add a build/run autopkgtest for libpulse-dev
+ * Refreshed patches, and dropped patches that were either applied upstream
+ or are obsolete
+ * Build with bluez4 support, and explicitly disable bluez5
+
+ -- Luke Yelavich <themuso at ubuntu.com> Wed, 18 Feb 2015 17:00:14 +1100
+
pulseaudio (5.99.2-2) experimental; urgency=medium
* Let configure guess if systemd is available. Closes: #773879
diff --cc debian/control
index 8651669,d3539ac..b14027d
--- a/debian/control
+++ b/debian/control
@@@ -12,8 -11,8 +12,9 @@@ Build-Depends: debhelper (>= 9)
cdbs (>= 0.4.93),
check,
dh-autoreconf,
+ dh-exec,
intltool,
+ libapparmor-dev [linux-any],
libasound2-dev (>= 1.0.24) [linux-any],
libasyncns-dev,
libatomic-ops-dev,
diff --cc debian/patches/series
index bca3162,389856c..6b5c50c
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,43 -1,1 +1,43 @@@
+# Ubuntu/Debian specific config/fixes
+ 0001-Fix-test-suite-failure-on-Alpha.patch
+0001-volume-config-changes.patch
+0005-dont-load-cork-music-on-phone.patch
+0006-load-module-x11-bell.patch
+0016-nodisplay-autostart.patch
+0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch
+0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch
+0099-pa_yes_no.patch
+
+# Ubuntu touch stuff
+0202-dont-probe-ucm.patch
+0203-card-Add-hook-before-profile-changes.patch
+0206-module-bluetooth-discover-adding-module-option-profi.patch
+0207-Enable-pulseaudio-droid.patch
+0208-module-bluetooth-device-Allow-leaving-transport-runn.patch
+0209-module-switch-on-connect-adding-parameter-to-allow-s.patch
+0210-module-device-restore-adding-property-to-skip.patch
+0211-corking-a-sink-input-stream-when-stalled.patch
+
+# add lfe filter patchset
+0300-lfe-filter-Import-code-from-the-Chrome-OS-audio-serv.patch
+0301-lfe-filter-Enable-LFE-filter-in-the-resampler.patch
+0302-lfe-filter-Cleanup-and-refactor.patch
+0303-lfe-filter-change-the-crossover-frequency-as-a-param.patch
+0304-memblock-Change-pa_memblock_new_malloced-to-an-inlin.patch
+0305-lfe-filter-Add-rewind-support.patch
+0306-resampler-Make-some-basic-functions-for-rewinding.patch
+0307-tests-adding-lfe-filter-test.patch
+0308-daemon-conf-enable-the-lfe-remixing-by-default.patch
+0309-resampler-Allow-disabling-the-LFE-filter-by-setting-.patch
+0310-resampler-Rename-lfe_filter_required-to-lfe_remixed.patch
+0311-tests-add-tolerant-variation-for-comparing-the-rewin.patch
+0312-lfe-filter-test-Use-S16NE-format.patch
+
+# Ubuntu touch: support for trust-store
+0406-tagstruct-add-copy-method.patch
+0407-access-Add-access-control-hooks.patch
+0408-protocol-native-add-access-checks.patch
+0409-Trust-store-patch.patch
+0410-Add-thread-to-activate-trust-store-interface.patch
+0415-dynarray-Add-PA_DYNARRAY_FOREACH.patch
+0417-increase-timeout-check-apparmor.patch
-
diff --cc debian/pulseaudio.install
index 17b0dd3,1924987..8775524
mode 100644,100755..100755
--- a/debian/pulseaudio.install
+++ b/debian/pulseaudio.install
@@@ -13,9 -16,10 +16,9 @@@ usr/lib/pulse-*/modules/libprotocol-nat
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
+ [linux-any] usr/lib/pulse-*/modules/module-alsa-sink.so
+ [linux-any] usr/lib/pulse-*/modules/module-alsa-source.so
usr/lib/pulse-*/modules/module-always-sink.so
-usr/lib/pulse-*/modules/module-console-kit.so
usr/lib/pulse-*/modules/module-device-restore.so
usr/lib/pulse-*/modules/module-echo-cancel.so
usr/lib/pulse-*/modules/module-stream-restore.so
diff --cc debian/pulseaudio.maintscript
index 7efb7b3,659deed..ccd8698
--- a/debian/pulseaudio.maintscript
+++ b/debian/pulseaudio.maintscript
@@@ -1,4 -1,5 +1,5 @@@
rm_conffile /etc/default/pulseaudio 5.0-3~
rm_conffile /etc/init.d/pulseaudio 5.0-3~
-rm_conffile /etc/xdg/autostart/pulseaudio-kde.desktop 6.0-1~
+rm_conffile /etc/xdg/autostart/pulseaudio-kde.desktop 1:6.0-0ubuntu1~vivid1~
mv_conffile /etc/bash_completion.d/pulseaudio-bash-completion.sh /etc/bash_completion.d/pulseaudio 5.99.1-2~
+ rm_conffile /etc/bash_completion.d/pulseaudio 6.99.1-1~
diff --cc debian/rules
index 763b9bd,982268d..20b1b84
--- a/debian/rules
+++ b/debian/rules
@@@ -18,15 -18,6 +18,18 @@@ ifeq ($(words $(sort $(filter stage1,$(
DEB_CONFIGURE_EXTRA_FLAGS += --disable-bluez
endif
++<<<<<<< HEAD
+common-build-arch::
+ grep -v -e alsa -e evdev -e udev -e share/pulseaudio -e systemd \
+ debian/pulseaudio.install > debian/pulseaudio.install.kfreebsd-i386
+ grep -v -e alsa -e evdev -e udev -e share/pulseaudio -e systemd \
+ debian/pulseaudio.install > debian/pulseaudio.install.kfreebsd-amd64
+ grep -v -e alsa -e evdev -e udev -e share/pulseaudio -e systemd \
+ debian/pulseaudio.install > debian/pulseaudio.install.hurd-i386
+ dh_translations
+
++=======
++>>>>>>> origin/master
common-install-arch::
find $(DEB_DESTDIR) -name "*.la" -delete
mkdir -p $(CURDIR)/debian/tmp/usr/share/alsa/alsa.conf.d
@@@ -39,21 -29,17 +41,27 @@@
common-binary-post-install-arch:: list-missing
++<<<<<<< HEAD
+clean::
+ rm -f debian/pulseaudio.install.kfreebsd-i386
+ rm -f debian/pulseaudio.install.kfreebsd-amd64
+ rm -f debian/pulseaudio.install.hurd-i386
+ if test -f $(CURDIR)/debian/daemon.conf.in; then \
+ mv $(CURDIR)/debian/daemon.conf.in $(CURDIR)/src/daemon/daemon.conf.in; \
+ fi
+
++=======
++>>>>>>> origin/master
# Libs should be in the multi-arch path, but the modules should be in the
# normal directory as pulseaudio is foreign
- DEB_CONFIGURE_EXTRA_FLAGS = --enable-x11 \
+ DEB_CONFIGURE_EXTRA_FLAGS = --enable-x11 --disable-hal-compat \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--with-module-dir=\$${prefix}/lib/pulse-$(DEB_UPSTREAM_VERSION)/modules \
--with-zsh-completion-dir=\$${datadir}/zsh/vendor-completions \
+ --with-bash-completion-dir=\$${datadir}/bash-completion/completions \
+ --with-systemduserunitdir=\$${prefix}/lib/systemd/user \
+ --disable-bluez4
-
ifeq ($(words $(sort $(filter stage1,$(DEB_BUILD_PROFILES)))),1)
DEB_CONFIGURE_EXTRA_FLAGS += --disable-bluez
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git
More information about the pkg-pulseaudio-devel
mailing list