[pulseaudio] 01/05: Merge tag 'debian/9.99.1-1' into ubuntu-pulse10-ppa

Luke Yelavich themuso-guest at moszumanska.debian.org
Mon Jan 23 23:46:23 UTC 2017


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

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

commit 477415bac9ded0e791148388d97eb0e66fad314d
Merge: e2acae5 b7dff65
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Fri Jan 6 09:08:28 2017 +1100

    Merge tag 'debian/9.99.1-1' into ubuntu-pulse10-ppa
    
    pulseaudio Debian release 9.99.1-1

 .tarball-version                                   |    2 +-
 .version                                           |    2 +-
 LICENSE                                            |    8 +-
 Makefile.in                                        |    8 +-
 PROTOCOL                                           |   12 +
 aclocal.m4                                         |  211 +-
 build-aux/config.guess                             |  165 +-
 build-aux/config.sub                               |   56 +-
 build-aux/install-sh                               |   23 +-
 build-aux/ltmain.sh                                | 5511 +++++++++++++-------
 config.h.in                                        |    3 +-
 configure                                          | 3831 +++++++-------
 configure.ac                                       |   43 +-
 debian/changelog                                   |   44 +
 debian/gbp.conf                                    |    2 +-
 .../Fix-detection-of-online-CPUs-in-pa_ncpus.patch |   38 -
 ...raop-add-compatibility-with-openssl-1.1.0.patch |   59 -
 debian/patches/series                              |    3 -
 debian/pulseaudio.install                          |    1 +
 debian/rules                                       |    4 +-
 debian/shlibs.local.in                             |    4 +-
 doxygen/Makefile.in                                |    6 +-
 m4/libtool.m4                                      | 2583 +++++----
 m4/ltoptions.m4                                    |  127 +-
 m4/ltsugar.m4                                      |    7 +-
 m4/ltversion.m4                                    |   12 +-
 m4/lt~obsolete.m4                                  |    7 +-
 man/Makefile.in                                    |    6 +-
 man/default.pa.5                                   |    6 +-
 man/pax11publish.1                                 |    2 +-
 man/pulse-cli-syntax.5                             |    4 +-
 man/pulse-client.conf.5                            |    6 +-
 man/pulse-daemon.conf.5                            |   10 +-
 man/pulse-daemon.conf.5.xml.in                     |    2 +-
 man/pulseaudio.1                                   |    6 +-
 po/LINGUAS                                         |    2 +
 po/POTFILES.in                                     |    1 +
 po/{pl.po => be.po}                                | 1742 +++----
 po/de.po                                           | 4960 +++++++++---------
 po/{de.po => gl.po}                                | 2142 ++++----
 po/hu.po                                           |  570 +-
 po/ko.po                                           |    4 +-
 po/oc.po                                           | 2551 +++------
 po/pl.po                                           |  505 +-
 po/sk.po                                           |  413 +-
 src/.gitignore                                     |    2 +
 src/Makefile.am                                    |   53 +-
 src/Makefile.in                                    |  467 +-
 src/daemon/daemon-conf.c                           |    2 +-
 src/daemon/daemon.conf.in                          |    1 +
 src/daemon/main.c                                  |   19 +-
 src/daemon/systemd/user/pulseaudio.service.in      |   14 +
 src/module-allow-passthrough-symdef.h              |   29 +
 src/module-xenpv-sink-symdef.h                     |   29 -
 src/modules/alsa/alsa-mixer.c                      |    1 +
 src/modules/alsa/alsa-sink.c                       |   15 +-
 src/modules/alsa/alsa-source.c                     |   15 +-
 src/modules/alsa/alsa-ucm.c                        |   37 +-
 src/modules/alsa/alsa-ucm.h                        |    1 -
 src/modules/alsa/alsa-util.c                       |   16 +-
 src/modules/alsa/module-alsa-card.c                |   65 +-
 src/modules/bluetooth/backend-native.c             |   12 +-
 src/modules/bluetooth/bluez4-util.c                |  135 +-
 src/modules/bluetooth/bluez4-util.h                |   34 +-
 src/modules/bluetooth/bluez5-util.c                |  125 +-
 src/modules/bluetooth/bluez5-util.h                |    4 +-
 src/modules/bluetooth/module-bluetooth-policy.c    |  215 +-
 src/modules/bluetooth/module-bluez4-device.c       |  194 +-
 src/modules/bluetooth/module-bluez4-discover.c     |    6 +-
 src/modules/bluetooth/module-bluez5-device.c       |  100 +-
 src/modules/echo-cancel/module-echo-cancel.c       |    5 +
 src/modules/echo-cancel/webrtc.cc                  |    4 +-
 src/modules/jack/module-jack-sink.c                |   10 +-
 src/modules/jack/module-jack-source.c              |   11 +-
 src/modules/macosx/module-coreaudio-device.c       |   18 +-
 src/modules/module-allow-passthrough.c             |  312 ++
 src/modules/module-card-restore.c                  |   68 +-
 src/modules/module-combine-sink.c                  |   28 +-
 src/modules/module-esound-sink.c                   |    7 +-
 src/modules/module-ladspa-sink.c                   |    7 +-
 src/modules/module-loopback.c                      |  173 +-
 src/modules/module-null-sink.c                     |    6 +-
 src/modules/module-null-source.c                   |    6 +-
 src/modules/module-pipe-sink.c                     |   11 +-
 src/modules/module-pipe-source.c                   |    6 +-
 src/modules/module-sine-source.c                   |    6 +-
 src/modules/module-solaris.c                       |    6 +-
 src/modules/module-suspend-on-idle.c               |   34 +-
 src/modules/module-tunnel-sink-new.c               |    6 +-
 src/modules/module-tunnel-source-new.c             |    6 +-
 src/modules/module-tunnel.c                        |    6 +-
 src/modules/module-waveout.c                       |    6 +-
 src/modules/module-zeroconf-discover.c             |   12 +-
 src/modules/module-zeroconf-publish.c              |   96 +-
 src/modules/oss/module-oss.c                       |    7 +-
 src/modules/raop/base64.c                          |    2 +-
 src/modules/raop/base64.h                          |    4 +-
 src/modules/raop/module-raop-sink.c                |    7 +-
 src/modules/raop/raop_client.c                     |   22 +-
 src/modules/rtp/rtp.c                              |   66 +-
 src/modules/rtp/rtp.h                              |    2 +
 src/modules/stream-interaction.c                   |   13 +-
 src/modules/xen/gntalloc.h                         |   88 -
 src/modules/xen/gntdev.h                           |  156 -
 src/modules/xen/module-xenpv-sink.c                |  798 ---
 src/pulse/context.c                                |   14 +-
 src/pulse/format.c                                 |  226 +-
 src/pulse/internal.h                               |    6 +
 src/pulse/json.c                                   |  614 +++
 src/pulse/json.h                                   |   53 +
 src/pulse/sample.c                                 |   11 +-
 src/pulse/stream.c                                 |   15 +-
 src/pulse/version.h                                |    6 +-
 src/pulsecore/asyncmsgq.c                          |    7 +-
 src/pulsecore/atomic.h                             |    2 +-
 src/pulsecore/card.c                               |  114 +-
 src/pulsecore/card.h                               |   14 +-
 src/pulsecore/core-util.c                          |   57 +-
 src/pulsecore/core-util.h                          |   17 +
 src/pulsecore/core.h                               |    1 +
 src/pulsecore/device-port.c                        |    7 +-
 src/pulsecore/device-port.h                        |    3 +
 src/pulsecore/filter/LICENSE.WEBKIT                |   27 +
 src/pulsecore/iochannel.c                          |    4 +-
 src/pulsecore/macro.h                              |   25 +-
 src/pulsecore/memblock.c                           |    5 +-
 src/pulsecore/memblockq.c                          |   16 +-
 src/pulsecore/memblockq.h                          |    5 +-
 src/pulsecore/modargs.c                            |   54 +-
 src/pulsecore/modargs.h                            |   27 +-
 src/pulsecore/module.c                             |   16 +-
 src/pulsecore/protocol-native.c                    |  290 +-
 src/pulsecore/pstream.c                            |   35 +-
 src/pulsecore/sample-util.c                        |    2 +-
 src/pulsecore/shm.c                                |   17 +-
 src/pulsecore/sink-input.c                         |   50 +-
 src/pulsecore/sink-input.h                         |   25 +
 src/pulsecore/sink.c                               |   73 +-
 src/pulsecore/sink.h                               |   19 +-
 src/pulsecore/source-output.c                      |   51 +-
 src/pulsecore/source-output.h                      |   25 +
 src/pulsecore/source.c                             |   57 +-
 src/pulsecore/source.h                             |   16 +-
 src/pulsecore/thread-mq.c                          |   40 +-
 src/pulsecore/thread-mq.h                          |    4 +-
 src/tests/alsa-time-test.c                         |    1 +
 src/tests/core-util-test.c                         |  284 +
 src/tests/cpu-mix-test.c                           |    2 +-
 src/tests/cpu-remap-test.c                         |    4 +-
 src/tests/cpu-volume-test.c                        |    2 +-
 src/tests/interpol-test.c                          |    2 +-
 src/tests/json-test.c                              |  280 +
 src/tests/lfe-filter-test.c                        |    4 +-
 src/tests/lo-test-util.c                           |   20 +-
 src/tests/memblockq-test.c                         |  487 +-
 src/tests/mix-test.c                               |    2 +-
 src/tests/remix-test.c                             |    2 +-
 src/tests/rtpoll-test.c                            |    4 +-
 src/tests/sigbus-test.c                            |   13 +-
 src/tests/stripnul.c                               |    5 +-
 src/tests/utf8-test.c                              |    6 +-
 src/utils/pacat.c                                  |   97 +-
 src/utils/padsp.c                                  |   11 +-
 src/utils/qpaeq                                    |    8 +-
 164 files changed, 17660 insertions(+), 14934 deletions(-)

diff --cc debian/changelog
index 957248f,6402c10..f09d09e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,52 -1,13 +1,96 @@@
++pulseaudio (1:9.99.1-1ubuntu1~zesty1) UNRELEASED; urgency=medium
++
++  * Merge with Debian experimental:
++    - epoch (my stupid fault :S)
++    - 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 bluez 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 a build/run autopkgtest for libpulse-dev
++    - Drop libsoxr-dev build dep, its in universe
++    - Add support for the trust-store
++    - Add snappy support, preventing snap apps from recording audio, full
++      support via trust-store is planned
++    - Add epoch to conflicts/replaces
++    - Use liblirc-dev instead of liblircclient-dev
++
++ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 06 Jan 2017 09:05:55 +1100
++
+ pulseaudio (9.99.1-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+     - Drop all patches, applied upstream
+     - Install new allow-passthrough module
+   * shlibs.local: only the major and minor version
+     elements are used for the internal library SONAMEs
+ 
+  -- Felipe Sateler <fsateler at debian.org>  Wed, 04 Jan 2017 15:43:30 -0300
+ 
 +pulseaudio (1:9.0-5ubuntu3) zesty; urgency=medium
 +
 +  * Re-add pulseaudio equalizer package, my understanding on build deps with
 +    main/universe wasn't quite correct, and I only dropped it to get the
 +    package through proposed, so a demotion of the equalizer package to
 +    universe is the better solution
 +
 + -- Luke Yelavich <themuso at ubuntu.com>  Wed, 23 Nov 2016 09:49:51 +1100
 +
 +pulseaudio (1:9.0-5ubuntu2) zesty; urgency=medium
 +
 +  * Drop pulseaudio equalizer package, python-qt4 is in universe
 +
 + -- Luke Yelavich <themuso at ubuntu.com>  Wed, 09 Nov 2016 08:50:41 +1100
 +
 +pulseaudio (1:9.0-5ubuntu1) zesty; urgency=medium
 +
 +  * Merge with Debian:
 +    - epoch (my stupid fault :S)
 +    - 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 bluez 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 a build/run autopkgtest for libpulse-dev
 +    - Drop libsoxr-dev build dep, its in universe
 +    - Add support for the trust-store
 +    - Add snappy support, preventing snap apps from recording audio, full
 +      support via trust-store is planned
 +    - Add epoch to conflicts/replaces
 +    - Use liblirc-dev instead of liblircclient-dev
 +
 + -- Luke Yelavich <themuso at ubuntu.com>  Tue, 08 Nov 2016 12:07:26 +1100
 +
  pulseaudio (9.0-5) unstable; urgency=medium
  
    [ Felipe Sateler ]
diff --cc debian/gbp.conf
index d8d8b1e,cec628c..413a6c3
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,3 -1,2 +1,3 @@@
  [DEFAULT]
  pristine-tar = True
- debian-branch = ubuntu
++debian-branch = ubuntu-pulse10-ppa
diff --cc debian/patches/series
index 9e360bf,0000000..3f490bc
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,48 -1,0 +1,45 @@@
- Fix-detection-of-online-CPUs-in-pa_ncpus.patch
- raop-add-compatibility-with-openssl-1.1.0.patch
- 
 +# Ubuntu specific config/fixes
 +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
 +
 +# 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
 +
 +# 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
 +0417-increase-timeout-check-apparmor.patch
 +
 +# Ubuntu touch: enable bluez5 HFP over ofono support
 +0501-bluetooth-bluez5-ofono-add-support-for-HFP-gateway-r.patch
 +0502-bluetooth-bluez5-bring-back-SCO-over-PCM-support.patch
 +0503-bluetooth-bluez5-ofono-add-support-for-spekaer-micro.patch
 +0504-bluetooth-bluez5-add-support-for-both-mode.patch
 +0505-bluetooth-bluez5-let-user-specify-a-default-profile-.patch
 +0506-bluetooth-bluez5-prevent-SCO-sink-source-to-be-suspe.patch
 +0507-bluetooth-bluez5-drop-save-restore-of-SCO-sink-sourc.patch
 +0508-bluetooth-bluez5-add-guards-to-prevent-HFP-and-HSP-c.patch
 +0509-bluetooth-bluez5-don-t-reactivate-default-profile-wh.patch
 +0510-Further-fixes-for-HFP-A2DP-with-BlueZ-5.x.patch
 +
 +# Ubuntu touch: add support for Android 5.x
 +0600-droid-sync-with-upstream-for-Android-5-support-and-b.patch
 +0601-droid-alternative-hw-module-id.patch
 +0602-droid-inputstream-config-parameters.pach
 +0603-droid-port-priority-and-availability.patch
 +
 +# Ubuntu Snappy
 +0700-modules-add-snappy-policy-module.patch
diff --cc debian/pulseaudio.install
index 99a28d1,f3f2405..513b7ad
--- a/debian/pulseaudio.install
+++ b/debian/pulseaudio.install
@@@ -77,8 -77,8 +77,9 @@@ usr/lib/pulse-*/modules/module-virtual-
  usr/lib/pulse-*/modules/module-virtual-source.so
  usr/lib/pulse-*/modules/module-switch-on-port-available.so
  usr/lib/pulse-*/modules/module-virtual-surround-sink.so
 +usr/lib/pulse-*/modules/module-snappy-policy.so
  usr/lib/pulse-*/modules/module-x11*.so
+ usr/lib/pulse-*/modules/module-allow-passthrough.so
  [linux-any] usr/lib/pulse-*/modules/module-systemd-login.so
  [linux-any] usr/lib/systemd/user/pulseaudio.*
  usr/share/bash-completion/completions/*
diff --cc debian/rules
index f6f08b6,11ee1b1..5556dfc
--- a/debian/rules
+++ b/debian/rules
@@@ -22,8 -22,11 +22,10 @@@ DEB_CONFIGURE_EXTRA_FLAGS = --enable-x1
    --with-zsh-completion-dir=\$${datadir}/zsh/vendor-completions \
    --with-bash-completion-dir=\$${datadir}/bash-completion/completions \
    --with-systemduserunitdir=\$${prefix}/lib/systemd/user \
 -  --disable-bluez4
 -
 +  --disable-bluez4 --enable-snappy
  
+ PA_MAJORMINOR = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -r -e 's/^([0-9]+\.[0-9]+).*/\1/')
+ 
  ifeq ($(words $(sort $(filter stage1,$(DEB_BUILD_PROFILES)))),1)
    DEB_CONFIGURE_EXTRA_FLAGS += --disable-bluez5
  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