[Git][reproducible-builds/diffoscope][master] Temporarily remove aapt from the build/test dependencies.

[Mattia Rizzolo (@mattia)]

Mattia Rizzolo pushed to branch master at Reproducible Builds / diffoscope


Commits:
f8a1e142 by Mattia Rizzolo at 2024-07-28T10:10:07+09:00
Temporarily remove aapt from the build/test dependencies.

Closes: #1070416
Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


3 changed files:

- debian/control
- debian/tests/control
- debian/tests/control.sh


Changes:

=====================================
debian/control
=====================================
@@ -8,7 +8,7 @@ Uploaders:
  Mattia Rizzolo <mattia at debian.org>,
 Build-Depends:
  7zip <!nocheck>,
- aapt <!nocheck>,
+# aapt <!nocheck>,
  abootimg <!nocheck>,
  androguard <!nocheck>,
  apksigcopier <!nocheck>,


=====================================
debian/tests/control
=====================================
@@ -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, 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, 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


=====================================
debian/tests/control.sh
=====================================
@@ -24,4 +24,6 @@ sed -i "s,fp-utils,fp-utils [!ppc64el !s390x]," debian/tests/control.tmp
 sed -i "s,oggvideotools,oggvideotools [!s390x]," 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
-sed -i "s,aapt,aapt [amd64 arm64 armel armhf i386 mips64el mipsel]," debian/tests/control.tmp
+# aapt removed due to not being in trixie atma - #1070416
+#sed -i "s,aapt,aapt [amd64 arm64 armel armhf i386 mips64el mipsel]," debian/tests/control.tmp
+sed -i "s#aapt, ##" debian/tests/control.tmp



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/f8a1e1428dbd95b29e236163a2f9e57aed8f5b32

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/f8a1e1428dbd95b29e236163a2f9e57aed8f5b32
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20240728/a6c6f44c/attachment.htm>