Package: diffoscope
Version: 269
Severity: normal
Tags: patch
X-Debbugs-Cc: chris.peter...@canonical.com
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oracular ubuntu-patch
*** /tmp/tmp7ahjhrzt/bug_body
In Ubuntu, the attached patch was applied to achieve the following:
In lz4 1.9.4-2 the transitional package liblz4-tool was dropped. This
patch drops the dependency of liblz4-tool in diffoscope respectively.
* Drop liblz4-tool dependency (LP: #2067948).
Thanks for considering the patch.
-- System Information:
Debian Release: trixie/sid
APT prefers oracular
APT policy: (500, 'oracular')
Architecture: amd64 (x86_64)
Kernel: Linux 6.8.0-31-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
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: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru diffoscope-269/debian/control diffoscope-269ubuntu1/debian/control
--- diffoscope-269/debian/control 2024-05-31 01:10:35.000000000 -0700
+++ diffoscope-269ubuntu1/debian/control 2024-06-03 13:53:46.000000000
-0700
@@ -53,7 +53,7 @@
libjs-jquery-throttle-debounce <!nocheck>,
linux-image-amd64 [amd64] <!nocheck> | linux-image-generic [amd64] <!nocheck>,
llvm <!nocheck>,
- lz4 <!nocheck> | liblz4-tool <!nocheck>,
+ lz4 <!nocheck>,
lzip <!nocheck>,
mono-utils <!nocheck>,
ocaml-nox <!nocheck>,
diff -Nru diffoscope-269/debian/tests/control
diffoscope-269ubuntu1/debian/tests/control
--- diffoscope-269/debian/tests/control 2024-05-31 01:10:35.000000000 -0700
+++ diffoscope-269ubuntu1/debian/tests/control 2024-06-03 13:53:46.000000000
-0700
@@ -7,7 +7,7 @@
# $ mv debian/tests/control.tmp debian/tests/control
Tests: pytest-with-recommends
-Depends: python3-all, diffoscope, black, python3-pytest, python3-h5py, file,
linux-image-amd64 [amd64] | linux-image-generic [amd64], 7zip, aapt [amd64
arm64 armel armhf i386 mips64el mipsel], abootimg, acl, apksigcopier,
apksigner, apktool [!ppc64el !s390x], binutils-multiarch, bzip2, caca-utils,
colord, coreboot-utils, db-util, default-jdk-headless | default-jdk | java-sdk,
device-tree-compiler, dexdump [amd64 arm64 armhf i386], docx2txt, e2fsprogs,
enjarify, ffmpeg, fontforge-extras, fonttools, fp-utils [!ppc64el !s390x],
genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg-utils,
gpg, hdf5-tools, html2text, imagemagick, jsbeautifier, libarchive-tools,
libxmlb-utils, llvm, lz4 | liblz4-tool, lzip, mono-utils, ocaml-nox, odt2txt,
oggvideotools [!s390x], openssh-client, openssl, perl, pgpdump, poppler-utils,
procyon-decompiler, python3-pdfminer, r-base-core, rpm2cpio, sng, sqlite3,
squashfs-tools, tcpdump, u-boot-tools, unzip, wabt, xmlbeans, xxd, xz-utils,
zip, zstd, androguard, python3-argcomplete, python3-binwalk,
python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff,
python3-progressbar, python3-pypdf, python3-debian, python3-pyxattr,
python3-rpm, python3-tlsh
+Depends: python3-all, diffoscope, black, python3-pytest, python3-h5py, file,
linux-image-amd64 [amd64] | linux-image-generic [amd64], 7zip, aapt [amd64
arm64 armel armhf i386 mips64el mipsel], abootimg, acl, apksigcopier,
apksigner, apktool [!ppc64el !s390x], binutils-multiarch, bzip2, caca-utils,
colord, coreboot-utils, db-util, default-jdk-headless | default-jdk | java-sdk,
device-tree-compiler, dexdump [amd64 arm64 armhf i386], docx2txt, e2fsprogs,
enjarify, ffmpeg, fontforge-extras, fonttools, fp-utils [!ppc64el !s390x],
genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg-utils,
gpg, hdf5-tools, html2text, imagemagick, jsbeautifier, libarchive-tools,
libxmlb-utils, llvm, lz4, lzip, mono-utils, ocaml-nox, odt2txt, oggvideotools
[!s390x], openssh-client, openssl, perl, pgpdump, poppler-utils,
procyon-decompiler, python3-pdfminer, r-base-core, rpm2cpio, sng, sqlite3,
squashfs-tools, tcpdump, u-boot-tools, unzip, wabt, xmlbeans, xxd, xz-utils,
zip, zstd, androguard, python3-argcomplete, python3-binwalk,
python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff,
python3-progressbar, python3-pypdf, python3-debian, python3-pyxattr,
python3-rpm, python3-tlsh
Tests: pytest
Depends: python3-all, diffoscope, python3-pytest, python3-h5py, file,
python3-tlsh
diff -Nru diffoscope-269/diffoscope/external_tools.py
diffoscope-269ubuntu1/diffoscope/external_tools.py
--- diffoscope-269/diffoscope/external_tools.py 2024-05-31 01:10:35.000000000
-0700
+++ diffoscope-269ubuntu1/diffoscope/external_tools.py 2024-06-03
13:53:46.000000000 -0700
@@ -129,7 +129,7 @@
"FreeBSD": "e2fsprogs",
"guix": "e2fsprogs",
},
- "lz4": {"debian": "lz4 | liblz4-tool", "FreeBSD": "lz4", "guix": "lz4"},
+ "lz4": {"debian": "lz4", "FreeBSD": "lz4", "guix": "lz4"},
"lzip": {"debian": "lzip", "guix": "lzip"},
"msgunfmt": {
"debian": "gettext",
