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

[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 3a2a2602c3ce80723907d1432d491bcff56aa4a0
Merge: 434b3aa c00df97
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Tue Oct 6 15:31:27 2015 +1100

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

 debian/changelog                    | 20 +++++++++++++++-----
 debian/pulseaudio.lintian-overrides |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 56cc7b9,4c14e96..95c713e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,37 -1,15 +1,47 @@@
- pulseaudio (1:7.0-0ubuntu1~wily1) wily; urgency=medium
++pulseaudio (7.0-1ubuntu1~wily1) UNRELEASED; urgency=medium
 +
-   * New upstream release
-   * Dropped patch, applied upstream
-   * Update shlibs file for 7.0
 +  * 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>  Mon, 21 Sep 2015 11:01:11 +1000
++ -- Luke Yelavich <themuso at ubuntu.com>  Tue, 06 Oct 2015 15:30:57 +1100
++
+ pulseaudio (7.0-1) unstable; urgency=medium
+ 
+   [ Luke Yelavich ]
+   * New upstream release
+   * Dropped patch, applied upstream
+   * Update shlibs file for 7.0
+ 
+   [ Felipe Sateler ]
+   * Update bash completion lintian override
+   * Upload to unstable
+ 
+  -- Felipe Sateler <fsateler at debian.org>  Fri, 25 Sep 2015 09:53:54 -0300
  
  pulseaudio (6.99.1-2) experimental; urgency=medium
  

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