[Merge] lp:~cjwatson/upstart/new-json-c into lp:upstart

[Colin Watson]

Colin Watson has proposed merging lp:~cjwatson/upstart/new-json-c into lp:upstart.

Requested reviews:
  Upstart Reviewers (upstart-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/upstart/new-json-c/+merge/174952

json-c >= 0.11 calls its pkg-config file json-c rather than json.  This branch adapts to that so that we aren't reliant on the compatibility layer staying around (but still works if only the old name is available).
-- 
https://code.launchpad.net/~cjwatson/upstart/new-json-c/+merge/174952
Your team Upstart Reviewers is requested to review the proposed merge of lp:~cjwatson/upstart/new-json-c into lp:upstart.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 747 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20130716/e9fd9cd0/attachment-0001.diff>