diff -Nru icu-67.1/debian/changelog icu-67.1/debian/changelog
--- icu-67.1/debian/changelog	2021-06-30 11:07:32.000000000 -0500
+++ icu-67.1/debian/changelog	2021-08-12 12:41:32.000000000 -0500
@@ -1,3 +1,11 @@
+icu (67.1-7ubuntu1) impish; urgency=high
+
+  * Merge from Debian unstable (LP: #1939728). Remaining changes:
+    - update-tz-tests.patch. This fixes a test failure caused by Ubuntu's
+      tzdata bundling icu-data, while Debian's does not
+
+ -- William 'jawn-smith' Wilson <william.wilson@canonical.com>  Thu, 12 Aug 2021 12:39:01 -0600
+
 icu (67.1-7) unstable; urgency=high
 
   * Backport upstream security fix for CVE-2021-30535: crash caused by locale
@@ -5,6 +13,19 @@
 
  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Wed, 30 Jun 2021 18:07:32 +0200
 
+icu (67.1-6ubuntu2) hirsute; urgency=medium
+
+  * No-change rebuild.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 22 Mar 2021 22:31:21 +0100
+
+icu (67.1-6ubuntu1) hirsute; urgency=medium
+
+  * Adding some missing Australian CanonicalID links to the
+    tztest. This fixes a FTBFS triggered by TestCanonicalID
+
+ -- William 'jawn-smith' Wilson <william.wilson@canonical.com>  Fri, 29 Jan 2021 15:39:01 -0600
+
 icu (67.1-6) unstable; urgency=medium
 
   * Add pkg-config build dependency to build-test of autopkg tests.
@@ -1238,3 +1259,4 @@
   * Initial Release.
 
  -- Yves Arrouye <yves@debian.org>  Tue, 24 Oct 2000 16:14:12 -0700
+
diff -Nru icu-67.1/debian/control icu-67.1/debian/control
--- icu-67.1/debian/control	2021-01-12 17:03:16.000000000 -0600
+++ icu-67.1/debian/control	2021-07-01 04:12:16.000000000 -0500
@@ -1,7 +1,8 @@
 Source: icu
 Section: libs
 Priority: optional
-Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.org>
 Standards-Version: 4.5.0
 Build-Depends: debhelper-compat (= 12), pkg-config, python3-distutils
 Build-Depends-Indep: doxygen (>= 1.7.1)
diff -Nru icu-67.1/debian/patches/series icu-67.1/debian/patches/series
--- icu-67.1/debian/patches/series	2021-06-30 11:07:32.000000000 -0500
+++ icu-67.1/debian/patches/series	2021-08-12 12:16:04.000000000 -0500
@@ -5,4 +5,5 @@
 layout-test-fix.patch
 #flaky-tests.patch
 ICU-13786_Fix_addLikelySubtags_minimizeSubtags.patch
+update-tz-tests.patch
 locid_operators.patch
diff -Nru icu-67.1/debian/patches/update-tz-tests.patch icu-67.1/debian/patches/update-tz-tests.patch
--- icu-67.1/debian/patches/update-tz-tests.patch	1969-12-31 18:00:00.000000000 -0600
+++ icu-67.1/debian/patches/update-tz-tests.patch	2021-01-29 15:39:01.000000000 -0600
@@ -0,0 +1,19 @@
+Description: Add Canonical TZ links to tztest
+ This is necessary as long as Ubuntu's tzdata package bundles
+ icu-data and Debian's does not.
+Author: William 'jawn-smith' Wilson <william.wilson@canonical.com>
+Origin: vendor
+Last-Update: 2021-01-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/source/test/intltest/tztest.cpp
++++ b/source/test/intltest/tztest.cpp
+@@ -2074,6 +2074,8 @@
+         {"Asia/Vientiane", "Asia/Bangkok"},
+         {"Atlantic/Jan_Mayen", "Europe/Oslo"},
+         {"Atlantic/St_Helena", "Africa/Abidjan"},
++        {"Australia/Hobart", "Australia/Currie"},
++        {"Australia/Tasmania", "Australia/Currie"},
+         {"Europe/Bratislava", "Europe/Prague"},
+         {"Europe/Busingen", "Europe/Zurich"},
+         {"Europe/Guernsey", "Europe/London"},