Merge lp://staging/~unity-api-team/unity-scopes-api/gcc-5-fixes into lp://staging/unity-scopes-api/devel
Proposed by
Michi Henning
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~unity-api-team/unity-scopes-api/gcc-5-fixes |
| Merge into: | lp://staging/unity-scopes-api/devel |
| Diff against target: |
1678 lines (+17/-1604) 7 files modified
HACKING (+0/-22) debian/control (+1/-2) debian/libunity-scopes-qt.symbols (+0/-314) debian/libunity-scopes3.symbols (+0/-1107) test/gtest/scopes/internal/ScopeConfig/CMakeLists.txt (+16/-16) tools/CMakeLists.txt (+0/-1) tools/symbol_diff.in (+0/-142) |
| To merge this branch: | bzr merge lp://staging/~unity-api-team/unity-scopes-api/gcc-5-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Unity Team | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2015-07-24.
Commit message
Updated standards version to 3.9.6 in debian/control.
Removed copyonly from configure() calls because cmake 3.2.2 doesn't like it.
Removed symbols file and associated tools.
Removed g++ dependency from debian/control because bzr bd emitted a warning.
Description of the change
Updated standards version to 3.9.6 in debian/control.
Removed copyonly from configure() calls because cmake 3.2.2 doesn't like it.
Removed symbols file and associated tools.
Removed g++ dependency from debian/control because bzr bd emitted a warning.
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:619
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:/
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://