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
** Changed in: gedit (Ubuntu)
Importance: Undecided => Wishlist
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1664529
Title:
Please merge gedit 3.22.0-1ubuntu2 (main) from Debian unstable (main)
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?
**
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.
** Attachment added: "debdiff"
https://bugs.launchpad.net/ubuntu/+source/gedit/+bug/1664529/+attachment/4824510/+files/debdiff
--
You received this bug
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
** Attachment added: "debdiff"
https://bugs.launchpad.net/ubuntu/+source/gedit/+bug/1664529/+attachment/4823495/+files/debdiff
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1664529
Title:
sorry to upload wrong diff. this one should be right one.
** Attachment added: "debdiff"
https://bugs.launchpad.net/ubuntu/+source/gedit/+bug/1664529/+attachment/4822365/+files/debdiff
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to
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
That debdiff is for a subversion merge
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1664529
Title:
Please merge gedit 3.22.0-1ubuntu2 (main) from Debian unstable (main)
To manage notifications
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:
10 matches
Mail list logo
