The effective diff following Jonathan's proposed change in https://launchpad.net/distros/ubuntu/+source/katapult/+bug/69479/comments/20 (calculated by applying the patches on both sides and then excluding debian/patches from the resulting diff) is attached. This is somewhat more legible than the diff-of-a-diff nightmare that patch systems inflict upon us for this sort of thing.
** Attachment added: "proposed effective diff" http://librarian.launchpad.net/5435448/katapult-effective.diff -- SRU: katapult https://launchpad.net/bugs/69479 -- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
