[pulseaudio] 06/06: Merge remote-tracking branch 'origin/debian/experimental' 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 dfab5ab01f029c701e0815844445a90f3843f0fd
Merge: 59ac0c5 d162526
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Mon Dec 8 14:24:48 2014 +1100

    Merge remote-tracking branch 'origin/debian/experimental' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/patches/series

 debian/changelog           | 32 +++++++++++++++++++++++---------
 debian/control             |  1 -
 debian/pulseaudio.postinst |  9 +++++++++
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index 3018ac2,ebdf44d..de1acf1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,17 +1,51 @@@
- pulseaudio (1:5.99.1-0ubuntu1~vivid3) UNRELEASED; urgency=medium
++pulseaudio (1:5.99.1-2ubuntu1~vivid1) UNRELEASED; urgency=medium
 +
-   [ Luke Yelavich ]
 +  * Merge from Debian unstable, remaining changes:
 +    - epoch (my stupid fault :S)
 +    - Remove libwebrtc-audio-processing-dev build dep, its in universe
 +    - 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
++
++ -- Luke Yelavich <themuso at ubuntu.com>  Wed, 19 Nov 2014 11:21:32 +1100
++
+ pulseaudio (5.99.1-2) experimental; urgency=medium
+ 
+   * Add patch to disable srbchannel tests when eventfd is not available
+   * Bump standards version (no changes)
+   * Exclude libpulsecommon from dh_makeshlibs
+   * Bash completion script has moved, add mv_conffile snippet
+ 
+  -- Felipe Sateler <fsateler at debian.org>  Thu, 04 Dec 2014 00:54:12 -0300
+ 
+ pulseaudio (5.99.1-1) experimental; urgency=medium
+ 
+   [ Luke Yelavich ]
    * New upstream release candidate
+     + Closes: #653320, #758272, #657983
    * Dropped patches, either applied upstream or are now obsolete:
      - 0001-raop-Don-t-use-incompatible-default-sample-spec-para.patch
      - 0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
diff --cc debian/control
index ddabd71,f73e6f2..e4b1574
--- a/debian/control
+++ b/debian/control
@@@ -45,10 -44,8 +45,9 @@@ Build-Depends: debhelper (>= 9)
      libxcb1-dev (>= 1.6),
      libxtst-dev
  Standards-Version: 3.9.6
 -Vcs-Git: git://anonscm.debian.org/git/pkg-pulseaudio/pulseaudio.git
 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-pulseaudio/pulseaudio.git
 +XS-Debian-Vcs-Git: git://anonscm.debian.org/git/pkg-pulseaudio/pulseaudio.git
 +XS-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-pulseaudio/pulseaudio.git
 +XS-Testsuite: autopkgtest
- Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-audio-dev/pulseaudio/ubuntu
  Homepage: http://www.pulseaudio.org
  
  Package: pulseaudio

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