diff -Nru gdpc-2.2.5/debian/changelog gdpc-2.2.5/debian/changelog
--- gdpc-2.2.5/debian/changelog	2020-12-20 17:39:53.000000000 +0000
+++ gdpc-2.2.5/debian/changelog	2021-02-08 20:36:52.000000000 +0000
@@ -1,3 +1,17 @@
+gdpc (2.2.5-13) unstable; urgency=medium
+
+  * d/{,t/}control: remove all 32-bits architectures support; see #981876 for
+    the context (also, refer to #982103 about s390x exclusion)
+
+ -- Étienne Mollier <etienne.mollier@mailoo.org>  Mon, 08 Feb 2021 21:36:52 +0100
+
+gdpc (2.2.5-12) unstable; urgency=medium
+
+  * Add myself to uploaders.
+  * d/{,t/}control: exclude i386 and s390x from supported architectures.
+
+ -- Étienne Mollier <etienne.mollier@mailoo.org>  Sat, 06 Feb 2021 17:27:12 +0100
+
 gdpc (2.2.5-11) unstable; urgency=medium
 
   * Nelson A. de Oliveira left Debian so remove him from Uploaders
diff -Nru gdpc-2.2.5/debian/control gdpc-2.2.5/debian/control
--- gdpc-2.2.5/debian/control	2020-12-20 17:39:53.000000000 +0000
+++ gdpc-2.2.5/debian/control	2021-02-08 19:52:15.000000000 +0000
@@ -1,6 +1,7 @@
 Source: gdpc
 Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
-Uploaders: Andreas Tille <tille@debian.org>
+Uploaders: Andreas Tille <tille@debian.org>,
+           Étienne Mollier <etienne.mollier@mailoo.org>
 Section: science
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
@@ -12,7 +13,7 @@
 Rules-Requires-Root: no
 
 Package: gdpc
-Architecture: any
+Architecture: any-amd64 arm64 mips64el ppc64el riscv64
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Suggests: gdpc-examples (>= ${source:Version}),
diff -Nru gdpc-2.2.5/debian/README.test gdpc-2.2.5/debian/README.test
--- gdpc-2.2.5/debian/README.test	2020-12-20 17:39:53.000000000 +0000
+++ gdpc-2.2.5/debian/README.test	2021-02-06 14:47:12.000000000 +0000
@@ -3,6 +3,6 @@
 
 This package can be tested by running the provided test:
 
-    sh run-unit-test
+    bash run-unit-test
 
 in order to confirm its integrity.
diff -Nru gdpc-2.2.5/debian/tests/control gdpc-2.2.5/debian/tests/control
--- gdpc-2.2.5/debian/tests/control	2020-12-20 17:39:53.000000000 +0000
+++ gdpc-2.2.5/debian/tests/control	2021-02-08 19:52:34.000000000 +0000
@@ -1,3 +1,4 @@
 Tests: run-unit-test
-Depends: @, xvfb, xauth
+Depends: @, xvfb, xauth, procps
 Restrictions: allow-stderr
+Architecture: any-amd64 arm64 mips64el ppc64el riscv64
diff -Nru gdpc-2.2.5/debian/tests/run-unit-test gdpc-2.2.5/debian/tests/run-unit-test
--- gdpc-2.2.5/debian/tests/run-unit-test	2020-12-20 17:39:53.000000000 +0000
+++ gdpc-2.2.5/debian/tests/run-unit-test	2021-02-06 16:09:28.000000000 +0000
@@ -8,6 +8,29 @@
   trap "rm -rf $AUTOPKGTEST_TMP" 0 INT QUIT ABRT PIPE TERM
 fi
 
+check_n_cleanup () {
+	local gdpc_pids="$(
+		ps aux \
+		| awk "/^$USER"'.*bin[/]gdpc/ {print$2}' \
+		| xargs
+	)"
+
+	local xvfb_pids="$(
+		ps aux \
+		| awk -vORS=' ' "/^$USER"'.*[X]vfb/ {print$2}' \
+		| xargs
+	)"
+
+	if [ -n "$gdpc_pids" ]
+	then
+		kill $gdpc_pids
+	else
+		printf -- 'error: gdpc crashed before the end of the test\n' >&2
+		exit 1
+	fi
+	test -n "$xvfb_pids" && kill $xvfb_pids
+}
+
 cp -a /usr/share/doc/${pkg}/examples/* $AUTOPKGTEST_TMP
 
 cd $AUTOPKGTEST_TMP
@@ -15,15 +38,32 @@
 gunzip *.gz
 
 rm -f test.log
+set -v
 #test recipe from README file
-xvfb-run --auto-servernum /usr/bin/gdpc cube 30 m 2 d 20 erase 1 2 3 4 liquid.test 2>&1 | tee >> test.log &
-xvfb-run --auto-servernum /usr/bin/gdpc m 2 d 10 erase xyz 2 3 4 5 md.test 2>&1 | tee >> test.log &
-xvfb-run --auto-servernum /usr/bin/gdpc m 2 d 10 erase usetypes xyz 2 3 4 5 manytypes.test 2>&1 | tee >> test.log &
+xvfb-run --auto-servernum \
+	/usr/bin/gdpc 2>&1 \
+	| tee --append test.log &
+sleep 10
+check_n_cleanup
+
+xvfb-run --auto-servernum \
+	/usr/bin/gdpc cube 30 m 2 d 20 erase 1 2 3 4 liquid.test 2>&1 \
+	| tee --append test.log &
+sleep 10
+check_n_cleanup
+
+xvfb-run --auto-servernum \
+	/usr/bin/gdpc m 2 d 10 erase xyz 2 3 4 5 md.test 2>&1 \
+	| tee --append test.log &
+sleep 10
+check_n_cleanup
 
+xvfb-run --auto-servernum \
+	/usr/bin/gdpc m 2 d 10 erase usetypes xyz 2 3 4 5 manytypes.test 2>&1 \
+	| tee --append test.log &
 sleep 10
-kill -9 `ps aux | grep -w "^${USER}.*/usr/bin/gdpc" | grep -v "0:0[0-9] grep " | grep -v "0:0[0-9] ps " | sed "s/^${USER}[[:space:]]\+\([0-9]\+\)[[:space:]]\+.*/\1/"`
-sleep 1
-kill -9 `ps aux | grep -w "^${USER}.*Xvfb" | grep -v "0:0[0-9] grep " | grep -v "0:0[0-9] ps " | sed "s/^${USER}[[:space:]]\+\([0-9]\+\)[[:space:]]\+.*/\1/"`
+check_n_cleanup
+set +v
 
 ls -l test.log
 cat test.log