Apart from the changelog, this looks right. What you have in this diff is: + * Merge with Debian. Remaining changes: + - debian/patches/unity_no_csd.patch: + + don't use GtkHeaderBar decorations under Unity
But the merge changelog entry should include all changes that we've got on top of Debian. If you do "debdiff new_debian.dsc new_ubuntu.dsc" after finishing the merge, all of those changes should be described in the changelog. Please could you update it? As I said in comment #3, you could copy and paste the one from the previous merge. Make sure you include "(LP: #1664529)" so that this bug gets automatically closed when I upload the package. -- You received this bug notification because you are a member of Ubuntu Desktop Bugs, which is subscribed to gedit in Ubuntu. https://bugs.launchpad.net/bugs/1664529 Title: Please merge gedit 3.22.0-1ubuntu2 (main) from Debian unstable (main) To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/gedit/+bug/1664529/+subscriptions -- desktop-bugs mailing list desktop-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/desktop-bugs
