diff -Nru gdpc-2.2.5/debian/changelog gdpc-2.2.5/debian/changelog
--- gdpc-2.2.5/debian/changelog	2019-10-01 13:32:59.000000000 +0000
+++ gdpc-2.2.5/debian/changelog	2020-01-29 16:00:44.000000000 +0000
@@ -1,15 +1,16 @@
-gdpc (2.2.5-9ubuntu1) eoan; urgency=medium
+gdpc (2.2.5-10) unstable; urgency=medium
 
-  * Prevent autopkgtest from committing suicide
+  [ Graham Inggs ]
+  * Fix autopkgtest
+    Closes: #941581
 
- -- Graham Inggs <ginggs@ubuntu.com>  Tue, 01 Oct 2019 13:32:59 +0000
-
-gdpc (2.2.5-9build1) eoan; urgency=medium
-
-  * No-change rebuild to address what appears to be a misbuild with the
-    disco toolchain causing runtime failures (detected via autopkgtest)
+  [ Andreas Tille ]
+  * Add debug output to autopkgtest to enable catching failures
+  * Standards-Version: 4.5.0 (routine-update)
+  * debhelper-compat 12 (routine-update)
+  * Trim trailing whitespace.
 
- -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 13 Aug 2019 15:42:55 -0700
+ -- Andreas Tille <tille@debian.org>  Wed, 29 Jan 2020 17:00:44 +0100
 
 gdpc (2.2.5-9) unstable; urgency=medium
 
@@ -148,4 +149,3 @@
   * Initial Release (Closes: #306028).
 
  -- Nelson A. de Oliveira <naoliv@gmail.com>  Sat, 23 Apr 2005 15:50:09 -0300
-
diff -Nru gdpc-2.2.5/debian/compat gdpc-2.2.5/debian/compat
--- gdpc-2.2.5/debian/compat	2018-11-01 14:29:12.000000000 +0000
+++ gdpc-2.2.5/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-11
diff -Nru gdpc-2.2.5/debian/control gdpc-2.2.5/debian/control
--- gdpc-2.2.5/debian/control	2019-10-01 13:32:59.000000000 +0000
+++ gdpc-2.2.5/debian/control	2020-01-29 16:00:44.000000000 +0000
@@ -1,13 +1,12 @@
 Source: gdpc
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
+Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
 Uploaders: Nelson A. de Oliveira <naoliv@debian.org>,
            Andreas Tille <tille@debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 12),
                libgtk2.0-dev
-Standards-Version: 4.2.1
+Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/med-team/gdpc
 Vcs-Git: https://salsa.debian.org/med-team/gdpc.git
 Homepage: https://web.archive.org/web/20180212152753/http://www.frantz.fi/software/gdpc.php
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	2019-10-01 12:31:40.000000000 +0000
+++ gdpc-2.2.5/debian/tests/run-unit-test	2020-01-29 16:00:44.000000000 +0000
@@ -14,12 +14,18 @@
 
 gunzip *.gz
 
+rm -f test.log
 #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 &
-xvfb-run --auto-servernum /usr/bin/gdpc m 2 d 10 erase xyz 2 3 4 5 md.test &
-xvfb-run --auto-servernum /usr/bin/gdpc m 2 d 10 erase usetypes xyz 2 3 4 5 manytypes.test &
+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 &
 
 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/"`
+
+ls -l test.log
+cat test.log
 
 echo "PASS"