Dear maintainer,
I've prepared an NMU for hyperkitty (versioned as 1.3.0-1.1). The diff
is attached to this message.
Regards.
diff -Nru hyperkitty-1.3.0/debian/changelog hyperkitty-1.3.0/debian/changelog
--- hyperkitty-1.3.0/debian/changelog 2019-10-27 08:21:44.000000000 -0400
+++ hyperkitty-1.3.0/debian/changelog 2020-01-02 16:17:27.000000000 -0500
@@ -1,3 +1,11 @@
+hyperkitty (1.3.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches/MR201.patch
+ - make hyperkitty compatible with networkx 2.4; Closes: #945392
+
+ -- Sandro Tosi <mo...@debian.org> Thu, 02 Jan 2020 16:17:27 -0500
+
hyperkitty (1.3.0-1) unstable; urgency=medium
[ Jonas Meurer ]
diff -Nru hyperkitty-1.3.0/debian/patches/MR201.patch hyperkitty-1.3.0/debian/patches/MR201.patch
--- hyperkitty-1.3.0/debian/patches/MR201.patch 1969-12-31 19:00:00.000000000 -0500
+++ hyperkitty-1.3.0/debian/patches/MR201.patch 2020-01-02 16:16:44.000000000 -0500
@@ -0,0 +1,47 @@
+From c95c00276000f48f1ac2d211450f54454e74fe9c Mon Sep 17 00:00:00 2001
+From: Abhilash Raj <raj.abhila...@gmail.com>
+Date: Sun, 17 Nov 2019 19:17:45 -0800
+Subject: [PATCH] Fix for networkx 2.4
+
+---
+ hyperkitty/lib/analysis.py | 4 ++--
+ setup.py | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/hyperkitty/lib/analysis.py b/hyperkitty/lib/analysis.py
+index 87120fba..cfaba7a3 100644
+--- a/hyperkitty/lib/analysis.py
++++ b/hyperkitty/lib/analysis.py
+@@ -34,14 +34,14 @@ def compute_thread_order_and_depth(thread):
+ thread_pos = {"d": 0, "o": 0} # depth, order
+
+ def walk_successors(msgid):
+- obj = graph.node[msgid]["obj"]
++ obj = graph.nodes[msgid]["obj"]
+ obj.thread_depth = thread_pos["d"]
+ obj.thread_order = thread_pos["o"]
+ obj.save(update_fields=["thread_depth", "thread_order"])
+ thread_pos["d"] += 1
+ thread_pos["o"] += 1
+ for succ in sorted(graph.successors(msgid),
+- key=lambda m: graph.node[m]["num"]):
++ key=lambda m: graph.nodes[m]["num"]):
+ walk_successors(succ)
+ thread_pos["d"] -= 1
+ for index, email in enumerate(thread.emails.order_by("date")):
+diff --git a/setup.py b/setup.py
+index 1844d7f7..48a30c95 100755
+--- a/setup.py
++++ b/setup.py
+@@ -46,7 +46,7 @@ REQUIRES = [
+ "django-compressor>=1.3",
+ "mailmanclient>=3.1.1",
+ "python-dateutil >= 2.0",
+- "networkx>=1.9.1",
++ "networkx>=2.0",
+ "django-haystack>=2.8.0",
+ "django-extensions>=1.3.7",
+ "flufl.lock",
+--
+2.24.1
+
diff -Nru hyperkitty-1.3.0/debian/patches/series hyperkitty-1.3.0/debian/patches/series
--- hyperkitty-1.3.0/debian/patches/series 2019-10-27 07:55:34.000000000 -0400
+++ hyperkitty-1.3.0/debian/patches/series 2020-01-02 16:16:44.000000000 -0500
@@ -1,3 +1,4 @@
0001_README_remove_embedded_images.patch
0002_Use_python3_by_default.patch
0003-run-sassc-at-build-time.patch
+MR201.patch
