trust-store

Merge lp://staging/~thomas-voss/trust-store/fix-1452341 into lp://staging/trust-store

  1. fix-1452341
  2. Merge into trunk
Proposed by Alfonso Sanchez-Beato
Status: Needs review
Proposed branch: lp://staging/~thomas-voss/trust-store/fix-1452341
Merge into: lp://staging/trust-store
Diff against target: 161 lines (+36/-13) (has conflicts)
6 files modified
CMakeLists.txt (+2/-2)
debian/changelog (+9/-0)
debian/control (+5/-11)
debian/rules (+14/-0)
src/core/trust/mir/agent.cpp (+4/-0)
src/core/trust/mir/prompt_main.cpp (+2/-0)
Text conflict in debian/changelog
Contents conflict in debian/libtrust-store1.symbols
Text conflict in debian/rules
Text conflict in src/core/trust/mir/agent.cpp
To merge this branch: bzr merge lp://staging/~thomas-voss/trust-store/fix-1452341
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Marcus Tomlinson Pending
PS Jenkins bot continuous-integration Pending
Pete Woods Pending
Review via email: mp+269636@code.staging.launchpad.net

This proposal supersedes a proposal from 2015-07-23.

Commit message

Bump major revision to account for toolchain update.

Description of the change

Bump major revision to account for toolchain update.

To post a comment you must log in.
Revision history for this message
Pete Woods (pete-woods) wrote : Posted in a previous version of this proposal

Looks reasonable to me. Good luck getting the symbols removal though, though.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:107
http://jenkins.qa.ubuntu.com/job/trust-store-ci/90/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/trust-store-ci/90/rebuild

review: Approve (continuous-integration)
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote : Posted in a previous version of this proposal

Very OCD I know:

86 Description: Test files for libtrust-store1

"libtrust-store2" now

Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote : Posted in a previous version of this proposal

Top approving again to mark rev.108 as approved.

review: Approve
Revision history for this message
Michael Vogt (mvo) wrote : Posted in a previous version of this proposal

Looks good to me.

review: Approve

Unmerged revisions

108. By Thomas Voß

Fix package name in description.

107. By Thomas Voß

Fix minor compilation issues.
Account for major version bump and rename .install file.

106. By Thomas Voß

Bump major revision to account for toolchain update. Fixes LP:#1452341

105. By Launchpad Translations on behalf of phablet-team

Launchpad automatic translations update.

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