diff -Nru terminator-1.91/debian/changelog terminator-1.91/debian/changelog
--- terminator-1.91/debian/changelog	2019-02-01 09:38:56.000000000 +0000
+++ terminator-1.91/debian/changelog	2019-02-28 20:16:02.000000000 +0000
@@ -1,3 +1,12 @@
+terminator (1.91-4) unstable; urgency=medium
+
+  * [3e6b8de] Add appdata_improvement.patch
+  * [5c47f94] Add patch to fix Drag&Drop under Python 3
+  * [7ba33fe] Add patch to fix Python 3 related issues with layout selection
+    (Closes: #921824)
+
+ -- Markus Frosch <lazyfrosch@debian.org>  Thu, 28 Feb 2019 21:16:02 +0100
+
 terminator (1.91-3) unstable; urgency=medium
 
   * [b66175a] control: Add missing dependency on dbus-x11 (Closes: #918149)
diff -Nru terminator-1.91/debian/patches/appdata_improvement.patch terminator-1.91/debian/patches/appdata_improvement.patch
--- terminator-1.91/debian/patches/appdata_improvement.patch	1970-01-01 00:00:00.000000000 +0000
+++ terminator-1.91/debian/patches/appdata_improvement.patch	2019-02-02 12:20:50.000000000 +0000
@@ -0,0 +1,43 @@
+Description: Improve metainfo, warnings and hints
+ * https URLs
+ * Illegal tag updatecontact
+ * Correct SPDX license
+Author: Markus Frosch <lazyfrosch@debian.org>
+Last-Update: 2019-02-02
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/data/terminator.appdata.xml.in
++++ b/data/terminator.appdata.xml.in
+@@ -3,7 +3,7 @@
+ <component type="desktop">
+  <id>terminator.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+- <project_license>GPL-2.0 only</project_license>
++ <project_license>GPL-2.0</project_license>
+  <_name>Terminator</_name>
+  <_summary>Multiple terminals in one window</_summary>
+  <description>
+@@ -33,18 +33,18 @@
+  </description>
+  <screenshots>
+   <screenshot type="default">
+-   <image>http://4.bp.blogspot.com/-xt4Tja1TMQ0/Vdemmf8wYSI/AAAAAAAAA9A/uROTre0PMls/s1600/terminator_main_basic.png</image>
++   <image>https://4.bp.blogspot.com/-xt4Tja1TMQ0/Vdemmf8wYSI/AAAAAAAAA9A/uROTre0PMls/s1600/terminator_main_basic.png</image>
+    <_caption>The main window showing the application in action</_caption>
+   </screenshot>
+   <screenshot>
+-   <image>http://4.bp.blogspot.com/-rRxALSpEEZw/Vdeu58JgpnI/AAAAAAAAA9o/XewWKJ5HNo4/s1600/terminator_main_complex.png</image>
++   <image>https://4.bp.blogspot.com/-rRxALSpEEZw/Vdeu58JgpnI/AAAAAAAAA9o/XewWKJ5HNo4/s1600/terminator_main_complex.png</image>
+    <_caption>Getting a little crazy with the terminals</_caption>
+   </screenshot>
+   <screenshot>
+-   <image>http://2.bp.blogspot.com/-t_8oRyMXUls/VdemmRVnZnI/AAAAAAAAA88/rHIr8L1X7Ho/s1600/terminator_prefs_global.png</image>
++   <image>https://2.bp.blogspot.com/-t_8oRyMXUls/VdemmRVnZnI/AAAAAAAAA88/rHIr8L1X7Ho/s1600/terminator_prefs_global.png</image>
+    <_caption>The preferences window where you can change the defaults</_caption>
+   </screenshot>
+  </screenshots>
+- <url type="homepage">http://gnometerminator.blogspot.com/p/introduction.html</url>
+- <updatecontact>stephen.j.boddy@gmail.com</updatecontact>
++ <url type="homepage">https://gnometerminator.blogspot.com/p/introduction.html</url>
++ <contact>mailto:stephen.j.boddy@gmail.com</contact>
+ </component>
diff -Nru terminator-1.91/debian/patches/python3_drag_n_drop.patch terminator-1.91/debian/patches/python3_drag_n_drop.patch
--- terminator-1.91/debian/patches/python3_drag_n_drop.patch	1970-01-01 00:00:00.000000000 +0000
+++ terminator-1.91/debian/patches/python3_drag_n_drop.patch	2019-02-28 19:51:35.000000000 +0000
@@ -0,0 +1,18 @@
+Description: Fix drag&drop for Python 3
+ Additional patch for Python 3 changes.
+Author: Markus Frosch <lazyfrosch@debian.org>
+Forwarded: TODO
+Last-Update: 2019-02-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/terminatorlib/terminal.py
++++ b/terminatorlib/terminal.py
+@@ -1008,7 +1008,7 @@
+             _time, data):
+         """I have no idea what this does, drag and drop is a mystery. sorry."""
+         selection_data.set(Gdk.atom_intern('vte', False), info,
+-                str(data.terminator.terminals.index(self)))
++                bytes(str(data.terminator.terminals.index(self)), 'utf-8'))
+ 
+     def on_drag_motion(self, widget, drag_context, x, y, _time, _data):
+         """*shrug*"""
diff -Nru terminator-1.91/debian/patches/python3_layouts.patch terminator-1.91/debian/patches/python3_layouts.patch
--- terminator-1.91/debian/patches/python3_layouts.patch	1970-01-01 00:00:00.000000000 +0000
+++ terminator-1.91/debian/patches/python3_layouts.patch	2019-02-28 20:15:06.000000000 +0000
@@ -0,0 +1,38 @@
+Description: Fix Python 3 related issues with layout selection
+ Additional patch for Python 3 changes.
+Author: Markus Frosch <lazyfrosch@debian.org>
+Bug-Debian: https://bugs.debian.org/921824
+Forwarded: TODO
+Last-Update: 2019-02-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/terminatorlib/layoutlauncher.py
++++ b/terminatorlib/layoutlauncher.py
+@@ -72,7 +72,7 @@
+         """Update the contents of the layout"""
+         self.layouttreestore.clear()
+         layouts = self.config.list_layouts()
+-        for layout in sorted(layouts, cmp=lambda x,y: cmp(x.lower(), y.lower())):
++        for layout in sorted(layouts, key=str.lower):
+             if layout != "default":
+                 self.layouttreestore.append([layout])
+             else:
+--- a/terminatorlib/notebook.py
++++ b/terminatorlib/notebook.py
+@@ -3,6 +3,7 @@
+ # GPL v2 only
+ """notebook.py - classes for the notebook widget"""
+ 
++from functools import cmp_to_key
+ from gi.repository import GObject
+ from gi.repository import Gtk
+ from gi.repository import Gdk
+@@ -100,7 +101,7 @@
+ 
+         num = 0
+         keys = list(children.keys())
+-        keys.sort(child_compare)
++        keys = sorted(keys, key=cmp_to_key(child_compare))
+ 
+         for child_key in keys:
+             child = children[child_key]
diff -Nru terminator-1.91/debian/patches/series terminator-1.91/debian/patches/series
--- terminator-1.91/debian/patches/series	2019-02-01 09:33:50.000000000 +0000
+++ terminator-1.91/debian/patches/series	2019-02-28 19:55:12.000000000 +0000
@@ -1,3 +1,6 @@
 not-install-terminator-wrapper.diff
 python3.diff
 appdata_in_metainfo.patch
+appdata_improvement.patch
+python3_drag_n_drop.patch
+python3_layouts.patch