[Debian-pan-maintainers] Bug#1029775: pyhst2: diff for NMU version 2020c-6.1

[Didier Raboud]

Dear maintainer,

I've prepared an NMU for pyhst2 (versioned as 2020c-6.1) and
uploaded it to DELAYED/5 yesterday (will now migrate in 4 days).
Please feel free to tell me if I should delay it longer.

Regards.

diff -Nru pyhst2-2020c/debian/changelog pyhst2-2020c/debian/changelog
--- pyhst2-2020c/debian/changelog	2022-11-22 15:39:59.000000000 +0100
+++ pyhst2-2020c/debian/changelog	2023-01-28 18:09:31.000000000 +0100
@@ -1,3 +1,11 @@
+pyhst2 (2020c-6.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Add patch to set Debian-specific PEP-440-compliant version
+    (Closes: #1029775)
+
+ -- Didier Raboud <odyx at debian.org>  Sat, 28 Jan 2023 18:09:31 +0100
+
 pyhst2 (2020c-6) unstable; urgency=medium
 
   * Team upload.
diff -Nru pyhst2-2020c/debian/patches/0003-set-debian-specific-pep-440-version.patch pyhst2-2020c/debian/patches/0003-set-debian-specific-pep-440-version.patch
--- pyhst2-2020c/debian/patches/0003-set-debian-specific-pep-440-version.patch	1970-01-01 01:00:00.000000000 +0100
+++ pyhst2-2020c/debian/patches/0003-set-debian-specific-pep-440-version.patch	2023-01-28 18:00:03.000000000 +0100
@@ -0,0 +1,50 @@
+Set a Debian-specific PEP-440-compliant version: 2020.3.20230128
+
+This is needed since setuptools 66.0
+
+Bug-Debian: https://bugs.debian.org/1029775
+Author: Didier Raboud <odyx at debian.org>
+Origin: vendor
+
+--- a/setup.py
++++ b/setup.py
+@@ -88,6 +88,9 @@ global version
+ global aumento_versione
+ aumento_versione="a"
+ 
++# Debian-specific version to match PEP-440 with setuptools v66.0.0
++pep440_version = "2020.3.20230128" # 3 for c, today's date
++
+ global version
+ 
+ if DO_LINK==0:
+@@ -121,7 +124,8 @@ def do_link():
+ 
+     distrib = setup(name="pyhst2_links",
+                     license="GPL",
+-                    version=version+aumento_versione,
++                    # Debian-specific version to fit PEP-440
++                    version=pep440_version,
+                     description=description,
+                     author="Alessandro Mirone",
+                     author_email="mirone at esrf.fr",
+@@ -156,7 +160,8 @@ def do_link_unstable():
+ 
+     distrib = setup(name="pyhst2unstable_links",
+                     license="GPL",
+-                    version=version+aumento_versione,
++                    # Debian-specific version to fit PEP-440
++                    version=pep440_version,
+                     description=description,
+                     author="Alessandro Mirone",
+                     author_email="mirone at esrf.fr",
+@@ -697,7 +702,8 @@ def do_pyhst():
+ 
+     distrib = setup(name="PyHST2_"+version+post_fix,
+                     license="GPL",
+-                    version=version+aumento_versione, ## aumenta qua versione
++                    # Debian-specific version to fit PEP-440
++                    version=pep440_version,
+                     description=description,
+                     author="Alessandro Mirone",
+                     author_email="mirone at esrf.fr",
diff -Nru pyhst2-2020c/debian/patches/series pyhst2-2020c/debian/patches/series
--- pyhst2-2020c/debian/patches/series	2022-11-22 15:39:59.000000000 +0100
+++ pyhst2-2020c/debian/patches/series	2023-01-28 17:44:39.000000000 +0100
@@ -1,3 +1,4 @@
 0001-support-cuda-11.patch
 0002-executable-vol2-script
+0003-set-debian-specific-pep-440-version.patch
 typos.patch