Bug#1121754: trixie-pu: package diffoscope/297+deb13u1

["Chris Lamb" <lamby@debian.org>]

Package: release.debian.org
Severity: normal
Tags: trixie
User: release.debian.org@packages.debian.org
Usertags: pu

Dear stable release managers,

Please consider diffoscope (297+deb13u1) for trixie:
  
  diffoscope (297+deb13u1) trixie; urgency=medium
  .
    * Fix a test after the upload of systemd-ukify 258~rc3 (vs 258~rc2).
      (Closes: #1120867)


The full diff is attached.


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      lamby@debian.org / chris-lamb.co.uk
       `-

diff --git debian/changelog debian/changelog
index 95507593..e4dad4ab 100644
--- debian/changelog
+++ debian/changelog
@@ -1,3 +1,10 @@
+diffoscope (297+deb13u1) trixie; urgency=medium
+
+  * Fix a test after the upload of systemd-ukify 258~rc3 (vs 258~rc2).
+    (Closes: #1120867)
+
+ -- Chris Lamb <lamby@debian.org>  Mon, 01 Dec 2025 13:07:31 -0800
+
 diffoscope (297) unstable; urgency=medium
 
   [ Will Hollywood ]
diff --git tests/comparators/test_uki.py tests/comparators/test_uki.py
index 94a3594f..6342ccf4 100644
--- tests/comparators/test_uki.py
+++ tests/comparators/test_uki.py
@@ -17,6 +17,8 @@
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
 import pytest
+import re
+import subprocess
 
 from diffoscope.comparators.binary import FilesystemFile
 from diffoscope.comparators.uki import UKIFile
@@ -24,11 +26,17 @@ from diffoscope.comparators.utils.command import our_check_output
 from diffoscope.comparators.utils.specialize import specialize
 
 from ..utils.data import assert_diff, load_fixture
-from ..utils.tools import skip_unless_tools_exist
+from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least
 
 efi_stub = load_fixture("dummyx64.efi.stub")
 
 
+def ukify_version():
+    line = subprocess.check_output(("ukify", "--version")).decode("utf-8")
+
+    return re.search(r"\((.*)\)", line).group(1)
+
+
 def uki_fixture(prefix, os_release, uname):
     @pytest.fixture
     def uki(tmpdir, efi_stub):
@@ -70,6 +78,7 @@ def differences(uki1, uki2):
 
 @skip_unless_tools_exist("objdump")
 @skip_unless_tools_exist("ukify")
+@skip_unless_tool_is_at_least("ukify", ukify_version, "258~rc3")
 def test_no_differences(uki1):
     difference = uki1.compare(uki1)
     assert difference is None
@@ -77,5 +86,6 @@ def test_no_differences(uki1):
 
 @skip_unless_tools_exist("objdump")
 @skip_unless_tools_exist("ukify")
+@skip_unless_tool_is_at_least("ukify", ukify_version, "258~rc3")
 def test_diff(differences):
     assert_diff(differences[0], "uki_expected_diff")
diff --git tests/data/uki_expected_diff tests/data/uki_expected_diff
index 9fded7c1..88053c41 100644
Binary files tests/data/uki_expected_diff and tests/data/uki_expected_diff differ