Merge lp://qastaging/~morphis/bluez/vivid-5.36-upgrade into lp://qastaging/~bluetooth/bluez/vivid-phone-overlay

Proposed by Simon Fels
Status: Needs review
Proposed branch: lp://qastaging/~morphis/bluez/vivid-5.36-upgrade
Merge into: lp://qastaging/~bluetooth/bluez/vivid-phone-overlay
Diff against target: 8468 lines (+3180/-1202)
82 files modified
ChangeLog (+8/-0)
Makefile.am (+1/-1)
Makefile.in (+15/-4)
Makefile.tools (+3/-1)
android/Android.mk (+2/-0)
android/README (+6/-1)
android/bluetoothd-snoop.c (+3/-0)
configure (+10/-10)
configure.ac (+1/-1)
debian/changelog (+8/-0)
debian/control (+2/-0)
debian/patches/0001-obexd-pbap-add-headers-correctly-for-size-query.patch (+0/-44)
debian/patches/series (+0/-1)
doc/media-api.txt (+14/-10)
doc/mgmt-api.txt (+1/-0)
emulator/btdev.c (+135/-25)
lib/bluetooth.c (+56/-0)
monitor/analyze.c (+3/-0)
monitor/avctp.c (+41/-0)
monitor/broadcom.c (+251/-0)
monitor/broadcom.h (+32/-0)
monitor/bt.h (+56/-0)
monitor/control.c (+20/-5)
monitor/display.h (+1/-0)
monitor/hcidump.c (+6/-4)
monitor/intel.c (+926/-0)
monitor/intel.h (+31/-0)
monitor/ll.c (+43/-22)
monitor/ll.h (+2/-2)
monitor/lmp.c (+125/-11)
monitor/lmp.h (+1/-1)
monitor/packet.c (+362/-96)
monitor/packet.h (+20/-10)
monitor/vendor.h (+19/-0)
obexd/plugins/pbap.c (+3/-2)
profiles/audio/a2dp.c (+1/-1)
profiles/audio/avrcp.c (+22/-11)
profiles/audio/control.c (+58/-9)
profiles/audio/control.h (+2/-0)
profiles/audio/player.c (+5/-0)
profiles/audio/player.h (+1/-0)
profiles/deviceinfo/deviceinfo.c (+74/-121)
profiles/gap/gas.c (+0/-42)
profiles/scanparam/scan.c (+187/-179)
src/advertising.c (+2/-2)
src/bluetooth.service.in (+1/-0)
src/device.c (+38/-33)
src/gatt-client.c (+1/-1)
src/profile.c (+6/-2)
src/service.c (+12/-0)
src/shared/ad.c (+11/-7)
src/shared/ad.h (+11/-7)
src/shared/btsnoop.c (+20/-6)
src/shared/btsnoop.h (+9/-0)
src/shared/util.h (+5/-0)
tools/hciconfig.c (+1/-1)
tools/mpris-proxy.c (+1/-1)
tools/parser/att.c (+46/-46)
tools/parser/avctp.c (+2/-2)
tools/parser/avdtp.c (+36/-36)
tools/parser/avrcp.c (+145/-145)
tools/parser/bnep.c (+25/-25)
tools/parser/bpa.c (+8/-8)
tools/parser/capi.c (+4/-4)
tools/parser/cmtp.c (+3/-3)
tools/parser/csr.c (+3/-3)
tools/parser/ericsson.c (+1/-1)
tools/parser/hci.c (+30/-30)
tools/parser/hcrp.c (+6/-6)
tools/parser/hidp.c (+1/-1)
tools/parser/lmp.c (+3/-3)
tools/parser/obex.c (+12/-12)
tools/parser/parser.h (+7/-7)
tools/parser/ppp.c (+4/-4)
tools/parser/sap.c (+12/-12)
tools/parser/sdp.c (+25/-25)
tools/parser/smp.c (+17/-17)
tools/sco-tester.c (+1/-0)
unit/test-gobex-header.c (+1/-1)
unit/test-hfp.c (+44/-47)
unit/test-sdp.c (+43/-54)
unit/test-uhid.c (+26/-36)
To merge this branch: bzr merge lp://qastaging/~morphis/bluez/vivid-5.36-upgrade
Reviewer Review Type Date Requested Status
Bluetooth Pending
Review via email: mp+278302@code.qastaging.launchpad.net

Description of the change

Upgrade to upstream release 5.36

To post a comment you must log in.
10. By Simon Fels

Fix changelog to work better with citrain

Unmerged revisions

10. By Simon Fels

Fix changelog to work better with citrain

9. By Simon Fels

Prevent citrain from rewriting our version number

8. By Simon Fels

Update changelog

7. By Simon Fels

Drop upstreamed PBAP patch

6. By Simon Fels

Import upstream release 5.36

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: