[pulseaudio] 01/02: Merge tag 'debian/8.0-2' into ubuntu

Luke Yelavich themuso-guest at moszumanska.debian.org
Thu Apr 28 08:16:06 UTC 2016


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

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

commit 3d843d857fc5862e4543106b2eed6c41931ec3e7
Merge: fc6edef 7f37fc0
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Thu Apr 28 09:35:56 2016 +0200

    Merge tag 'debian/8.0-2' into ubuntu
    
    pulseaudio Debian release 8.0-2

 debian/changelog                                   | 60 ++++++++++++++++++++++
 debian/control                                     | 15 +++---
 debian/patches/series                              |  7 ++-
 ...ort-available:-Switch-from-HDMI-to-analog.patch | 51 ++++++++++++++++++
 debian/rules                                       |  9 +---
 5 files changed, 122 insertions(+), 20 deletions(-)

diff --cc debian/changelog
index 0162aea,592a10e..3f067ec
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,64 -1,34 +1,124 @@@
++pulseaudio (8.0-2ubuntu1) UNRELEASED; urgency=medium
++
++  * Merge from Debian experimental, remaining changes:
++    - epoch (my stupid fault :S)
++    - 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 a build/run autopkgtest for libpulse-dev
++    - Drop libsoxr-dev build dep, its in universe
++
++ -- Luke Yelavich <luke at galactica>  Thu, 28 Apr 2016 09:33:45 +0200
++
+ pulseaudio (8.0-2) unstable; urgency=medium
+ 
+   * Add patch from upstream to switch back to HDMI when port is back.
+     (Closes: #816963)
+   * Bump standards-version (no changes needed)
+   * Use canonical Vcs-* urls
+     - Use cgit url for browser
+     - Use https url for git
+   * Drop XS-Testsuite header.
+     - Newer dpkg-dev adds the field automatically
+     - Add versioned Build-Depends for such a version (1.17.14)
+   * Fix Build-Profile stage1 support
+     - Mark libbluetooth-dev dependency as <!stage1>
+     - Mark pulseaudio-module-bluetooth as <!stage1>
+     - Build-depend on new enough debhelper (9.20141010)
+     - Use correct flag --disable-bluez5
+     - Drop manual ignoring of bluetooth packages, debhelper knows to do so
+ 
+  -- Felipe Sateler <fsateler at debian.org>  Sat, 02 Apr 2016 20:42:36 -0300
+ 
+ pulseaudio (8.0-1) unstable; urgency=medium
+ 
+   [ Luke Yelavich ]
+   * New upstream release
+   * Update shlibs file
+ 
+   [ Felipe Sateler ]
+   * Release to unstable
+ 
+  -- Felipe Sateler <fsateler at debian.org>  Wed, 27 Jan 2016 20:44:59 -0300
+ 
 +pulseaudio (1:8.0-0ubuntu4) yakkety; urgency=medium
 +
 +  * debian/pulseaudio.maintscript: Bump versions for files that need to be
 +    removed as they are obsolete (LP: #1573296)
 +
 + -- Luke Yelavich <themuso at ubuntu.com>  Wed, 27 Apr 2016 14:41:42 +0200
 +
 +pulseaudio (1:8.0-0ubuntu3) xenial; urgency=medium
 +
 +  * Drop 0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch 
 +    - Upstreamed
 +  * 0024-alsa-mixer-Quick-workaround-for-potential-index-out-.patch
 +    - Fix a potential index-out-of-bounds when reading multichannel mixers
 +  * 0100-switch-on-port-available-Switch-from-HDMI-to-analog-.patch
 +    - Improve an 8.0 routing regression 
 +
 + -- David Henningsson <david.henningsson at canonical.com>  Mon, 21 Mar 2016 11:14:25 +0100
 +
 +pulseaudio (1:8.0-0ubuntu2) xenial; urgency=medium
 +
 +  * 0600-droid-sync-with-upstream-for-Android-5-support-and-b.patch:
 +    - Fix build failure by changing pa_strlist_tostring calls to
 +      pa_strlist_to_string
 +
 + -- Luke Yelavich <themuso at ubuntu.com>  Thu, 11 Feb 2016 08:44:22 +1100
 +
 +pulseaudio (1:8.0-0ubuntu1) xenial; urgency=medium
 +
 +  * New upstream release
 +  * 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
 +    - Drop libsoxr-dev build dep, its in universe
 +  * Refreshed patches, and dropped those that were applied upstream.
 +  * Update local shlibs file for 8.0
 +
 + -- Luke Yelavich <themuso at ubuntu.com>  Wed, 10 Feb 2016 16:27:28 +1100
 +
  pulseaudio (7.99.2-1) experimental; urgency=medium
  
    * New upstream release candidate
diff --cc debian/control
index 24722a7,7a54513..9b91b75
--- a/debian/control
+++ b/debian/control
@@@ -6,26 -5,20 +6,25 @@@ XSBC-Original-Maintainer: Pulseaudio ma
  Uploaders: Sjoerd Simons <sjoerd at debian.org>,
      Balint Reczey <balint at balintreczey.hu>,
      Felipe Sateler <fsateler at debian.org>
- # The following packages can be omitted for bootstrapping (DEB_BUILD_PROFILES=stage1):
- #  libbluetooth-dev
 -Build-Depends: debhelper (>= 9.20141010),
 +Build-Depends: android-headers-19 (>= 23) [armhf i386 amd64],
 +    android-headers-22 (>= 23) [armhf i386 amd64],
-     debhelper (>= 9),
++    debhelper (>= 9.20141010),
      cdbs (>= 0.4.93),
      check,
      dh-autoreconf,
      dh-exec,
+     dpkg-dev (>= 1.17.14),
      intltool,
 +    libapparmor-dev [linux-any],
 +    libandroid-properties-dev [armhf i386 amd64],
      libasound2-dev (>= 1.0.24) [linux-any],
      libasyncns-dev,
      libatomic-ops-dev,
      libavahi-client-dev,
-     libbluetooth-dev (>= 4.40) [linux-any],
+     libbluetooth-dev (>= 4.99) [linux-any] <!stage1>,
      libsbc-dev [linux-any],
      libcap-dev [linux-any],
 +    libdbus-cpp-dev [armhf i386 amd64],
      libfftw3-dev,
      libgconf2-dev,
      libglib2.0-dev,
@@@ -194,35 -185,8 +192,36 @@@ Description: RAOP module for PulseAudi
   .
   This module enables PulseAudio to stream audio to an Apple Airport Express.
  
 +Package: pulseaudio-module-droid
 +Architecture: armhf i386 amd64
 +Priority: extra
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Conflicts: pulseaudio (<< 0.9.14-2)
 +Description: Android Audio HAL module for PulseAudio sound server
 + PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
 + WIN32 systems. It is a drop in replacement for the ESD sound server with
 + much better latency, mixing/re-sampling quality and overall architecture.
 + .
 + This module enables PulseAudio to work on top of the Android Audio HAL.
 + .
 + The module is called module-droid.
 +
 +Package: pulseaudio-module-trust-store
 +Architecture: armhf i386 amd64
 +Priority: extra
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Conflicts: pulseaudio (<< 0.9.14-2)
 +Description: trust-store module for PulseAudio sound server
 + PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
 + WIN32 systems. It is a drop in replacement for the ESD sound server with
 + much better latency, mixing/re-sampling quality and overall architecture.
 + .
 + This module enables PulseAudio to use the trust-store in Ubuntu touch systems.
 + .
 + The module is called module-trust-store.
 +
  Package: pulseaudio-module-bluetooth
+ Build-Profiles: <!stage1>
  Architecture: linux-any
  Priority: extra
  Depends: ${shlibs:Depends}, ${misc:Depends}, bluez (>= 5.23)
diff --cc debian/patches/series
index 646bf2a,d5a3976..e2d6904
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,46 -1,1 +1,45 @@@
- # Ubuntu/Debian specific config/fixes
+ switch-on-port-available:-Switch-from-HDMI-to-analog.patch
++
++# Ubuntu 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
 +0024-alsa-mixer-Quick-workaround-for-potential-index-out-.patch
 +
- # Cherry-picked from upstream
- 0100-switch-on-port-available-Switch-from-HDMI-to-analog-.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
 +
 +# Ubuntu touch: enable bluez5 HFP over ofono support
 +0501-bluetooth-bluez5-ofono-add-support-for-HFP-gateway-r.patch
 +0502-bluetooth-bluez5-bring-back-SCO-over-PCM-support.patch
 +0503-bluetooth-bluez5-ofono-add-support-for-spekaer-micro.patch
 +0504-bluetooth-bluez5-add-support-for-both-mode.patch
 +0505-bluetooth-bluez5-let-user-specify-a-default-profile-.patch
 +0506-bluetooth-bluez5-prevent-SCO-sink-source-to-be-suspe.patch
 +0507-bluetooth-bluez5-drop-save-restore-of-SCO-sink-sourc.patch
 +0508-bluetooth-bluez5-add-guards-to-prevent-HFP-and-HSP-c.patch
 +0509-bluetooth-bluez5-don-t-reactivate-default-profile-wh.patch
 +0510-Further-fixes-for-HFP-A2DP-with-BlueZ-5.x.patch
 +
 +# Ubuntu touch: add support for Android 5.x
 +0600-droid-sync-with-upstream-for-Android-5-support-and-b.patch
 +0601-droid-alternative-hw-module-id.patch
 +0602-droid-inputstream-config-parameters.pach
 +0603-droid-port-priority-and-availability.patch
diff --cc debian/rules
index 258494f,4211237..1c4c34d
--- a/debian/rules
+++ b/debian/rules
@@@ -39,8 -32,9 +32,8 @@@ DEB_CONFIGURE_EXTRA_FLAGS = --enable-x1
    --with-systemduserunitdir=\$${prefix}/lib/systemd/user \
    --disable-bluez4
  
 -
  ifeq ($(words $(sort $(filter stage1,$(DEB_BUILD_PROFILES)))),1)
-   DEB_CONFIGURE_EXTRA_FLAGS += --disable-bluez
+   DEB_CONFIGURE_EXTRA_FLAGS += --disable-bluez5
  endif
  
  

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