diff -Nru upower-0.99.11/debian/changelog upower-0.99.11/debian/changelog
--- upower-0.99.11/debian/changelog	2019-09-03 07:48:09.000000000 +0000
+++ upower-0.99.11/debian/changelog	2019-12-10 11:31:11.000000000 +0000
@@ -1,3 +1,15 @@
+upower (0.99.11-1build2) focal; urgency=medium
+
+  * Use the correct pkg-config variant
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 10 Dec 2019 12:30:49 +0100
+
+upower (0.99.11-1build1) focal; urgency=medium
+
+  * Make autopkgtests cross-test-friendly.
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 10 Dec 2019 11:05:25 +0100
+
 upower (0.99.11-1) unstable; urgency=medium
 
   * New upstream version 0.99.11
diff -Nru upower-0.99.11/debian/tests/build upower-0.99.11/debian/tests/build
--- upower-0.99.11/debian/tests/build	2019-09-03 07:48:09.000000000 +0000
+++ upower-0.99.11/debian/tests/build	2019-12-10 11:30:44.000000000 +0000
@@ -8,6 +8,13 @@
 
 WORKDIR=$(mktemp -d)
 trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
+
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+    CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+    CROSS_COMPILE=
+fi
+
 cd $WORKDIR
 cat <<EOF > libupowertest.c
 #include <string.h>
@@ -21,7 +28,7 @@
 }
 EOF
 
-gcc -o libupowertest libupowertest.c `pkg-config --cflags --libs upower-glib` -Wall -Werror
+${CROSS_COMPILE}gcc -o libupowertest libupowertest.c `${CROSS_COMPILE}pkg-config --cflags --libs upower-glib` -Wall -Werror
 echo "build: OK"
 [ -x libupowertest ]
 env G_DEBUG="fatal-warnings fatal-criticals" ./libupowertest