lp:~ubuntu-branches/ubuntu/quantal/bluez/quantal-201205042302
- Get this branch:
- bzr branch lp:~ubuntu-branches/ubuntu/quantal/bluez/quantal-201205042302
Branch merges
- Ubuntu branches: Pending requested
-
Diff: 9240 lines (+1846/-7056) (has conflicts)18 files modified.pc/01_lower_sink_ranking.patch/audio/gsta2dpsink.c (+0/-730)
.pc/02_disable_hal.patch/audio/telephony-maemo5.c (+0/-2104)
.pc/02_disable_hal.patch/audio/telephony-maemo6.c (+0/-2201)
.pc/02_disable_hal.patch/audio/telephony-ofono.c (+0/-1638)
.pc/03-Fix-return-code-of-hid2hci.patch/tools/hid2hci.c (+0/-350)
Makefile.am (+1/-1)
acinclude.m4 (+0/-2)
audio/a2dp.c (+4/-0)
audio/gsta2dpsink.c (+1/-1)
audio/telephony-maemo5.c (+1/-8)
audio/telephony-maemo6.c (+1/-9)
audio/telephony-ofono.c (+1/-4)
debian/patches/python3.patch (+1807/-0)
lib/bluetooth.h (+12/-0)
test/simple-agent (+9/-0)
test/test-discovery (+2/-0)
test/test-thermometer (+5/-0)
tools/hid2hci.c (+2/-8)
Branch information
- Owner:
- Ubuntu branches
- Status:
- Development
Recent revisions
- 97. By Mathieu Trudel-Lapierre
-
[ Iain Lane ]
* Merge with Debian unstable, remaining changes:
- Upstart support:
o Add debian/bluez.bluetooth .upstart and drop
debian/bluez.bluetooth .default.
o debian/rules: Drop -DEB_UPDATE_RCD_PARAMS
o Disable 07-fix-639356.patch and don't install 97-bluetooth.rules (in
debian/bluez.install) and debian/bluez-udev (in debian/rules), we
don't want to use the udev rules to start bluez. The upstart job does
that already.
- debian/bluez-alsa. install: Install ALSA bluetooth configuration into the
right place for ALSA 1.0.25.
- Add debian/source_ bluez.py Apport package hook. Install in
debian/bluez.install.
- debian/control: Build against libnl3-dev, not libnl-dev.
- debian/patches/ socket_ audio.patch: re-enable the socket API for the
bluetooth audio manager. This reverts an upstream change that switches to
the MediaEndpoint DBus API by default, but it looks like PulseAudio isn't
quite ready to use that yet.
- Add sbc_mmx.patch: Fix building with gcc 4.7.
- debian/patches/ 10-unregister_ interface_ on_exit. patch: unregister the SAP
interface on exit.
- debian/patches/ 11-explicitly_ close.patch: make sure the io channel for
HFP is properly closed on exit.
- debian/patches/ enable_ audio_profiles. patch: properly enable the Source
profile, its state is checked twice, once in audio/a2dp.c again which was
not taken into account in the previous upload.
- Drop debian/bluez.preinst and debian/ bluez-alsa. preinst: Obsolete
conffile migrations, 10.04 LTS has a much newer version.
- Transition the BLUETOOTH_ENABLED variable to an Upstart override
variable if it's been changed.
* debian/control: Continue depending on module-init-tools instead of kmod
(reverts Debian change), as we do not have the latter yet.
* debian/patches/ python3. diff: Some additional changes
[ Steve Langasek ]* Switch to python3.
- 96. By Mathieu Trudel-Lapierre
-
* debian/
patches/ 10-unregister_ interface_ on_exit. patch: unregister the SAP
interface on exit. Thanks to Jesse Sung for the patch.
* debian/patches/ 11-explicitly_ close.patch: make sure the io channel for
HFP is properly closed on exit. Thanks to Jesse Sung for the patch.
(LP: #907818) - 94. By Evan Broder
-
Fix the version number in debian/
bluez.maintscri pt so it actually
cleans up the file. (LP: #953448) - 93. By Evan Broder
-
* Respawn bluetooth daemon if crashed.
* Eliminate the /etc/default/bluetooth conffile as it's not the Upstart
way. Transition the BLUETOOTH_ENABLED variable to an Upstart override
variable if it's been changed. - 92. By Mathieu Trudel-Lapierre
-
debian/
patches/ enable_ audio_profiles. patch: properly enable the Source
profile, its state is checked twice, once in audio/a2dp.c again which was
not taken into account in the previous upload. (LP: #948613) - 90. By Evan Broder
-
debian/
patches/ enable_ audio_profiles. patch: enable the Gateway and Source
audio profiles by default. (LP: #948613)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/quantal/bluez