Revert "d/control, d/rules: Disable gjs-based tests on armel"

This reverts commit 87c78f16ad8d22dec4f6631f1dd03ba02d83d615.
Adrian Bunk and Mike Hommey were able to fix mozjs102 on armel, so we
can continue to have gjs on that architecture for Debian 12.

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

diff --git a/debian/ostree-tests.lintian-overrides b/debian/ostree-tests.lintian-overrides
index ba7d834eeb8b449b4a9a426b422ec1bd98450b62..ec853b341540055980dc5efde4fe2adc5ee030d3 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 sh4 sparc64 x32]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js)
+[alpha 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 7769e1ef41ecdeee97625e9606a2ceaf466f5bdc..bb1bc35cbd6c9c1921c8510b56afccf2e781a67d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ configure_options = \
        --without-smack \
        $(NULL)
 
-ifneq ($(filter alpha armel hppa ia64 m68k sh4 sparc64 x32,$(DEB_HOST_ARCH)),)
+ifneq ($(filter alpha hppa ia64 m68k sh4 sparc64 x32,$(DEB_HOST_ARCH)),)
 configure_options += ac_cv_path_GJS=
 endif