Merge ~rafaeldtinoco/ubuntu/+source/qemu:lp1828495-disco-devel-qemu into ubuntu/+source/qemu:ubuntu/disco-devel
Proposed by
Rafael David Tinoco
Status: | Merged |
---|---|
Merge reported by: | Christian Ehrhardt |
Merged at revision: | d4bf86763f4ca913f80016a735e5686c90a52570 |
Proposed branch: | ~rafaeldtinoco/ubuntu/+source/qemu:lp1828495-disco-devel-qemu |
Merge into: | ubuntu/+source/qemu:ubuntu/disco-devel |
Diff against target: |
49 lines (+20/-0) (has conflicts) 2 files modified
debian/changelog (+17/-0) debian/patches/series (+3/-0) Conflict in debian/changelog Conflict in debian/patches/series |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Bryce Harrington (community) | Approve | ||
Christian Ehrhardt (community) | Approve | ||
Ubuntu Virtualization Developers | Pending | ||
Ubuntu Core Development Team | Pending | ||
Canonical Server | Pending | ||
Review via email: mp+369470@code.launchpad.net |
To post a comment you must log in.
I'm not sure there's any standard or convention, but I've been putting the dep3 headers at the top of the patch file. I'm sure it doesn't matter technically but I figure they'll be more noticeable (and more likely to get updated) by future maintainers there.
I was a little confused by this:
+ Needed patches are in d/p/u/lp1828495-: arch-cap- when-no- msr.patch (LP: #1828495):
+ - 0011-disable-
which I interpreted to mean the patches would be named like
debian/ patches/ ubuntu/ lp1828495- 0011-disable- arch-cap- when-no- msr.patch
However, the series file and the patches themselves are named without the "lp1828495-" prefix.
Also, don't forget the link to the PPA.
I figure Christian will give a much more detailed review. I just checked that the patches are all in good order, the dep3 header elements match the patch, and that the patches are indeed present upstream.