diff -Nru gramps-4.0.3+dfsg/debian/changelog gramps-4.0.3+dfsg/debian/changelog --- gramps-4.0.3+dfsg/debian/changelog 2014-02-09 08:22:23.000000000 +0000 +++ gramps-4.0.3+dfsg/debian/changelog 2014-06-06 03:37:27.000000000 +0000 @@ -1,3 +1,9 @@ +gramps (4.0.3+dfsg-2ubuntu1) trusty; urgency=medium + + * Fix bug preventing the editing of notes (LP: #1320596) + + -- Ross Gammon Mon, 02 Jun 2014 20:49:49 +0200 + gramps (4.0.3+dfsg-2) unstable; urgency=low * Correct gtkspell dependency (Closes: #737715) diff -Nru gramps-4.0.3+dfsg/debian/control gramps-4.0.3+dfsg/debian/control --- gramps-4.0.3+dfsg/debian/control 2014-02-09 08:22:23.000000000 +0000 +++ gramps-4.0.3+dfsg/debian/control 2014-06-06 03:39:15.000000000 +0000 @@ -1,7 +1,8 @@ Source: gramps Section: gnome Priority: optional -Maintainer: Ross Gammon +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ross Gammon Build-Depends-Indep: dh-python, gettext, diff -Nru gramps-4.0.3+dfsg/debian/patches/0004-Notes-always-say-no-data-exists-for-note-when-saving.patch gramps-4.0.3+dfsg/debian/patches/0004-Notes-always-say-no-data-exists-for-note-when-saving.patch --- gramps-4.0.3+dfsg/debian/patches/0004-Notes-always-say-no-data-exists-for-note-when-saving.patch 1970-01-01 00:00:00.000000000 +0000 +++ gramps-4.0.3+dfsg/debian/patches/0004-Notes-always-say-no-data-exists-for-note-when-saving.patch 2014-06-06 03:37:27.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Cannot edit notes in Gramps + This patch was applied in Debian for Gramps 4.0.3+dfsg-3 and was + cherrypicked from upstream repository. +Forwarded: not-needed +Origin: upstream, http://sourceforge.net/p/gramps/source/ci/ff5265605d39fd6eaa1914caa7a494a86dd9007f/ +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gramps/+bug/1320596 + +--- bug-1320596.orig/gramps/gui/widgets/styledtexteditor.py ++++ bug-1320596/gramps/gui/widgets/styledtexteditor.py +@@ -179,7 +179,8 @@ + self.textbuffer = UndoableStyledBuffer() + self.textbuffer.connect('style-changed', self._on_buffer_style_changed) + self.textbuffer.connect('changed', self._on_buffer_changed) +- GObject.GObject.__init__(self, buffer=self.textbuffer) ++ GObject.GObject.__init__(self) ++ self.set_buffer(self.textbuffer) + + st_cont = self.get_style_context() + col = st_cont.lookup_color('link_color') diff -Nru gramps-4.0.3+dfsg/debian/patches/series gramps-4.0.3+dfsg/debian/patches/series --- gramps-4.0.3+dfsg/debian/patches/series 2014-02-09 08:22:23.000000000 +0000 +++ gramps-4.0.3+dfsg/debian/patches/series 2014-06-06 03:37:27.000000000 +0000 @@ -1,3 +1,4 @@ 0001-Correct-resource-path-in-setup.py.patch 0002-Disable-HTML-View.patch 0003-7429-Fix-bug-when-an-empty-string-is-used-as-custom-.patch +0004-Notes-always-say-no-data-exists-for-note-when-saving.patch