Merge lp://qastaging/~jtaylor/ubuntu/natty/update-manager/update-manager-fix-695186 into lp://qastaging/ubuntu/natty/update-manager
Proposed by
Julian Taylor
| Status: | Merged |
|---|---|
| Merge reported by: | Martin Pitt |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~jtaylor/ubuntu/natty/update-manager/update-manager-fix-695186 |
| Merge into: | lp://qastaging/ubuntu/natty/update-manager |
| Diff against target: |
38 lines (+9/-1) 4 files modified
debian/changelog (+7/-0) debian/update-manager-core.manpages (+1/-0) debian/update-manager.install (+0/-1) debian/update-manager.manpages (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~jtaylor/ubuntu/natty/update-manager/update-manager-fix-695186 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Pitt (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
use dh_installman instead of dh_install to install the manpages.
moves manpage of do-release-upgrade from update-manager to update-manager-core where also the script is located (LP: #695186)
To post a comment you must log in.
Revision history for this message
| Martin Pitt (pitti) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks for this!
Unfortunately you used the wrong branch (the real one is in the Vcs-Bzr: field, which "debcheckout update-manager" uses. So I can't directly merge this, but I'll take the diff and apply it to the real branch.
This also needs an extra Replaces: in debian/control to avoid breaking upgrades. I'll deal with this.