Merge lp:~vorlon/ubuntu/natty/qemu-kvm/qemu-kvm-not-qemu-user into lp:ubuntu/natty/qemu-kvm
Proposed by
Steve Langasek
| Status: | Merged |
|---|---|
| Merged at revision: | 108 |
| Proposed branch: | lp:~vorlon/ubuntu/natty/qemu-kvm/qemu-kvm-not-qemu-user |
| Merge into: | lp:ubuntu/natty/qemu-kvm |
| Diff against target: |
99 lines (+30/-23) 5 files modified
debian/changelog (+7/-0) debian/qemu-kvm-extras.links (+15/-15) debian/qemu-kvm.1 (+5/-5) debian/qemu-kvm.links (+2/-2) debian/qemu-kvm.manpages (+1/-1) |
| To merge this branch: | bzr merge lp:~vorlon/ubuntu/natty/qemu-kvm/qemu-kvm-not-qemu-user |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Serge Hallyn | Needs Resubmitting | ||
|
Review via email:
|
|||
Description of the change
Rename 'qemu-user' manpage to 'qemu-kvm', so that qemu-linaro can have the more generic manpage name.
This can be uploaded before qemu-linaro is accepted into the archive with no ill effects; or the upload can be held until also dropping the qemu-kvm-extras* packages. But I would like confirmation that it will be merged at this version number, so I can upload qemu-linaro with a matching Replaces:.
To post a comment you must log in.
Revision history for this message
| Steve Langasek (vorlon) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
No objection from me, although the first few lines of the qemu-kvm manpage should probably also be changed so as to reflect that fact that it no longer provides support for different architectures. Then again, perhaps we want to avoid throwing too much likely-confusing information to the end-user...