diff -pruN 2.14.0-8.3/debian/changelog 2.14.0-8.3ubuntu1/debian/changelog
--- 2.14.0-8.3/debian/changelog	2024-12-31 06:55:13.000000000 +0000
+++ 2.14.0-8.3ubuntu1/debian/changelog	2025-03-23 14:58:26.000000000 +0000
@@ -1,3 +1,10 @@
+timidity (2.14.0-8.3ubuntu1) plucky; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/rules: fix spaces instead of tab syntax error (LP: #2060574)
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 23 Mar 2025 09:58:26 -0500
+
 timidity (2.14.0-8.3) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -5,6 +12,12 @@ timidity (2.14.0-8.3) unstable; urgency=
 
  -- Bastian Germann <bage@debian.org>  Tue, 31 Dec 2024 06:55:13 +0000
 
+timidity (2.14.0-8.2ubuntu1) noble; urgency=medium
+
+  * debian/rules: fix spaces instead of tab syntax error (LP: #2060574)
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Mon, 08 Apr 2024 16:25:35 -0400
+
 timidity (2.14.0-8.2) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -993,3 +1006,4 @@ timidity (0.2i-1) contrib; urgency=low
   * Initial release.
 
  -- Klee Dienes <klee@debian.org>  Thu, 5 Sep 1996 04:36:32 -0700
+
diff -pruN 2.14.0-8.3/debian/control 2.14.0-8.3ubuntu1/debian/control
--- 2.14.0-8.3/debian/control	2024-12-31 06:55:13.000000000 +0000
+++ 2.14.0-8.3ubuntu1/debian/control	2025-03-15 17:40:02.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.3/debian/rules 2.14.0-8.3ubuntu1/debian/rules
--- 2.14.0-8.3/debian/rules	2024-12-31 06:55:13.000000000 +0000
+++ 2.14.0-8.3ubuntu1/debian/rules	2025-03-15 17:40:03.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: