Merge into trunk : copyedits : Code : Mir

Status:

Merged

Approved by:

Robert Ancell on 2013-03-07

Approved revision:

no longer in the source branch.

Merged at revision:

473

Proposed branch:

lp://qastaging/~bryce/mir/copyedits

Merge into:

lp://qastaging/~mir-team/mir/trunk

Diff against target:

25 lines (+2/-2)

2 files modified

HACKING.md (+1/-1)
debian/copyright (+1/-1)

To merge this branch:

bzr merge lp://qastaging/~bryce/mir/copyedits

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2013-03-06	Approve on 2013-03-07
Didier Roche-Tolomelli		2013-03-06	Pending
Review via email: mp+152069@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2013-03-06.

Commit message

Removes a redundant 'the', and fixes title of LGPL-3 license to say 'Lesser' in the debian packaging files.

Description of the change

Removes a redundant 'the', and fixes title of LGPL-3 license to say 'Lesser' in the debian packaging files.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-03-06: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:465
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/~bryce/mir/copyedits/+merge/151860/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-ci/1142/
Executed test runs:
SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ci/./build=pbuilder,distribution=quantal,flavor=amd64/1142/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/1142//rebuild/?

review: Needs Fixing (continuous-integration)

Revision history for this message

Didier Roche-Tolomelli (didrocks) wrote on 2013-03-06: Posted in a previous version of this proposal

#

Hey Bryce,
debian/copyright needs to be refreshed anyway, it's out of sync with the upstream change I had to do prior the code opening. Mind refreshing it while you are at it?

review: Needs Fixing

Revision history for this message

Bryce Harrington (bryce) wrote on 2013-03-06: Posted in a previous version of this proposal

#

@Didier, I thought about doing that but I have NFI what it should actually say, so am probably not the right person to define that. So I just simplify my contribution to fixing the obvious error.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-03-06: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:465
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/~bryce/mir/copyedits/+merge/152055/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-ci/3/
Executed test runs:

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/3//rebuild/?