Unverified Commit 4d043541 authored by Mattia Rizzolo's avatar Mattia Rizzolo
Browse files

debian/: also do not require ogvideotools on s390x. 



Fixing another failure for s390x.

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

debian/control

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

 mono-utils <!nocheck>,

 odt2txt <!nocheck>,

 oggvideotools <!nocheck>,

 oggvideotools [!s390x] <!nocheck>,

 openssh-client <!nocheck>,

 pgpdump <!nocheck>,

 poppler-utils <!nocheck>,

debian/rules

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ override_dh_auto_clean: 
	@cat debian/tests/control.in >> debian/tests/control.tmp

	@sed -i "s#%RECOMMENDS%#$(shell bin/diffoscope --list-debian-substvars | cut -d= -f2)#" debian/tests/control.tmp

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

	@sed -i "s,oggvideotools,oggvideotools [!s390x]," 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, 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, genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg, imagemagick, jsbeautifier, libarchive-tools, llvm, lz4, mono-utils, odt2txt, oggvideotools, openssh-client, pgpdump, poppler-utils, procyon-decompiler, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, unzip, xmlbeans, xxd | vim-common, xz-utils

Depends: diffoscope, python3-pytest, 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, genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg, imagemagick, jsbeautifier, libarchive-tools, llvm, lz4, 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



Tests: pytest

Depends: diffoscope, python3-pytest