d/control, d/rules: Re-enable gjs tests on s390x

diff --git a/debian/control b/debian/control
index a694637052e6667492ffb17005fb9de9c402b903..00064b45ccebb342fc5e6ea390836a08d65357c0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends:
  e2fslibs-dev,
  elfutils,
  fuse3,
- gjs [!alpha !armel !hppa !ia64 !m68k !s390x !sh4 !sparc64 !x32],
+ gjs [!alpha !armel !hppa !ia64 !m68k !sh4 !sparc64 !x32],
  gnupg <!nocheck>,
  gobject-introspection,
  gtk-doc-tools <!nodoc>,

diff --git a/debian/ostree-tests.lintian-overrides b/debian/ostree-tests.lintian-overrides
index 4a963d6e7f3047685275ea496e98afa7e99c7087..ba7d834eeb8b449b4a9a426b422ec1bd98450b62 100644 (file)
--- a/debian/ostree-tests.lintian-overrides
+++ b/debian/ostree-tests.lintian-overrides
@@ -10,7 +10,7 @@ ostree-tests: symlink-is-self-recursive . [usr/libexec/installed-tests/libostree
 # other architectures mentioned here.
 # The test that runs this script is automatically skipped if gjs isn't
 # present.
-[alpha armel hppa ia64 m68k s390x sh4 sparc64 x32]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js)
+[alpha armel hppa ia64 m68k sh4 sparc64 x32]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js)
 
 # This shared object genuinely doesn't use any libc ABIs directly,
 # only via GLib

diff --git a/debian/rules b/debian/rules
index 1b98b837a4239ce6af88130e8e5e1f2ba550a7aa..7769e1ef41ecdeee97625e9606a2ceaf466f5bdc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ configure_options = \
        --without-smack \
        $(NULL)
 
-ifneq ($(filter alpha armel hppa ia64 m68k s390x sh4 sparc64 x32,$(DEB_HOST_ARCH)),)
+ifneq ($(filter alpha armel hppa ia64 m68k sh4 sparc64 x32,$(DEB_HOST_ARCH)),)
 configure_options += ac_cv_path_GJS=
 endif