Restore architectures, and just exclude s390x from affected tests.

diff --git a/debian/control b/debian/control
index c62dfcbf35f40866b788be67a0ee3c4d18683ed2..58bf06bb392ece9e78ce4d3e9dd36dcd2ea58f17 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Homepage: https://solvespace.com
 Rules-Requires-Root: no
 
 Package: solvespace
-Architecture: amd64 arm64 armel armhf i386 ppc64el
+Architecture: any
 Multi-Arch: foreign
 Depends: ${misc:Depends},
          ${shlibs:Depends},
@@ -49,7 +49,7 @@ Description: Parametric 2d/3d CAD
     spreadsheets with a live dimensioned drawing.
 
 Package: libslvs1
-Architecture: amd64 arm64 armel armhf i386 ppc64el
+Architecture: any
 Multi-Arch: same
 Section: libs
 Depends: ${misc:Depends},
@@ -59,7 +59,7 @@ Description: SolveSpace geometric kernel
  kernel of SolveSpace, built as a library.
 
 Package: libslvs1-dev
-Architecture: amd64 arm64 armel armhf i386 ppc64el
+Architecture: any
 Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},

diff --git a/debian/tests/control b/debian/tests/control
index a26a8db65a2a416f53de5b00d164abc835b6351b..180eaae8d019d8832102b36355323fd78abd83d1 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,8 @@
-Tests: htmlmesh stlmesh surfaces thumbnail view wireframe
+Tests: htmlmesh stlmesh surfaces
+Restrictions: allow-stderr
+Depends: solvespace, findutils, grep
+Architecture: !s390x
+
+Tests: thumbnail view wireframe
 Restrictions: allow-stderr
 Depends: solvespace, findutils, grep