[Merge] lp:~bluetooth/bluez/fix-obex-ebook-cond-patch into lp:~bluetooth/bluez/ubuntu

[Tony Espy]

Tony Espy has proposed merging lp:~bluetooth/bluez/fix-obex-ebook-cond-patch into lp:~bluetooth/bluez/ubuntu.

Commit message:
   * Re-work the obexd-ebook conditional patch
     - Fixes FTB on vivid


Requested reviews:
  Bluetooth (bluetooth)

For more details, see:
https://code.launchpad.net/~bluetooth/bluez/fix-obex-ebook-cond-patch/+merge/284933

This merge fixes a FTB on vivid.

No functional changes made.

-- 
Your team Bluetooth is requested to review the proposed merge of lp:~bluetooth/bluez/fix-obex-ebook-cond-patch into lp:~bluetooth/bluez/ubuntu.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 1931 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-bluetooth/attachments/20160203/6b399818/attachment-0001.diff>