diff -pruN 6.13.0-2/debian/changelog 6.13.0-2ubuntu2/debian/changelog
--- 6.13.0-2/debian/changelog	2025-02-23 14:32:04.000000000 +0000
+++ 6.13.0-2ubuntu2/debian/changelog	2025-09-06 15:40:02.000000000 +0000
@@ -1,3 +1,19 @@
+xfsprogs (6.13.0-2ubuntu2) questing; urgency=medium
+
+  * Rebuild to include updated RISC-V base ISA RVA23
+
+ -- Heinrich Schuchardt <heinrich.schuchardt@canonical.com>  Sat, 06 Sep 2025 15:40:02 +0000
+
+xfsprogs (6.13.0-2ubuntu1) plucky; urgency=medium
+
+  * Merge from Debian Unstable. Remaining changes:
+    - d/rules: modernize build script (LP: #2076309)
+      + Use autoreconf template, this will now properly install the
+        translation files
+      + Use $(CURDIR) to replace `pwd` syntax
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 23 Mar 2025 10:11:32 -0500
+
 xfsprogs (6.13.0-2) unstable; urgency=medium
 
   * Patch: mkfs: Correct filesize declaration
@@ -10,6 +26,20 @@ xfsprogs (6.13.0-1) unstable; urgency=lo
 
  -- Nathan Scott <nathans@debian.org>  Thu, 13 Feb 2025 14:00:00 +0100
 
+xfsprogs (6.12.0-1ubuntu1) plucky; urgency=medium
+
+  * Merge from Debian Unstable. Remaining changes:
+    - d/rules: modernize build script (LP: #2076309)
+      + Use autoreconf template, this will now properly install the
+        translation files
+      + Use $(CURDIR) to replace `pwd` syntax
+  * Dropped changes:
+    - Fix fsck.xfs run by different shells when fsck.mode=force is set
+      (LP: #2081163).
+    - d/control: add systemd-dev to B-D
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 16 Feb 2025 07:27:45 -0600
+
 xfsprogs (6.12.0-1) unstable; urgency=low
 
   * New upstream release
@@ -40,6 +70,50 @@ xfsprogs (6.9.0-1) unstable; urgency=low
 
  -- Nathan Scott <nathans@debian.org>  Mon, 22 Jul 2024 14:00:00 +0100
 
+xfsprogs (6.8.0-2.2ubuntu3) plucky; urgency=medium
+
+  * No-change rebuild for icu soname change.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 05 Jan 2025 20:28:57 +0100
+
+xfsprogs (6.8.0-2.2ubuntu2) plucky; urgency=medium
+
+  * Backport from upstream:
+    - fix fsck.xfs run by different shells when fsck.mode=force is set
+      (LP: #2081163).
+
+ -- Gerald Yang <gerald.yang@canonical.com>  Thu, 07 Nov 2024 10:48:33 +0800
+
+xfsprogs (6.8.0-2.2ubuntu1) oracular; urgency=medium
+
+  * d/rules: modernize build script (LP: #2076309)
+    - Use autoreconf template, this will now properly installs the
+      translation files
+    - Use $(CURDIR) to replace `pwd` syntax
+  * d/control: add systemd-dev to B-D
+
+ -- Zixing Liu <zixing.liu@canonical.com>  Wed, 07 Aug 2024 22:59:44 -0600
+
+xfsprogs (6.8.0-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix installation of files into xfslibs-dev (Closes: #1073831)
+
+ -- Chris Hofstaedtler <zeha@debian.org>  Wed, 19 Jun 2024 23:33:58 +0200
+
+xfsprogs (6.8.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install all files into UsrMerged layout. (Closes: #1060352)
+
+ -- Chris Hofstaedtler <zeha@debian.org>  Wed, 12 Jun 2024 17:50:50 +0200
+
+xfsprogs (6.8.0-2) unstable; urgency=medium
+
+  * Fix build on mips64el
+
+ -- Bastian Germann <bage@debian.org>  Wed, 22 May 2024 22:44:14 +0000
+
 xfsprogs (6.8.0-1) unstable; urgency=low
 
   * New upstream release
@@ -1351,3 +1425,4 @@ xfsprogs (1.1.0) unstable; urgency=low
 Local variables:
 mode: debian-changelog
 End:
+
diff -pruN 6.13.0-2/debian/control 6.13.0-2ubuntu2/debian/control
--- 6.13.0-2/debian/control	2025-02-13 10:28:27.000000000 +0000
+++ 6.13.0-2ubuntu2/debian/control	2025-02-23 22:26:17.000000000 +0000
@@ -1,7 +1,8 @@
 Source: xfsprogs
 Section: admin
 Priority: optional
-Maintainer: XFS Development Team <linux-xfs@vger.kernel.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: XFS Development Team <linux-xfs@vger.kernel.org>
 Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar <anibal@debian.org>, Bastian Germann <bage@debian.org>
 Build-Depends: libinih-dev (>= 53), uuid-dev, debhelper (>= 12), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libicu-dev, pkg-config, liburcu-dev, systemd-dev | systemd (<< 253-2~)
 Standards-Version: 4.0.0
diff -pruN 6.13.0-2/debian/rules 6.13.0-2ubuntu2/debian/rules
--- 6.13.0-2/debian/rules	2025-02-13 10:28:27.000000000 +0000
+++ 6.13.0-2ubuntu2/debian/rules	2025-02-23 22:26:17.000000000 +0000
@@ -52,6 +52,7 @@ diopts  = $(options) \
 
 override_dh_auto_configure:
 	dh_testdir
+	dh_update_autotools_config
 	touch .gitcensus
 
 override_dh_auto_build:
@@ -75,12 +76,14 @@ override_dh_auto_build:
 	@echo "== dpkg-buildpackage: build" 1>&2
 	$(MAKE) $(PMAKEFLAGS) default
 
-execute_before_dh_clean:
+override_dh_clean:
 	@echo "== dpkg-buildpackage: clean" 1>&2
 	dh_testdir
 	-rm -f built .gitcensus mkfs/mkfs.xfs-$(bootpkg)
 	$(MAKE) distclean
 	-rm -rf $(dirme) $(dirdev) $(dirdi)
+	dh_autoreconf_clean
+	dh_clean
 
 override_dh_auto_install:
 	@echo "== dpkg-buildpackage: binary-arch" 1>&2
@@ -97,4 +100,4 @@ override_dh_installdocs:
 	dh_installdocs -XCHANGES
 
 override_dh_installsystemd:
-	dh_installsystemd -p xfsprogs --no-restart-after-upgrade --no-stop-on-upgrade system-xfs_scrub.slice xfs_scrub_all.timer
+	dh_installsystemd -p xfsprogs --no-enable --no-start --no-restart-after-upgrade --no-stop-on-upgrade
