Bluez Utilities

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

  1. fix-obex-ebook-cond-patch
  2. Merge into ubuntu
Proposed by Tony Espy
Status: Merged
Merge reported by: Simon Fels
Merged at revision: not available
Proposed branch: lp:~bluetooth/bluez/fix-obex-ebook-cond-patch
Merge into: lp:~bluetooth/bluez/ubuntu
Diff against target: 48 lines (+12/-8) (has conflicts)
2 files modified
debian/changelog (+4/-0)
debian/patches/0004-obexd-enable-ebook-backend-conditionally.patch (+8/-8)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~bluetooth/bluez/fix-obex-ebook-cond-patch
Reviewer Review Type Date Requested Status
Simon Fels Approve
Review via email: mp+284933@code.launchpad.net

Commit message

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

Description of the change

This merge fixes a FTB on vivid.

No functional changes made.

To post a comment you must log in.
Revision history for this message
Tony Espy (awe) wrote :

Please hold off on reviewing, as this still has issues...

lp:~bluetooth/bluez/fix-obex-ebook-cond-patch updated
13. By Tony Espy

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

Revision history for this message
Tony Espy (awe) wrote :

OK, should be good to go now...

Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve
Revision history for this message
Simon Fels (morphis) wrote :

Builds fine on vivid/xenial.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-02-03 09:36:25 +0000
3+++ debian/changelog 2016-02-03 18:15:05 +0000
4@@ -25,11 +25,15 @@
5 contain scripts but more utilities which can be used for wider testing
6 of the BlueZ stack.
7
8+<<<<<<< TREE
9 [ Simon Fels ]
10 * debian/control:
11 - Point to correct Vcs used for bluez packaging
12
13 -- Simon Fels <simon.fels@canonical.com> Wed, 03 Feb 2016 10:36:16 +0100
14+=======
15+ -- Tony Espy <espy@canonical.com> Wed, 3 Feb 2016 10:07:11 -0500
16+>>>>>>> MERGE-SOURCE
17
18 bluez (5.36-0ubuntu1) xenial; urgency=medium
19
20
21=== modified file 'debian/patches/0004-obexd-enable-ebook-backend-conditionally.patch'
22--- debian/patches/0004-obexd-enable-ebook-backend-conditionally.patch 2016-01-24 00:07:20 +0000
23+++ debian/patches/0004-obexd-enable-ebook-backend-conditionally.patch 2016-02-03 18:15:05 +0000
24@@ -71,16 +71,16 @@
25 AC_SUBST(ICAL_LIBS)
26 +
27 + if (test "${enable_phonebook_ebook}" = "yes"); then
28-+
29-+ AC_SUBST(EBOOK_API, "12")
30-+
31-+ PKG_CHECK_MODULES(EBOOK, libebook-1.2 >= 3.12, dummy=yes,
32-+ AC_MSG_ERROR(libebook is required))
33++ PKG_CHECK_MODULES(EBOOK, libebook-1.2 >= 3.12,
34++ ebook_api="12",
35++ AC_MSG_ERROR(libebook-1.2-12 or greater is required))
36++
37++ PKG_CHECK_MODULES(EBOOK16, libebook-1.2 >= 3.16,
38++ ebook_api="16", dummy=yes)
39++
40++ AC_SUBST(EBOOK_API, "${ebook_api}")
41 + AC_SUBST(EBOOK_CFLAGS)
42 + AC_SUBST(EBOOK_LIBS)
43-+
44-+ PKG_CHECK_MODULES(EBOOK, libebook-1.2 >= 3.16,
45-+ AC_SUBST(EBOOK_API, "16"), dummy=yes)
46 + fi
47 fi
48 AM_CONDITIONAL(OBEX, test "${enable_obex}" != "no")

Subscribers

People subscribed via source and target branches

to all changes: