Merge lp://staging/~ted/indicator-power/startup-cleanup into lp://staging/indicator-power/14.10

Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 234
Merged at revision: 258
Proposed branch: lp://staging/~ted/indicator-power/startup-cleanup
Merge into: lp://staging/indicator-power/14.10
Diff against target: 81 lines (+37/-8)
4 files modified
data/CMakeLists.txt (+21/-0)
data/indicator-power.conf.in (+4/-6)
data/indicator-power.desktop.in (+2/-2)
data/indicator-power.upstart.desktop.in (+10/-0)
To merge this branch: bzr merge lp://staging/~ted/indicator-power/startup-cleanup
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+222089@code.staging.launchpad.net

This proposal supersedes a proposal from 2014-02-22.

Commit message

Synchronize process management across indicators

Description of the change

This merge goes along with all of the other "startup-cleanup" merges to create a consistent startup for all indicators.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote : Posted in a previous version of this proposal

I built debs for all the startup-cleanup branches and tested them out; WfM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
234. By Ted Gould

Adding lcov 1.11

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) :
review: Approve
235. By Ted Gould

Merge trunk

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