[Git][reproducible-builds/diffoscope][master] debian/: also do not require ogvideotools on s390x.

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Reproducible Builds / diffoscope


Commits:
4d043541 by Mattia Rizzolo at 2018-07-09T20:43:36+02:00
debian/: also do not require ogvideotools on s390x.

Fixing another failure for s390x.

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

- - - - -


3 changed files:

- debian/control
- debian/rules
- debian/tests/control


Changes:

=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -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
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -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
=====================================
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -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



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

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/commit/4d0435410ab0e5ad581e732894ba6fe1fe9b1aaa
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/20180709/abedfaa7/attachment.html>