Merge lp://qastaging/~nobuto/ubuntu/raring/ecryptfs-utils/fix-empty-window into lp://qastaging/ubuntu/raring/ecryptfs-utils

Proposed by Nobuto Murata
Status: Merged
Merge reported by: Marc Deslauriers
Merged at revision: not available
Proposed branch: lp://qastaging/~nobuto/ubuntu/raring/ecryptfs-utils/fix-empty-window
Merge into: lp://qastaging/ubuntu/raring/ecryptfs-utils
Diff against target: 28 lines (+10/-0)
2 files modified
debian/changelog (+7/-0)
debian/rules (+3/-0)
To merge this branch: bzr merge lp://qastaging/~nobuto/ubuntu/raring/ecryptfs-utils/fix-empty-window
Reviewer Review Type Date Requested Status
Marc Deslauriers Approve
Ubuntu branches Pending
Review via email: mp+149465@code.qastaging.launchpad.net

Description of the change

The hook in debian/rules was added at 101-0ubuntu2 as a part of making an update-notifier window translatable.
 http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/raring/ecryptfs-utils/raring/revision/88#debian/rules

But it was removed at 102-0ubuntu1 accidentally on merge, I think.
http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/raring/ecryptfs-utils/raring/revision/90#debian/rules

This branch re-adds the part to fix an empty update-notifier window.

To post a comment you must log in.
Revision history for this message
Nobuto Murata (nobuto) wrote :

Why we have to remove translations markers after pot created is explained here:
 https://wiki.ubuntu.com/InteractiveUpgradeHooks

Revision history for this message
Marc Deslauriers (mdeslaur) wrote :

Looks good. ACK. Uploaded, thanks.

Could you please propose this for merging upstream also, so it doesn't get lost?:

https://code.launchpad.net/~ecryptfs/ecryptfs/trunk

Thanks!

review: Approve

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: