Merge ~mateus-morais/ubuntu/+source/python-duniterpy:fix-python-duniterpy-ftbfs into ubuntu/+source/python-duniterpy:ubuntu/devel

[Mateus Rodrigues de Morais]

This aims to fix python-duniterpy FTBFS when building against python-libnacl 2.1.0-1, which is stuck in -proposed due to the introduction of this regression.

Upstream python-duniterpy 1.1.1 includes this fix but hasn't been packaged in Debian yet.

PPA python-duniterpy build with python-libnacl 2.1.0-1 from -proposed: https://launchpad.net/~mateus-morais/+archive/ubuntu/python-duniterpy-ftbfs

[Lucas Kanashiro (lucaskanashiro)]

Thanks for this MP Mateus! I have a minor comment inline for you.

review: Needs Fixing

[Mateus Rodrigues de Morais (mateus-morais)]

lucaskanashiro: replaced 'upstream' with 'backport' in the patch Origin field. Thanks for your review!

[Dan Bungert (dbungert)]

Uploading, since the original feedback was been addressed and the rest looks fine.

diff --git a/debian/changelog b/debian/changelog
index 143a836..c7d4e6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-duniterpy (1.1.0-3ubuntu1) mantic; urgency=medium
+
+  * duniterpy/key/ascii_armor.py: fix FTBFS by removing reference to
+    non-existent libnacl.version module on newer versions of python-libnacl.
+    (LP: #2037646)
+
+ -- Mateus Rodrigues de Morais <[e-mail]>  Thu, 28 Sep 2023 10:51:38 -0300
+
 python-duniterpy (1.1.0-3) unstable; urgency=medium
 
   * add patch cherry-picked upstream
diff --git a/debian/control b/debian/control
index b2e3fcc..84cf17f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: python-duniterpy
 Section: python
 Priority: optional
-Maintainer: Debian Cryptocoin Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Cryptocoin Team <[e-mail]>
 Uploaders:
  Jonas Smedegaard <[e-mail]>,
 Build-Depends:
diff --git a/debian/patches/0002-duniterpy-key-ascii_armor.py-fix-FTBFS-by-removing-r.patch b/debian/patches/0002-duniterpy-key-ascii_armor.py-fix-FTBFS-by-removing-r.patch
new file mode 100644
index 0000000..b7a49dc
--- /dev/null
+++ b/debian/patches/0002-duniterpy-key-ascii_armor.py-fix-FTBFS-by-removing-r.patch
@@ -0,0 +1,36 @@
+From: Mateus Rodrigues de Morais <[e-mail]>
+Date: Thu, 28 Sep 2023 10:46:45 -0300
+Subject: duniterpy/key/ascii_armor.py: fix FTBFS by removing reference to
+ non-existent libnacl.version module on newer versions of python-libnacl.
+ (LP: #2037646)
+
+Origin: backport, https://git.duniter.org/clients/python/duniterpy/-/commit/ad8f6a26e9e70670712d9ecdfce296e0984254b2
+---
+ duniterpy/key/ascii_armor.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/duniterpy/key/ascii_armor.py b/duniterpy/key/ascii_armor.py
+index 882f23f..fd3302c 100644
+--- a/duniterpy/key/ascii_armor.py
++++ b/duniterpy/key/ascii_armor.py
+@@ -14,11 +14,11 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ import base64
++import importlib.metadata
+ import re
+ from typing import Any, Dict, List, Optional
+ 
+ import libnacl
+-from libnacl.version import version as libnacl_version
+ 
+ from .encryption_key import PublicKey
+ from .signing_key import SigningKey
+@@ -33,6 +33,7 @@ HEADER_PREFIX = "-----"
+ DASH_ESCAPE_PREFIX = "\x2D\x20"
+ 
+ # Version field value
++libnacl_version = importlib.metadata.version("libnacl")
+ VERSION_FIELD_VALUE = f"Python Libnacl {libnacl_version}"
+ 
+ # Parser cursor status
diff --git a/debian/patches/series b/debian/patches/series
index 01fc2df..3426a84 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 020221026~4dd1a52.patch
+0002-duniterpy-key-ascii_armor.py-fix-FTBFS-by-removing-r.patch