The attached debdiff when applied to the Debian sources processes the merge.
** Attachment added: "debdiff for merge" http://librarian.launchpad.net/7417814/M110417.patch ** Changed in: vegastrike (Ubuntu) Assignee: Emmet Hikory => (unassigned) -- merge vegastrike 0.4.3.debian-1 from Debian unstable https://bugs.launchpad.net/bugs/110417 You received this bug notification because you are a member of Ubuntu Bugs, which is the bug contact for Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs