Merge lp://staging/~thomas-voss/trust-store/fix-1452341 into lp://staging/trust-store
Proposed by
Thomas Voß
| Status: | Superseded | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~thomas-voss/trust-store/fix-1452341 | ||||
| Merge into: | lp://staging/trust-store | ||||
| Diff against target: |
305 lines (+17/-183) 7 files modified
CMakeLists.txt (+2/-3) debian/changelog (+6/-0) debian/control (+5/-11) debian/libtrust-store1.symbols (+0/-162) debian/rules (+1/-6) src/core/trust/mir/agent.cpp (+1/-1) src/core/trust/mir/prompt_main.cpp (+2/-0) |
||||
| To merge this branch: | bzr merge lp://staging/~thomas-voss/trust-store/fix-1452341 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Vogt (community) | Approve | ||
| Marcus Tomlinson (community) | Approve | ||
| PS Jenkins bot | continuous-integration | Approve | |
| Pete Woods (community) | Approve | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2015-08-31.
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
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Marcus Tomlinson (marcustomlinson) wrote | # |
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
Looks reasonable to me. Good luck getting the symbols removal though, though.