please post the right diff. From the changelog you gave in comment #1, it looks weird. I would expect it to be more or less the same as the last merge:
* Merge with Debian. Remaining changes: - debian/control.in: + gedit replaces gedit-common (<< 3.18.1-1ubuntu1) + bump gnome-pkg-tools build-depends version for compatibility rule - debian/rules: + create compatiblity desktop file for upgraders + Build without --Bsymbolic-functions to fix issues - debian/patches/05_menu_label.patch: + Don't display in menu as "gedit Text Editor" - debian/patches/unity_no_csd.patch: + don't use GtkHeaderBar decorations under Unity - 0001-Allows-to-have-the-close-button-on-the-left-corner.patch: Take patch from bgo #745381 to fix the close button in all cases -- You received this bug notification because you are a member of Desktop Packages, 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) Status in gedit package in Ubuntu: In Progress Bug description: Please merge gedit 3.22.0-1ubuntu2 (main) from Debian unstable (main) base: 3.22.0-1 gedit_3.22.0-1.dsc gedit_3.22.0.orig.tar.xz gedit_3.22.0-1.debian.tar.xz ubuntu: 3.22.0-1ubuntu2 gedit_3.22.0-1ubuntu2.dsc gedit_3.22.0.orig.tar.xz gedit_3.22.0-1ubuntu2.debian.tar.xz base -> ubuntu gedit_3.22.0-1ubuntu2.patch debian: 3.22.0-2 gedit_3.22.0-2.dsc gedit_3.22.0.orig.tar.xz gedit_3.22.0-2.debian.tar.xz base -> debian gedit_3.22.0-2.patch To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/gedit/+bug/1664529/+subscriptions -- Mailing list: https://launchpad.net/~desktop-packages Post to : desktop-packages@lists.launchpad.net Unsubscribe : https://launchpad.net/~desktop-packages More help : https://help.launchpad.net/ListHelp