diff -Nru twodict-1.2/debian/changelog twodict-1.2/debian/changelog --- twodict-1.2/debian/changelog 2021-12-12 22:42:27.000000000 +0000 +++ twodict-1.2/debian/changelog 2022-02-20 19:13:51.000000000 +0000 @@ -1,9 +1,20 @@ -twodict (1.2-2ubuntu1) jammy; urgency=medium +twodict (1.2-3) unstable; urgency=medium - * debian/patches/python-3.10.patch: Compatibility with python 3.10. - Closes: #1001489. + * Team upload. - -- Steve Langasek Sun, 12 Dec 2021 22:42:27 +0000 + [ Ondřej Nový ] + * d/control: Update Maintainer field with new Debian Python Team + contact address. + * d/control: Update Vcs-* fields with new Debian Python Team Salsa + layout. + + [ Timo Röhling ] + * Import abstract base classes from collections.abc (Closes: #1001489) + * Bump Standards-Version to 4.6.0 + * Bump debhelper compat to 13 + * Upgrade d/watch to version 4 format + + -- Timo Röhling Sun, 20 Feb 2022 20:13:51 +0100 twodict (1.2-2) unstable; urgency=medium diff -Nru twodict-1.2/debian/control twodict-1.2/debian/control --- twodict-1.2/debian/control 2021-12-12 22:42:27.000000000 +0000 +++ twodict-1.2/debian/control 2022-02-20 19:13:35.000000000 +0000 @@ -1,17 +1,16 @@ Source: twodict -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Python Modules Team +Maintainer: Debian Python Team Uploaders: Félix Sipma Priority: optional Section: python -Build-Depends: debhelper-compat (= 10), +Build-Depends: debhelper-compat (= 13), dh-python, python3-all, python3-setuptools -Standards-Version: 4.1.3 +Standards-Version: 4.6.0 Homepage: https://github.com/MrS0m30n3/twodict -Vcs-Git: https://salsa.debian.org/python-team/modules/twodict.git -Vcs-Browser: https://salsa.debian.org/python-team/modules/twodict +Vcs-Git: https://salsa.debian.org/python-team/packages/twodict.git +Vcs-Browser: https://salsa.debian.org/python-team/packages/twodict Testsuite: autopkgtest-pkg-python Package: python3-twodict diff -Nru twodict-1.2/debian/patches/0001-Import-abstract-base-classes-from-collections.abc.patch twodict-1.2/debian/patches/0001-Import-abstract-base-classes-from-collections.abc.patch --- twodict-1.2/debian/patches/0001-Import-abstract-base-classes-from-collections.abc.patch 1970-01-01 00:00:00.000000000 +0000 +++ twodict-1.2/debian/patches/0001-Import-abstract-base-classes-from-collections.abc.patch 2022-02-20 19:12:29.000000000 +0000 @@ -0,0 +1,48 @@ +From: =?utf-8?q?Timo_R=C3=B6hling?= +Date: Sun, 20 Feb 2022 20:12:28 +0100 +Subject: Import abstract base classes from collections.abc + +--- + twodict.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/twodict.py b/twodict.py +index 824e539..efbd342 100644 +--- a/twodict.py ++++ b/twodict.py +@@ -6,7 +6,7 @@ Attributes: + """ + + import sys +-import collections ++import collections.abc + + + __all__ = ["TwoWayOrderedDict"] +@@ -22,7 +22,7 @@ _DEFAULT_OBJECT = object() + ########## Custom views to mimic Python3 view objects ########## + # See: https://docs.python.org/3/library/stdtypes.html#dict-views + +-class DictKeysView(collections.KeysView): ++class DictKeysView(collections.abc.KeysView): + + def __init__(self, data): + super(DictKeysView, self).__init__(data) +@@ -35,7 +35,7 @@ class DictKeysView(collections.KeysView): + return key in [key for key in self.__data] + + +-class DictValuesView(collections.ValuesView): ++class DictValuesView(collections.abc.ValuesView): + + def __init__(self, data): + super(DictValuesView, self).__init__(data) +@@ -48,7 +48,7 @@ class DictValuesView(collections.ValuesView): + return value in [self.__data[key] for key in self.__data] + + +-class DictItemsView(collections.ItemsView): ++class DictItemsView(collections.abc.ItemsView): + + def __init__(self, data): + super(DictItemsView, self).__init__(data) diff -Nru twodict-1.2/debian/patches/python-3.10.patch twodict-1.2/debian/patches/python-3.10.patch --- twodict-1.2/debian/patches/python-3.10.patch 2021-12-12 22:42:22.000000000 +0000 +++ twodict-1.2/debian/patches/python-3.10.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -Description: Compatibility with python 3.10 -Author: Steve Langasek -Bug-Debian: https://bugs.debian.org/1001489 -Last-Update: 2021-12-11 -Forwarded: no - -Index: twodict-1.2/twodict.py -=================================================================== ---- twodict-1.2.orig/twodict.py -+++ twodict-1.2/twodict.py -@@ -6,7 +6,7 @@ - """ - - import sys --import collections -+import collections.abc as collections - - - __all__ = ["TwoWayOrderedDict"] diff -Nru twodict-1.2/debian/patches/series twodict-1.2/debian/patches/series --- twodict-1.2/debian/patches/series 2021-12-12 22:42:22.000000000 +0000 +++ twodict-1.2/debian/patches/series 2022-02-20 19:12:29.000000000 +0000 @@ -1 +1 @@ -python-3.10.patch +0001-Import-abstract-base-classes-from-collections.abc.patch diff -Nru twodict-1.2/debian/watch twodict-1.2/debian/watch --- twodict-1.2/debian/watch 2019-07-25 14:43:40.000000000 +0000 +++ twodict-1.2/debian/watch 2022-02-20 19:13:51.000000000 +0000 @@ -1,4 +1,3 @@ -version=3 - -opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/twodict-$1\.tar\.gz/ \ +version=4 +opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/@PACKAGE@-$1\.tar\.gz/ \ https://github.com/MrS0m30n3/twodict/tags .*/v?(\d\S*)\.tar\.gz