[pulseaudio] 11/12: Merge remote-tracking branch 'origin/master' into ubuntu

[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 63b32c612d515f61cb089e60346866464616a9ea
Merge: 2e118d5 c0f0466
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Mon Nov 2 10:07:06 2015 +1100

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

 .tarball-version                                   |  2 +-
 .version                                           |  2 +-
 Makefile.in                                        |  2 +-
 NEWS                                               | 18 +++++++++
 configure                                          | 22 +++++------
 configure.ac                                       |  2 +-
 debian/changelog                                   | 10 ++++-
 ...ys-remove-freed-module-from-modules_pendi.patch | 46 ----------------------
 debian/patches/series                              |  3 --
 debian/pulseaudio.lintian-overrides                |  1 +
 debian/shlibs.local                                |  4 +-
 man/pulseaudio.1                                   |  2 +-
 man/pulseaudio.1.xml.in                            |  4 +-
 src/daemon/main.c                                  |  8 ++++
 src/daemon/systemd/user/pulseaudio.service.in      |  2 +
 src/modules/alsa/alsa-mixer.c                      |  6 +--
 src/modules/alsa/alsa-ucm.c                        |  1 -
 src/modules/alsa/mixer/paths/analog-input.conf     |  6 +++
 .../alsa/mixer/paths/analog-output-lineout.conf    |  8 ++++
 .../mixer/paths/analog-output-speaker-always.conf  |  4 ++
 .../alsa/mixer/paths/analog-output-speaker.conf    |  4 ++
 src/modules/module-null-sink.c                     |  6 ++-
 src/pulse/version.h                                |  4 +-
 src/pulsecore/pstream.c                            | 11 +++++-
 src/pulsecore/shm.c                                | 10 +++--
 25 files changed, 107 insertions(+), 81 deletions(-)

diff --cc debian/changelog
index 638dabd,67f0969..335856d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,35 -1,11 +1,43 @@@
- pulseaudio (7.0-1ubuntu1) UNRELEASED; urgency=medium
++pulseaudio (1:7.1-1ubuntu1) 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
 +  * Refreshed patches, and dropped those that were applied upstream.
 +
 + -- Luke Yelavich <themuso at ubuntu.com>  Tue, 06 Oct 2015 15:30:57 +1100
 +
+ pulseaudio (7.1-1) unstable; urgency=medium
+ 
+   * New upstream version
+   * Update shlibs file for 7.1
+   * Silence lintian warning about pulsecore: it is internal library
+ 
+  -- Felipe Sateler <fsateler at debian.org>  Sun, 01 Nov 2015 16:27:53 -0300
+ 
  pulseaudio (7.0-1) unstable; urgency=medium
  
    [ Luke Yelavich ]
diff --cc debian/patches/series
index 242a866,0000000..51ea47d
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,28 -1,0 +1,25 @@@
 +# Ubuntu/Debian 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
 +0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch
 +
- # Patches pulled from upstream
- 0101-module-Always-remove-freed-module-from-modules_pendi.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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git