Mir

Merge lp:~bryce/mir/copyedits into lp:~mir-team/mir/trunk

Proposed by Bryce Harrington
Status: Superseded
Proposed branch: lp:~bryce/mir/copyedits
Merge into: lp:~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:~bryce/mir/copyedits
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Didier Roche-Tolomelli Pending
Review via email: mp+152055@code.launchpad.net

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

This proposal has been superseded by 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.

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

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 : 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 : 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 :

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/?

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'HACKING.md'
2--- HACKING.md 2013-03-04 16:35:47 +0000
3+++ HACKING.md 2013-03-06 20:59:24 +0000
4@@ -51,7 +51,7 @@
5 of the system. For example, include/mir/option/option.h provides a system-wide interface
6 for accessing runtime options published by the options component.
7
8-In many cases, there will be interfaces defined that are used by the the component
9+In many cases, there will be interfaces defined that are used by the component
10 and implemented elsewhere. E.g. the compositor uses RenderView which is implemented
11 by the surfaces component.
12
13
14=== modified file 'debian/copyright'
15--- debian/copyright 2013-01-11 08:22:54 +0000
16+++ debian/copyright 2013-03-06 20:59:24 +0000
17@@ -7,7 +7,7 @@
18 Copyright: 2012-2013, Canonical Ltd.
19 License: LGPL-3
20 This program is free software: you can redistribute it and/or modify
21- it under the terms of the GNU General Public License version 3 as
22+ it under the terms of the GNU Lesser General Public License version 3 as
23 published by the Free Software Foundation.
24 .
25 This program is distributed in the hope that it will be useful,

Subscribers

People subscribed via source and target branches