Merge lp://qastaging/~charlesk/platform-api/lp-1216473 into lp://qastaging/platform-api

Proposed by Charles Kerr
Status: Needs review
Proposed branch: lp://qastaging/~charlesk/platform-api/lp-1216473
Merge into: lp://qastaging/platform-api
Diff against target: 9 lines (+1/-1)
1 file modified
data/ubuntu-platform-api.pc.in (+1/-1)
To merge this branch: bzr merge lp://qastaging/~charlesk/platform-api/lp-1216473
Reviewer Review Type Date Requested Status
Gerry Boland (community) Needs Information
PS Jenkins bot continuous-integration Approve
Review via email: mp+181977@code.qastaging.launchpad.net

Commit message

Fix the .pc file so that platform-api's public headers can find each other.

The pkg-config file's Cflags entry tells clients to -I${includedir}/ubuntu, but the public headers contain directives like "#include <ubuntu/foo/bar>". Cflags needs to remove the trailing "/ubuntu" to be the proper depth expected by the public headers.

Description of the change

Fix the .pc file so that platform-api's public headers can find each other.

The pkg-config file's Cflags entry tells clients to -I${includedir}/ubuntu, but the public headers contain directives like "#include <ubuntu/foo/bar>". Cflags needs to remove the trailing "/ubuntu" to be the proper depth expected by the public headers.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:134
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~charlesk/platform-api/lp-1216473/+merge/181977/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/platform-api-ci/142/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-amd64-ci/112/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/112/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-i386-ci/112/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/142/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

Looks like it's failing for an unrelated issue; triggering a rebuild.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:134
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~charlesk/platform-api/lp-1216473/+merge/181977/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/platform-api-ci/145/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-amd64-ci/115
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/115
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/115/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-i386-ci/115

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/145/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) wrote :

This pretty old, it wanted?

review: Needs Information

Unmerged revisions

134. By Charles Kerr

in the pkg-config .pc file, return a Cflags include path consistent with our headers.

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