Unverified Commit 018b7aea authored by Mattia Rizzolo's avatar Mattia Rizzolo
Browse files

Temporarily drop Build-Depends and Test-Depends on apktool and oggvideotools,... 


Temporarily drop Build-Depends and Test-Depends on apktool and oggvideotools, as they are not available in buster at the moment.

Signed-off-by: Mattia Rizzolo's avatarMattia Rizzolo <mattia@debian.org>
parent 71eb7e3f

.gitlab-ci.yml

+0 −3
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ unstable: 
testing:

  <<: *test

  image: debian:testing

  # in testing the build-dependencies are not installable.

  # keep trying, but ignore the failures

  allow_failure: true



stable-bpo:

  <<: *test

debian/control

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Uploaders: 
 Ximin Luo <infinity0@debian.org>,

Build-Depends:

 abootimg <!nocheck>,

 apktool [!ppc64el !s390x] <!nocheck>,

# apktool [!ppc64el !s390x] <!nocheck>,

 bash-completion,

 binutils-multiarch <!nocheck>,

 caca-utils <!nocheck>,
@@ -45,7 +45,7 @@ Build-Depends: 
 lz4 <!nocheck> | liblz4-tool <!nocheck>,

 mono-utils <!nocheck>,

 odt2txt <!nocheck>,

 oggvideotools [!s390x] <!nocheck>,

# oggvideotools [!s390x] <!nocheck>,

 openssh-client <!nocheck>,

 pgpdump <!nocheck>,

 poppler-utils <!nocheck>,

debian/rules

+4 −2
Original line number Diff line number Diff line
@@ -77,9 +77,11 @@ override_dh_auto_clean: 
	)#" debian/tests/control.tmp

	@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,apktool,apktool [!ppc64el !s390x]," debian/tests/control.tmp

	#@sed -i "s,apktool,apktool [!ppc64el !s390x]," debian/tests/control.tmp

	@sed -i "s/apktool, //" debian/tests/control.tmp

	@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,oggvideotools,oggvideotools [!s390x]," debian/tests/control.tmp

	@sed -i "s/oggvideotools, //" debian/tests/control.tmp

	@set -e ; if ! diff -q debian/tests/control debian/tests/control.tmp ; then \

		echo ;\

		echo "The generated control file differs from the actual one." ;\

debian/tests/control

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# EDIT debian/tests/control.in INSTEAD!

#

Tests: pytest-with-recommends

Depends: diffoscope, python3-pytest, file, abootimg, acl, apktool [!ppc64el !s390x], binutils-multiarch, bzip2, caca-utils, colord, db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, fontforge-extras, fp-utils [!ppc64el !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg, imagemagick, jsbeautifier, libarchive-tools, llvm, lz4 | liblz4-tool, mono-utils, odt2txt, oggvideotools [!s390x], openssh-client, pgpdump, poppler-utils, procyon-decompiler, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, unzip, xmlbeans, xxd | vim-common, xz-utils, python3-distro, python3-argcomplete, python3-progressbar, python3-binwalk, python3-defusedxml, python3-guestfs, python3-jsondiff, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh

Depends: diffoscope, python3-pytest, file, abootimg, acl, binutils-multiarch, bzip2, caca-utils, colord, db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, fontforge-extras, fp-utils [!ppc64el !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg, imagemagick, jsbeautifier, libarchive-tools, llvm, lz4 | liblz4-tool, mono-utils, odt2txt, openssh-client, pgpdump, poppler-utils, procyon-decompiler, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, unzip, xmlbeans, xxd | vim-common, xz-utils, python3-distro, python3-argcomplete, python3-progressbar, python3-binwalk, python3-defusedxml, python3-guestfs, python3-jsondiff, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh



Tests: pytest

Depends: diffoscope, python3-pytest, file