[pulseaudio] 01/02: Merge remote-tracking branch 'origin/ubuntu' into ubuntu-snappy

Luke Yelavich themuso-guest at moszumanska.debian.org
Fri Jun 17 04:29:34 UTC 2016


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

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

commit d34f722d211562512930f8fd841497216e6e1842
Merge: 58f22f4 ab6120b
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Fri Jun 17 14:27:01 2016 +1000

    Merge remote-tracking branch 'origin/ubuntu' into ubuntu-snappy

 .gitignore                                         |    2 +
 .tarball-version                                   |    2 +-
 .version                                           |    2 +-
 Makefile.am                                        |    4 +
 NEWS                                               |   57 +-
 bootstrap.sh                                       |    4 +-
 config.h.in                                        |   19 +-
 configure.ac                                       |   39 +-
 debian/changelog                                   |  199 +-
 debian/control                                     |  206 +-
 debian/libpulse0.symbols                           |    3 +
 debian/libpulsedsp.lintian-overrides               |    3 -
 .../0005-dont-load-cork-music-on-phone.patch       |    2 +-
 ...rapper-Quit-daemon-if-pid-file-is-removed.patch |    4 +-
 ...nd_mixer_poll_descriptors_count_when_zero.patch |   16 -
 ...Quick-workaround-for-potential-index-out-.patch |   40 +
 ...ort-available-Switch-from-HDMI-to-analog-.patch |   54 +
 ...onf-parser-add-support-for-.d-directories.patch |  184 -
 ...nt-conf-daemon-conf-enable-.d-directories.patch |  127 -
 debian/patches/0202-dont-probe-ucm.patch           |    2 +-
 ...0203-card-Add-hook-before-profile-changes.patch |    4 +-
 debian/patches/0207-Enable-pulseaudio-droid.patch  |   12 +-
 ...tooth-device-Allow-leaving-transport-runn.patch |   16 +-
 .../0407-access-Add-access-control-hooks.patch     |    6 +-
 debian/patches/0409-Trust-store-patch.patch        |  105 +-
 ...-thread-to-activate-trust-store-interface.patch |    4 +-
 .../0417-increase-timeout-check-apparmor.patch     |   14 +-
 ...with-upstream-for-Android-5-support-and-b.patch | 5249 ++++++++++++++++++++
 .../0601-droid-alternative-hw-module-id.patch      |   38 +
 .../0602-droid-inputstream-config-parameters.pach  |   79 +
 ...0603-droid-port-priority-and-availability.patch |  107 +
 .../0700-modules-add-snappy-policy-module.patch    |  200 +
 debian/patches/series                              |   16 +-
 ...ort-available:-Switch-from-HDMI-to-analog.patch |   51 +
 debian/pulseaudio-dev.install                      |    2 -
 debian/pulseaudio-esound-compat.lintian-overrides  |    1 -
 .../pulseaudio-module-bluetooth.lintian-overrides  |    1 -
 debian/pulseaudio-module-droid.install             |   13 +-
 debian/pulseaudio-module-raop.lintian-overrides    |    2 -
 debian/pulseaudio-module-x11.lintian-overrides     |    2 -
 .../pulseaudio-module-zeroconf.lintian-overrides   |    1 -
 debian/pulseaudio.install                          |    3 +-
 debian/pulseaudio.lintian-overrides                |    4 -
 debian/pulseaudio.maintscript                      |    9 +-
 debian/rules                                       |   13 +-
 debian/shlibs.local                                |    4 +-
 git-version-gen                                    |    5 +-
 man/default.pa.5                                   |    6 +-
 man/default.pa.5.xml.in                            |   19 +-
 man/pulse-client.conf.5                            |    6 +-
 man/pulse-client.conf.5.xml.in                     |   19 +-
 man/pulse-daemon.conf.5                            |    8 +-
 man/pulse-daemon.conf.5.xml.in                     |   25 +-
 po/uk.po                                           |  341 +-
 po/zh_CN.po                                        | 3660 ++++++++------
 scripts/benchmark_memory_usage.sh                  |  133 +
 scripts/benchmarks/.gitignore                      |   10 +
 scripts/benchmarks/README                          |    4 +
 scripts/plot_memory_usage.gp                       |   63 +
 src/Makefile.am                                    |   50 +-
 src/daemon/cmdline.c                               |    2 +-
 src/daemon/daemon-conf.c                           |    4 +-
 src/daemon/default.pa.in                           |    4 +
 src/daemon/main.c                                  |    6 +-
 src/daemon/system.pa.in                            |    4 +
 src/map-file                                       |    3 +
 src/modules/alsa/alsa-mixer.c                      |   25 +-
 src/modules/alsa/alsa-mixer.h                      |    3 +
 src/modules/alsa/alsa-sink.c                       |   17 +-
 src/modules/alsa/alsa-source.c                     |    3 +-
 src/modules/alsa/alsa-util.c                       |   21 +-
 .../alsa/mixer/paths/analog-input-headset-mic.conf |    3 +
 .../mixer/profile-sets/sb-omni-surround-5.1.conf   |   21 +-
 src/modules/alsa/module-alsa-card.c                |   33 +-
 src/modules/bluetooth/module-bluetooth-policy.c    |    5 +-
 src/modules/bluetooth/module-bluez4-device.c       |   11 +-
 src/modules/bluetooth/module-bluez5-device.c       |    2 +-
 src/modules/bluetooth/module-bluez5-discover.c     |    3 +-
 src/modules/dbus/iface-card-profile.c              |   19 +
 src/modules/dbus/iface-card.c                      |   51 +-
 src/modules/dbus/iface-core.c                      |    4 +-
 src/modules/dbus/iface-device-port.c               |   65 +-
 src/modules/echo-cancel/module-echo-cancel.c       |   18 +-
 src/modules/macosx/module-coreaudio-device.c       |   50 +-
 src/modules/module-always-sink.c                   |    9 +-
 src/modules/module-augment-properties.c            |    2 +-
 src/modules/module-card-restore.c                  |   58 +-
 src/modules/module-loopback.c                      |    5 +
 src/modules/module-rygel-media-server.c            |    2 +-
 src/modules/module-switch-on-port-available.c      |  179 +-
 src/modules/module-tunnel.c                        |    4 +-
 src/modules/module-udev-detect.c                   |    2 +-
 src/modules/module-zeroconf-publish.c              |    2 +-
 src/modules/rtp/headerlist.c                       |    2 +-
 src/modules/rtp/rtsp_client.c                      |    6 +-
 src/modules/rtp/sdp.c                              |    7 +-
 src/modules/x11/module-x11-publish.c               |    2 +-
 src/pulse/channelmap.c                             |   13 +
 src/pulse/channelmap.h                             |    5 +
 src/pulse/client-conf.c                            |    2 +-
 src/pulse/context.c                                |    6 +-
 src/pulse/proplist.c                               |   14 +-
 src/pulse/pulseaudio.h                             |    9 +
 src/pulse/stream.h                                 |    9 +-
 src/pulse/thread-mainloop.c                        |   16 +-
 src/pulse/version.h                                |    6 +-
 src/pulse/volume.c                                 |  149 +-
 src/pulse/volume.h                                 |   18 +
 src/pulsecore/card.c                               |   46 +-
 src/pulsecore/card.h                               |   15 +-
 src/pulsecore/cli-text.c                           |   18 +-
 src/pulsecore/cli.c                                |    2 +-
 src/pulsecore/client.c                             |    6 +-
 src/pulsecore/client.h                             |    3 +-
 src/pulsecore/conf-parser.c                        |   42 +-
 src/pulsecore/conf-parser.h                        |    8 +-
 src/pulsecore/core-rtclock.h                       |    2 +
 src/pulsecore/core-util.c                          |   52 +-
 src/pulsecore/core.c                               |    2 +-
 src/pulsecore/core.h                               |    3 +-
 src/pulsecore/device-port.c                        |   11 +
 src/pulsecore/device-port.h                        |    5 +-
 src/pulsecore/log.c                                |    9 +
 src/pulsecore/ltdl-helper.c                        |    2 +-
 src/pulsecore/modargs.c                            |    8 +-
 src/pulsecore/module.c                             |    7 +-
 src/pulsecore/module.h                             |    2 +-
 src/pulsecore/packet.c                             |    4 +-
 src/pulsecore/protocol-dbus.c                      |    4 +-
 src/pulsecore/protocol-http.c                      |    2 +-
 src/pulsecore/resampler.c                          |    7 +-
 src/pulsecore/resampler/soxr.c                     |   15 +-
 src/pulsecore/rtpoll.c                             |    2 +-
 src/pulsecore/sample-util.h                        |   10 +-
 src/pulsecore/sink-input.c                         |    2 +
 src/pulsecore/sink-input.h                         |    3 +-
 src/pulsecore/sink.c                               |   38 +-
 src/pulsecore/sink.h                               |    4 +-
 src/pulsecore/source-output.c                      |    2 +
 src/pulsecore/source-output.h                      |    3 +-
 src/pulsecore/source.c                             |   18 +-
 src/pulsecore/source.h                             |    3 +-
 src/pulsecore/strbuf.c                             |    8 +-
 src/pulsecore/strbuf.h                             |    4 +-
 src/pulsecore/strlist.c                            |    4 +-
 src/pulsecore/strlist.h                            |    2 +-
 src/pulsecore/{strbuf.h => typedefs.h}             |   33 +-
 src/tests/extended-test.c                          |    2 +
 src/tests/memblockq-test.c                         |    4 +-
 src/tests/mult-s16-test.c                          |    8 +-
 src/tests/strlist-test.c                           |    6 +-
 src/tests/sync-playback.c                          |    3 +-
 src/utils/pacmd.c                                  |    2 +-
 153 files changed, 9661 insertions(+), 2953 deletions(-)


-- 
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