diff -pruN 2.14.0-8.1/debian/changelog 2.14.0-8.1ubuntu1/debian/changelog
--- 2.14.0-8.1/debian/changelog	2023-04-07 18:22:10.000000000 +0000
+++ 2.14.0-8.1ubuntu1/debian/changelog	2023-05-23 04:58:14.000000000 +0000
@@ -1,3 +1,10 @@
+timidity (2.14.0-8.1ubuntu1) mantic; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - d/rules: Fix usage of spaces inside target instead of tabs.
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 23 May 2023 05:58:14 +0100
+
 timidity (2.14.0-8.1) unstable; urgency=medium
 
   * Non-maintainer upload
@@ -6,6 +13,30 @@ timidity (2.14.0-8.1) unstable; urgency=
 
  -- Paul Gevers <elbrus@debian.org>  Fri, 07 Apr 2023 20:22:10 +0200
 
+timidity (2.14.0-8ubuntu3) lunar; urgency=medium
+
+  * No-change rebuild again to pick up remaining flac.
+
+ -- Rik Mills <rikmills@kde.org>  Sun, 04 Dec 2022 10:52:00 +0000
+
+timidity (2.14.0-8ubuntu2) lunar; urgency=medium
+
+  * No-change rebuild against libflac++10 & libflac12.
+
+ -- Rik Mills <rikmills@kde.org>  Mon, 28 Nov 2022 16:31:33 +0000
+
+timidity (2.14.0-8ubuntu1) jammy; urgency=medium
+
+  * d/rules: Fix usage of spaces inside target instead of tabs (LP: #1946767)
+
+ -- Alexandre Ghiti <alexandre.ghiti@canonical.com>  Tue, 12 Oct 2021 17:09:38 +0200
+
+timidity (2.14.0-8build1) eoan; urgency=medium
+
+  * No-change upload with strops.h and sys/strops.h removed in glibc.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 05 Sep 2019 11:14:21 +0000
+
 timidity (2.14.0-8) unstable; urgency=medium
 
   * Fix FTBFS due to test requiring /etc/timidity/timidity.cfg
diff -pruN 2.14.0-8.1/debian/control 2.14.0-8.1ubuntu1/debian/control
--- 2.14.0-8.1/debian/control	2023-04-07 18:22:10.000000000 +0000
+++ 2.14.0-8.1ubuntu1/debian/control	2021-10-12 15:09:38.000000000 +0000
@@ -1,7 +1,8 @@
 Source: timidity
 Section: sound
 Priority: optional
-Maintainer: Bastien Roucariès <rouca@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Bastien Roucariès <rouca@debian.org>
 Build-Depends:
  debhelper (>= 11),
  dh-exec,
diff -pruN 2.14.0-8.1/debian/rules 2.14.0-8.1ubuntu1/debian/rules
--- 2.14.0-8.1/debian/rules	2023-04-07 18:22:10.000000000 +0000
+++ 2.14.0-8.1ubuntu1/debian/rules	2021-10-12 15:09:38.000000000 +0000
@@ -35,9 +35,9 @@ override_dh_auto_test:
 	# timidity/timidity --verbose debian/test_sample.mid -Ov -o /dev/null
 else
 override_dh_auto_test:
-        @echo '**********************************************************'
-        @echo 'Skip test suite                                           '
-        @echo '**********************************************************'
+	@echo '**********************************************************'
+	@echo 'Skip test suite                                           '
+	@echo '**********************************************************'
 endif
 
 override_dh_installman: