debian/changelog

+mozo (1.22.1-2) unstable; urgency=medium
+
+  [ Martin Wimpress ]
+  * debian/patches:
+    + Add 0002_DnD_undo_redo_copies_fixes.patch. Fix item drag & drop creating
+      copies, fix undo, fix redo and prevent a crash when refreshing.
+
+  [ Mike Gabriel ]
+  * debian/patches:
+    + Cherry-pick 0001_fix-drag-and-drop-of-desktop-files.patch from upstream.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Thu, 08 Aug 2019 12:56:44 +0200
+
 mozo (1.22.1-1) unstable; urgency=medium
 
   [ Martin Wimpress ]

debian/patches/0001_fix-drag-and-drop-of-desktop-files.patch

+From 38232679bf89add784cbadfa5196440b20115ae5 Mon Sep 17 00:00:00 2001
+From: Sam Tygier <sam.tygier@manchester.ac.uk>
+Date: Tue, 14 May 2019 19:34:34 +0100
+Subject: [PATCH] Fix drag and drop of .desktop file
+
+Update for gtk3 API changes in SelectionData, Gio.File, Gio.InputStream
+and urllib.
+---
+ Mozo/MainWindow.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Mozo/MainWindow.py b/Mozo/MainWindow.py
+index 4ca5b84..01639b9 100644
+--- a/Mozo/MainWindow.py
++++ b/Mozo/MainWindow.py
+@@ -28,7 +28,7 @@
+ import gettext
+ import subprocess
+ import shutil
+-import urllib
++import urllib.parse
+ try:
+     from Mozo import config
+     gettext.bindtextdomain(config.GETTEXT_PACKAGE,config.localedir)
+@@ -543,7 +543,7 @@ def on_item_tree_drag_data_received(self, treeview, context, x, y, selection, in
+                 self.editor.moveSeparator(item, destination, before, after)
+             context.finish(True, True, etime)
+         elif str(selection.get_target()) == 'text/plain':
+-            if selection.data is None:
++            if selection.get_data() is None:
+                 return False
+             menus, iter = self.tree.get_object('menu_tree').get_selection().get_selected()
+             parent = menus[iter][2]
+@@ -559,16 +559,16 @@ def on_item_tree_drag_data_received(self, treeview, context, x, y, selection, in
+             else:
+                 path = (len(items) - 1,)
+                 after = items[path][3]
+-            file_path = urllib.unquote(selection.data).strip()
++            file_path = urllib.parse.unquote(selection.get_data().decode("utf-8")).strip()
+             if not file_path.startswith('file:'):
+                 return
+-            myfile = Gio.File(uri=file_path)
+-            file_info = myfile.query_info(Gio.FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE)
++            myfile = Gio.File.new_for_uri(uri=file_path)
++            file_info = myfile.query_info(Gio.FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, Gio.FileQueryInfoFlags.NONE)
+             content_type = file_info.get_content_type()
+             if content_type == 'application/x-desktop':
+                 input_stream = myfile.read()
+                 keyfile = GLib.KeyFile()
+-                keyfile.load_from_data(input_stream.read())
++                keyfile.load_from_bytes(input_stream.read_bytes(1024*1024), GLib.KeyFileFlags.NONE)
+                 self.editor.createItem(parent, before, after, KeyFile=keyfile)
+             elif content_type in ('application/x-shellscript', 'application/x-executable'):
+                 self.editor.createItem(parent, before, after,
+

debian/patches/series

-0001_DnD_undo_redo_copies_fixes.patch
\ No newline at end of file
+0001_fix-drag-and-drop-of-desktop-files.patch
+0002_DnD_undo_redo_copies_fixes.patch