Bug#1056471: python-fabio: debdiff with patch from upstream recommendation

2024-01-08 Thread Jerome Kieffer
This looks good to be. Thanks for your contribution.
Cheers,
-- 
Jérôme Kieffer



Bug#1056471: python-fabio: debdiff with patch from upstream recommendation

2024-01-04 Thread Yogeswaran Umasankar

Attaching the debdiff file.
Cheers!
diff -Nru python-fabio-2023.6.0/debian/changelog 
python-fabio-2023.6.0/debian/changelog
--- python-fabio-2023.6.0/debian/changelog  2023-07-22 11:07:18.0 
+
+++ python-fabio-2023.6.0/debian/changelog  2024-01-04 02:28:15.0 
+
@@ -1,3 +1,10 @@
+python-fabio (2023.6.0-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Bug fix for autopkg tests fail with Python 3.12 (Closes: #1056471).
+
+ -- Yogeswaran Umasankar   Thu, 04 Jan 2024 02:28:15 +
+
 python-fabio (2023.6.0-3) unstable; urgency=medium
 
   * Bug fix: "undeclared file conflict between fabio-viewer and
diff -Nru python-fabio-2023.6.0/debian/patches/0004-autopkgtest-py312.patch 
python-fabio-2023.6.0/debian/patches/0004-autopkgtest-py312.patch
--- python-fabio-2023.6.0/debian/patches/0004-autopkgtest-py312.patch   
1970-01-01 00:00:00.0 +
+++ python-fabio-2023.6.0/debian/patches/0004-autopkgtest-py312.patch   
2024-01-04 02:28:15.0 +
@@ -0,0 +1,24 @@
+From fb4a48b77c6130f4f9f9e626d84cbb5f3abac20b Mon Sep 17 00:00:00 2001
+From: Jerome Kieffer 
+Date: Mon, 11 Dec 2023 09:57:06 +0100
+Subject: [PATCH] Update ExternalResources.py
+
+close #549
+---
+ src/fabio/utils/ExternalResources.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/fabio/utils/ExternalResources.py 
b/src/fabio/utils/ExternalResources.py
+index 58a7bfe51..4d9d9e3bb 100644
+--- a/src/fabio/utils/ExternalResources.py
 b/src/fabio/utils/ExternalResources.py
+@@ -289,7 +289,8 @@ def get_file_and_repack(self, filename):
+ 
+ if not gz_file_exists:
+ try:
+-gzip.open(fullimagename_gz, "wb").write(decompressed)
++with gzip.open(fullimagename_gz, "wb") as g: 
++g.write(decompressed)
+ except IOError:
+ raise IOError("unable to write gzipped \
+ data to disk at %s" % self.data_home)
diff -Nru python-fabio-2023.6.0/debian/patches/series 
python-fabio-2023.6.0/debian/patches/series
--- python-fabio-2023.6.0/debian/patches/series 2023-07-22 11:07:18.0 
+
+++ python-fabio-2023.6.0/debian/patches/series 2024-01-04 02:28:15.0 
+
@@ -1,2 +1,3 @@
 0002-reproducible-build.patch
 0003-use-the-system-mathjax.patch
+0004-autopkgtest-py312.patch


signature.asc
Description: PGP signature


Bug#1056471: python-fabio: debdiff with patch from upstream recommendation

2024-01-03 Thread Yogeswaran Umasankar
Source: python-fabio
Version: 2023.6.0-3
Followup-For: Bug #1056471
X-Debbugs-Cc: kd8...@gmail.com

Hi,
I went ahead and created a patch following the upstream author's advice.
I've attached the debdiff for you to check out.
Cheers!

-- System Information:
Debian Release: trixie/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: arm64 (aarch64)

Kernel: Linux 6.1.0-17-arm64 (SMP w/2 CPU threads)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: unable to detect

fabio-debdiff content:


diff -Nru python-fabio-2023.6.0/debian/changelog 
python-fabio-2023.6.0/debian/changelog
--- python-fabio-2023.6.0/debian/changelog  2023-07-22 11:07:18.0 
+
+++ python-fabio-2023.6.0/debian/changelog  2024-01-04 02:28:15.0 
+
@@ -1,3 +1,10 @@
+python-fabio (2023.6.0-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Bug fix for autopkg tests fail with Python 3.12 (Closes: #1056471).
+
+ -- Yogeswaran Umasankar   Thu, 04 Jan 2024 02:28:15 +
+
 python-fabio (2023.6.0-3) unstable; urgency=medium

   * Bug fix: "undeclared file conflict between fabio-viewer and
diff -Nru python-fabio-2023.6.0/debian/patches/0004-autopkgtest-py312.patch 
python-fabio-2023.6.0/debian/patch>
--- python-fabio-2023.6.0/debian/patches/0004-autopkgtest-py312.patch   
1970-01-01 00:00:00.0 +
+++ python-fabio-2023.6.0/debian/patches/0004-autopkgtest-py312.patch   
2024-01-04 02:28:15.0 +
@@ -0,0 +1,24 @@
+From fb4a48b77c6130f4f9f9e626d84cbb5f3abac20b Mon Sep 17 00:00:00 2001
+From: Jerome Kieffer 
+Date: Mon, 11 Dec 2023 09:57:06 +0100
+Subject: [PATCH] Update ExternalResources.py
+
+close #549
+---
+ src/fabio/utils/ExternalResources.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/fabio/utils/ExternalResources.py 
b/src/fabio/utils/ExternalResources.py
+index 58a7bfe51..4d9d9e3bb 100644
+--- a/src/fabio/utils/ExternalResources.py
 b/src/fabio/utils/ExternalResources.py
+@@ -289,7 +289,8 @@ def get_file_and_repack(self, filename):
+
+ if not gz_file_exists:
+ try:
+-gzip.open(fullimagename_gz, "wb").write(decompressed)
++with gzip.open(fullimagename_gz, "wb") as g:
++g.write(decompressed)
+ except IOError:
+ raise IOError("unable to write gzipped \
+ data to disk at %s" % self.data_home)
diff -Nru python-fabio-2023.6.0/debian/patches/series 
python-fabio-2023.6.0/debian/patches/series
--- python-fabio-2023.6.0/debian/patches/series 2023-07-22 11:07:18.0 
+
+++ python-fabio-2023.6.0/debian/patches/series 2024-01-04 02:28:15.0 
+
@@ -1,2 +1,3 @@
 0002-reproducible-build.patch
 0003-use-the-system-mathjax.patch
+0004-autopkgtest-py312.patch