Bug#1000315: compreffor: diff for NMU version 0.5.1-1.1
Control: tags 1000315 + patch
Control: tags 1000315 + pending
Dear maintainer,
I've prepared an NMU for compreffor (versioned as 0.5.1-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Also filed as an MR: https://salsa.debian.org/fonts-team/compreffor/-/merge_requests/1
Regards,
SR
diff -Nru compreffor-0.5.1/debian/changelog compreffor-0.5.1/debian/changelog
--- compreffor-0.5.1/debian/changelog 2021-01-07 11:16:12.000000000 -0400
+++ compreffor-0.5.1/debian/changelog 2021-11-21 08:20:06.000000000 -0400
@@ -1,3 +1,10 @@
+compreffor (0.5.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Patch: Update collections.abc imports for Python 3.10 (Closes: #1000315)
+
+ -- Stefano Rivera <stefanor@debian.org> Sun, 21 Nov 2021 08:20:06 -0400
+
compreffor (0.5.1-1) unstable; urgency=medium
* Team upload
diff -Nru compreffor-0.5.1/debian/patches/python-3.10.patch compreffor-0.5.1/debian/patches/python-3.10.patch
--- compreffor-0.5.1/debian/patches/python-3.10.patch 1969-12-31 20:00:00.000000000 -0400
+++ compreffor-0.5.1/debian/patches/python-3.10.patch 2021-11-21 08:20:06.000000000 -0400
@@ -0,0 +1,27 @@
+From: Hugo van Kemenade <hugovk@users.noreply.github.com>
+Date: Fri, 7 May 2021 20:41:49 +0300
+Subject: Fix collections.abc import for Python 3.9 (#142)
+
+Origin: upstream, https://github.com/googlefonts/compreffor/pull/142
+Bug-Debian: https://bugs.debian.org/1000315
+---
+ src/python/compreffor/test/dummy.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/python/compreffor/test/dummy.py b/src/python/compreffor/test/dummy.py
+index 483f1cf..72e5c3c 100644
+--- a/src/python/compreffor/test/dummy.py
++++ b/src/python/compreffor/test/dummy.py
+@@ -13,9 +13,10 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
+-import collections
++import collections.abc
+
+-class DummyGlyphSet(collections.MutableMapping):
++
++class DummyGlyphSet(collections.abc.MutableMapping):
+ """Behaves like a glyphset for testing purposes"""
+
+ def __init__(self, *args, **kwargs):
diff -Nru compreffor-0.5.1/debian/patches/series compreffor-0.5.1/debian/patches/series
--- compreffor-0.5.1/debian/patches/series 1969-12-31 20:00:00.000000000 -0400
+++ compreffor-0.5.1/debian/patches/series 2021-11-21 08:20:06.000000000 -0400
@@ -0,0 +1 @@
+python-3.10.patch
Reply to: