Please merge gedit 3.22.0-1ubuntu2 (main) from Debian unstable (main)

[FanJun Kong - ( BH1SCW )]

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

[FanJun Kong - ( BH1SCW ) (fjkong)]

gedit (3.22.0-2ubuntu2) zesty; urgency=medium

  * Merge with Debian. Remaining changes:
    - debian/patches/unity_no_csd.patch:
      + don't use GtkHeaderBar decorations under Unity
  [ Pietro Battiston ]
  * Add debian/patches/09_fix_plugin_load_segfault.patch from upstream
    (Closes: #770153)

 -- FJKong <email address hidden> Tue, 14 Feb 2017 18:14:21 +0800

[Iain Lane (laney)]

That debdiff is for a subversion merge

[Iain Lane (laney)]

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

[FanJun Kong - ( BH1SCW ) (fjkong)]

sorry to upload wrong diff. this one should be right one.

[Iain Lane (laney)]

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.

[FanJun Kong - ( BH1SCW ) (fjkong)]

Hi, Laney

I update the changelog as what you said, expect for copy from previous one I made it a little bit detail, thanks for reviewing.

[Iain Lane (laney)]

I've uploaded, thanks.

I moved the bug number up to the first line of the changelog. It's more normal to have it there.

Not sure what you're doing, but your patches are showing up as text/html, which means you can't easily view them in a web browser. Can you fix that for next time please?

[Launchpad Janitor (janitor)]

This bug was fixed in the package gedit - 3.22.0-2ubuntu1

---------------
gedit (3.22.0-2ubuntu1) zesty; urgency=medium

  * Merge with Debian (LP: #1664529). Remaining changes:
    - debian/control.in:
      + gedit replaces gedit-common (<< 3.18.1-1ubuntu1)
      + bump gnome-pkg-tools build-depends version for compatibility rule
        + gnome-pkg-tools (>= 0.19.5ubuntu2),
        + libgtk-3-dev -> (>= 3.21.3)
    - 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

gedit (3.22.0-2) unstable; urgency=medium

  [ Pietro Battiston ]
  * Add debian/patches/09_fix_plugin_load_segfault.patch from upstream
    (Closes: #770153)

 -- FJKong <email address hidden> Tue, 14 Feb 2017 18:14:21 +0800