Commit 38e0fb8b authored by Chris Lamb's avatar Chris Lamb 👀
Browse files

Move from a mono-utils dependency to versioned mono-devel | mono-utils... 

Move from a mono-utils dependency to versioned mono-devel | mono-utils dependency, taking care to maintain the [!riscv64] architecture restriction. (Closes: #1111742
parent 6a82eee6

debian/control

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ Build-Depends: 
 llvm <!nocheck>,

 lz4 <!nocheck>,

 lzip <!nocheck>,

 mono-utils <!nocheck>,

 mono-devel (>= 6.14.1+ds-3) <!nocheck> | mono-utils (<< 6.14.1+ds-3) <!nocheck>,

 ocaml-nox <!nocheck>,

 odt2txt <!nocheck>,

 oggvideotools [!s390x] <!nocheck>,

debian/tests/control

+1 −1
Original line number Diff line number Diff line
@@ -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, abootimg, acl, apksigcopier, apksigner, apktool, binutils-multiarch, bzip2, caca-utils, colord, coreboot-utils [!risv64], db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, ffmpeg, fontforge-extras, fonttools, fp-utils [!riscv64 !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 [!riscv64], ocaml-nox, odt2txt, oggvideotools [!s390x], openssh-client, openssl, perl, pgpdump, poppler-utils, procyon-decompiler, python3-pdfminer, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, systemd-ukify, tcpdump, u-boot-tools, unzip, wabt, xmlbeans, xxd, xz-utils, zip, zstd, 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, abootimg, acl, apksigcopier, apksigner, apktool, binutils-multiarch, bzip2, caca-utils, colord, coreboot-utils [!risv64], db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, ffmpeg, fontforge-extras, fonttools, fp-utils [!riscv64 !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg-utils, gpg, hdf5-tools, html2text, imagemagick, jsbeautifier, libarchive-tools, libxmlb-utils, llvm, lz4, lzip, mono-devel (>= 6.14.1+ds-3) [!riscv64] | mono-utils (<< 6.14.1+ds-3) [!riscv64], ocaml-nox, odt2txt, oggvideotools [!s390x], openssh-client, openssl, perl, pgpdump, poppler-utils, procyon-decompiler, python3-pdfminer, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, systemd-ukify, tcpdump, u-boot-tools, unzip, wabt, xmlbeans, xxd, xz-utils, zip, zstd, 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

debian/tests/control.sh

+2 −1
Original line number Diff line number Diff line
@@ -21,8 +21,9 @@ sed -i "s,python3-python-debian,python3-debian," debian/tests/control.tmp 
sed -i "s,python3-rpm-python,python3-rpm," debian/tests/control.tmp

sed -i "s,coreboot-utils,coreboot-utils [!risv64]," debian/tests/control.tmp

sed -i "s,fp-utils,fp-utils [!riscv64 !s390x]," debian/tests/control.tmp

sed -i "s,mono-utils,mono-utils [!riscv64]," debian/tests/control.tmp

sed -i "s,oggvideotools,oggvideotools [!s390x]," debian/tests/control.tmp

sed -i "s,\(mono-devel (>= 6.14.1+ds-3)\),\1 [!riscv64]," debian/tests/control.tmp

sed -i "s,\(mono-utils (<< 6.14.1+ds-3)\),\1 [!riscv64]," debian/tests/control.tmp

#sed -i "s,python3-androguard,androguard," debian/tests/control.tmp

#sed -i "s,dexdump,dexdump [amd64 arm64 armhf i386]," debian/tests/control.tmp

# aapt removed due to not being in trixie atma - #1070416

diffoscope/external_tools.py

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ EXTERNAL_TOOLS = { 
        "guix": "poppler",

    },

    "pedump": {

        "debian": "mono-utils",

        "debian": "mono-devel (>= 6.14.1+ds-3) | mono-utils (<< 6.14.1+ds-3)",

        "arch": "mono",

        "FreeBSD": "mono",

    },