diff -Nru python-potr-1.0.2/debian/changelog python-potr-1.0.2/debian/changelog --- python-potr-1.0.2/debian/changelog 2020-10-01 00:14:15.000000000 +0000 +++ python-potr-1.0.2/debian/changelog 2021-01-22 21:37:37.000000000 +0000 @@ -1,3 +1,13 @@ +python-potr (1.0.2-4) unstable; urgency=medium + + * d/changelog: release + * d/control: add pycryptodome as Depends on package (Closes: 980473) + - Add 0002-Use-of-Cryptodome-module-imports-instead-of-Crypto.patch + * d/gbp.conf: Set debian/master as default branch. + * d/control: Set autopkgtest. + + -- Emmanuel Arias Fri, 22 Jan 2021 22:37:37 +0100 + python-potr (1.0.2-3) unstable; urgency=medium * Team upload. diff -Nru python-potr-1.0.2/debian/control python-potr-1.0.2/debian/control --- python-potr-1.0.2/debian/control 2020-10-01 00:14:15.000000000 +0000 +++ python-potr-1.0.2/debian/control 2021-01-22 21:36:27.000000000 +0000 @@ -2,23 +2,32 @@ Section: python Priority: optional Maintainer: Debian Python Team -Uploaders: Hans-Christoph Steiner -Build-Depends: debhelper-compat (= 13), - dh-python, - python3-all, - python3-setuptools, - python3-pycryptodome +Uploaders: + Hans-Christoph Steiner , +Build-Depends: + debhelper-compat (= 13), + dh-python, + python3-all, + python3-pycryptodome, + python3-setuptools, Standards-Version: 4.5.0 Homepage: https://github.com/python-otr/pure-python-otr Vcs-Git: https://salsa.debian.org/python-team/packages/python-potr.git Vcs-Browser: https://salsa.debian.org/python-team/packages/python-potr +Testsuite: autopkgtest-pkg-python Package: python3-potr Architecture: all -Depends: ${misc:Depends}, ${python3:Depends} -Provides: ${python3:Provides} -Breaks: python-potr -Replaces: python-potr +Depends: + python3-pycryptodome, + ${misc:Depends}, + ${python3:Depends}, +Provides: + ${python3:Provides}, +Breaks: + python-potr, +Replaces: + python-potr, Description: Pure Python implementation of the OTR protocol (Python 3) pure-python-otr is a pure Python implementation of the OTR protocol (Off-the-Record encryption, see the OTR website for more diff -Nru python-potr-1.0.2/debian/gbp.conf python-potr-1.0.2/debian/gbp.conf --- python-potr-1.0.2/debian/gbp.conf 2020-10-01 00:14:15.000000000 +0000 +++ python-potr-1.0.2/debian/gbp.conf 2021-01-22 21:36:27.000000000 +0000 @@ -1,3 +1,7 @@ [DEFAULT] -pristine-tar = True +upstream-branch = upstream +debian-branch = debian/master +upstream-tag = upstream/%(version)s +debian-tag = debian/%(version)s sign-tags = True +pristine-tar = True diff -Nru python-potr-1.0.2/debian/patches/0002-Use-of-Cryptodome-module-imports-instead-of-Crypto.patch python-potr-1.0.2/debian/patches/0002-Use-of-Cryptodome-module-imports-instead-of-Crypto.patch --- python-potr-1.0.2/debian/patches/0002-Use-of-Cryptodome-module-imports-instead-of-Crypto.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-potr-1.0.2/debian/patches/0002-Use-of-Cryptodome-module-imports-instead-of-Crypto.patch 2021-01-22 21:36:27.000000000 +0000 @@ -0,0 +1,50 @@ +From: Emmanuel Arias +Date: Thu, 21 Jan 2021 10:11:24 -0300 +Subject: Use of Cryptodome module imports instead of Crypto + +Upstream don't support pycryptodome yet, so this patch is a workaround +to work with that module. + +Patch by Sebastian Ramacher . +--- + src/potr/compatcrypto/pycrypto.py | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/potr/compatcrypto/pycrypto.py b/src/potr/compatcrypto/pycrypto.py +index 58a8577..422c831 100644 +--- a/src/potr/compatcrypto/pycrypto.py ++++ b/src/potr/compatcrypto/pycrypto.py +@@ -16,16 +16,16 @@ + # along with this library. If not, see . + + try: +- import Crypto ++ import Cryptodome + except ImportError: + import crypto as Crypto + +-from Crypto import Cipher +-from Crypto.Hash import SHA256 as _SHA256 +-from Crypto.Hash import SHA as _SHA1 +-from Crypto.Hash import HMAC as _HMAC +-from Crypto.PublicKey import DSA +-import Crypto.Random.random ++from Cryptodome import Cipher ++from Cryptodome.Hash import SHA256 as _SHA256 ++from Cryptodome.Hash import SHA as _SHA1 ++from Cryptodome.Hash import HMAC as _HMAC ++from Cryptodome.PublicKey import DSA ++import Cryptodome.Random.random + from numbers import Number + + from potr.compatcrypto import common +@@ -143,7 +143,7 @@ class DSAKey(common.PK): + return cls((y, g, p, q), private=False), data + + def getrandbits(k): +- return Crypto.Random.random.getrandbits(k) ++ return Cryptodome.Random.random.getrandbits(k) + + def randrange(start, stop): +- return Crypto.Random.random.randrange(start, stop) ++ return Cryptodome.Random.random.randrange(start, stop) diff -Nru python-potr-1.0.2/debian/patches/series python-potr-1.0.2/debian/patches/series --- python-potr-1.0.2/debian/patches/series 2020-10-01 00:14:15.000000000 +0000 +++ python-potr-1.0.2/debian/patches/series 2021-01-22 21:36:27.000000000 +0000 @@ -1 +1,2 @@ 0001-Use-pycryptodome-as-dependency.patch +0002-Use-of-Cryptodome-module-imports-instead-of-Crypto.patch