diff -pruN 1.0.5-2.3/debian/changelog 1.0.5-2.3ubuntu1/debian/changelog
--- 1.0.5-2.3/debian/changelog	2021-01-31 20:35:18.000000000 +0000
+++ 1.0.5-2.3ubuntu1/debian/changelog	2021-06-03 02:28:30.000000000 +0000
@@ -1,3 +1,14 @@
+libiptcdata (1.0.5-2.3ubuntu1) impish; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - d/{rules,t/build}: Make autopkgtests cross-test-friendly.
+  * Dropped changes:
+    - Removed Python-related delta since python-iptcdata is no longer built.
+    - Added licensecheck back to the build; removing it should no longer be
+      necessary.
+
+ -- Logan Rosen <logan@ubuntu.com>  Wed, 02 Jun 2021 22:28:30 -0400
+
 libiptcdata (1.0.5-2.3) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -17,6 +28,36 @@ libiptcdata (1.0.5-2.2) unstable; urgenc
 
  -- Matthias Klose <doko@debian.org>  Sat, 08 Aug 2020 22:18:23 +0200
 
+libiptcdata (1.0.5-2.1ubuntu4) focal; urgency=medium
+
+  * No-change rebuild with fixed binutils on arm64.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 08 Feb 2020 11:06:38 +0000
+
+libiptcdata (1.0.5-2.1ubuntu3) focal; urgency=medium
+
+  * Build without licensecheck.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 14 Jan 2020 14:09:25 +0100
+
+libiptcdata (1.0.5-2.1ubuntu2) focal; urgency=medium
+
+  * Build with python2.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 11 Jan 2020 23:26:10 +0100
+
+libiptcdata (1.0.5-2.1ubuntu1) focal; urgency=medium
+
+  * Make autopkgtests cross-test-friendly.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 10 Jan 2020 07:55:35 -0800
+
+libiptcdata (1.0.5-2.1build1) focal; urgency=medium
+
+  * No-change rebuild to generate dependencies on python2.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 17 Dec 2019 12:35:26 +0000
+
 libiptcdata (1.0.5-2.1) unstable; urgency=medium
 
   * Non-maintainer upload
diff -pruN 1.0.5-2.3/debian/control 1.0.5-2.3ubuntu1/debian/control
--- 1.0.5-2.3/debian/control	2021-01-31 20:33:27.000000000 +0000
+++ 1.0.5-2.3ubuntu1/debian/control	2021-06-03 02:26:47.000000000 +0000
@@ -1,7 +1,8 @@
 Source: libiptcdata
 Section: libs
 Priority: optional
-Maintainer: Ian Wienand <ianw@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Ian Wienand <ianw@debian.org>
 Build-Depends: cdbs,
  autotools-dev,
  gnulib,
diff -pruN 1.0.5-2.3/debian/tests/build 1.0.5-2.3ubuntu1/debian/tests/build
--- 1.0.5-2.3/debian/tests/build	2021-01-31 20:30:26.000000000 +0000
+++ 1.0.5-2.3ubuntu1/debian/tests/build	2021-02-01 03:49:13.000000000 +0000
@@ -6,6 +6,12 @@
 
 set -e
 
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+    CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+    CROSS_COMPILE=
+fi
+
 MYDIR=$(dirname $(readlink -f $0))
 WORKDIR=$(mktemp -d)
 trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
@@ -27,7 +33,7 @@ int main(void)
 }
 EOF
 
-gcc -o libiptcdata_test libiptcdata_test.c -liptcdata -Wall -Werror
+${CROSS_COMPILE}gcc -o libiptcdata_test libiptcdata_test.c -liptcdata -Wall -Werror
 echo "build: OK"
 uudecode -o $WORKDIR/sample.jpeg $MYDIR/sample.jpeg.base64
 [ -x libiptcdata_test ]