Merge lp://qastaging/~etulfetulf/ubuntu/natty/tomboy/tomboy-fix-664963 into lp://qastaging/ubuntu/natty/tomboy

Proposed by Greg A
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp://qastaging/~etulfetulf/ubuntu/natty/tomboy/tomboy-fix-664963
Merge into: lp://qastaging/ubuntu/natty/tomboy
Diff against target: 37 lines (+9/-2)
2 files modified
debian/changelog (+6/-0)
debian/patches/04_app_indicator.patch (+3/-2)
To merge this branch: bzr merge lp://qastaging/~etulfetulf/ubuntu/natty/tomboy/tomboy-fix-664963
Reviewer Review Type Date Requested Status
Rodrigo Moya (community) Approve
Robert Roth (community) Approve
Ubuntu branches Pending
Review via email: mp+57074@code.qastaging.launchpad.net

Description of the change

Fixes LP: #664963 which is caused by a problem in the Ubuntu patch. This patch to the patch simply changes two lines as suggested by Sandy Armstrong (Tomboy developer).

To post a comment you must log in.
Revision history for this message
Robert Roth (evfool) wrote :

Looks fine, and the upstream developer of Tomboy has also suggested the same solution.

review: Approve
Revision history for this message
Rodrigo Moya (rodrigo-moya) wrote :

Looks good

review: Approve
Revision history for this message
Sebastien Bacher (seb128) wrote :

thank you for your work, setting it merged manually since the merge request was against the wrong vcs

Revision history for this message
Greg A (etulfetulf) wrote :

For future reference, what would have been the correct vcs?

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

to all changes: