[pulseaudio] 01/01: Merge branch '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 22043928e6912a9351cacc3fd29beb04de443941
Merge: d7213dc 223b57d
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Fri Feb 13 11:16:23 2015 +1100

    Merge branch 'debian/experimental' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/pulseaudio.maintscript

 .tarball-version                                     |  2 +-
 .version                                             |  2 +-
 NEWS                                                 |  8 +++++++-
 configure                                            | 20 ++++++++++----------
 debian/changelog                                     |  4 ++--
 debian/pulseaudio.maintscript                        |  2 +-
 shell-completion/bash/pulseaudio                     |  2 +-
 src/Makefile.am                                      |  2 +-
 src/Makefile.in                                      |  3 ++-
 .../mixer/paths/analog-output-speaker-always.conf    |  8 ++++++++
 .../alsa/mixer/paths/analog-output-speaker.conf      |  8 ++++++++
 src/modules/alsa/mixer/profile-sets/default.conf     |  2 +-
 .../profile-sets/force-speaker-and-int-mic.conf      |  2 +-
 .../alsa/mixer/profile-sets/force-speaker.conf       |  2 +-
 src/modules/alsa/module-alsa-card.c                  |  6 ++++++
 src/modules/module-device-restore.c                  |  1 +
 src/modules/module-loopback.c                        |  2 +-
 src/pulse/version.h                                  |  6 +++---
 18 files changed, 56 insertions(+), 26 deletions(-)

diff --cc debian/changelog
index e2dcc3f,f69da22..463d68e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,35 -1,7 +1,35 @@@
- pulseaudio (1:5.99.3-0ubuntu1~vivid1) UNRELEASED; urgency=medium
 -pulseaudio (6.0-1) UNRELEASED; urgency=medium
++pulseaudio (1:6.0-0ubuntu1~vivid1) UNRELEASED; urgency=medium
  
-   * New upstream release candidate
+   * New upstream release
    * Remove pulseaudio-kde autostart file on upgrade (Closes: #776331)
 +  * 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 patches that were either applied upstream
 +    or are obsolete
  
   -- Luke Yelavich <themuso at ubuntu.com>  Tue, 27 Jan 2015 12:09:03 +1100
  
diff --cc debian/pulseaudio.maintscript
index a0c64dc,3595835..7efb7b3
--- a/debian/pulseaudio.maintscript
+++ b/debian/pulseaudio.maintscript
@@@ -1,4 -1,4 +1,4 @@@
  rm_conffile /etc/default/pulseaudio 5.0-3~
  rm_conffile /etc/init.d/pulseaudio 5.0-3~
- rm_conffile /etc/xdg/autostart/pulseaudio-kde.desktop 5.99.3-0ubuntu1~vivid1~
 -rm_conffile /etc/xdg/autostart/pulseaudio-kde.desktop 6.0-1~
++rm_conffile /etc/xdg/autostart/pulseaudio-kde.desktop 1:6.0-0ubuntu1~vivid1~
  mv_conffile /etc/bash_completion.d/pulseaudio-bash-completion.sh /etc/bash_completion.d/pulseaudio 5.99.1-2~

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