Version in base suite: 297

Base version: diffoscope_297
Target version: diffoscope_297+deb13u1
Base file: /srv/ftp-master.debian.org/ftp/pool/main/d/diffoscope/diffoscope_297.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/d/diffoscope/diffoscope_297+deb13u1.dsc

 /srv/release.debian.org/tmp/f8zQYe7_2K/diffoscope-297+deb13u1/tests/data/uki_expected_diff |binary
 diffoscope-297+deb13u1/debian/changelog                                                    |    7 +++++
 diffoscope-297+deb13u1/tests/comparators/test_uki.py                                       |   12 +++++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff -Nru diffoscope-297/debian/changelog diffoscope-297+deb13u1/debian/changelog
--- diffoscope-297/debian/changelog	2025-05-30 16:34:34.000000000 +0000
+++ diffoscope-297+deb13u1/debian/changelog	2025-12-01 21:07:31.000000000 +0000
@@ -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 -Nru diffoscope-297/tests/comparators/test_uki.py diffoscope-297+deb13u1/tests/comparators/test_uki.py
--- diffoscope-297/tests/comparators/test_uki.py	2025-05-30 16:34:34.000000000 +0000
+++ diffoscope-297+deb13u1/tests/comparators/test_uki.py	2025-12-01 21:07:31.000000000 +0000
@@ -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.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 @@
 
 @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 @@
 
 @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")
Binary files /srv/release.debian.org/tmp/PjGM7BqLU8/diffoscope-297/tests/data/uki_expected_diff and /srv/release.debian.org/tmp/f8zQYe7_2K/diffoscope-297+deb13u1/tests/data/uki_expected_diff differ