diff -pruN 2.13.2-2/debian/changelog 2.13.2-2ubuntu1/debian/changelog
--- 2.13.2-2/debian/changelog	2025-01-22 23:11:22.000000000 +0000
+++ 2.13.2-2ubuntu1/debian/changelog	2025-01-24 22:38:24.000000000 +0000
@@ -1,9 +1,25 @@
+libmina-sshd-java (2.13.2-2ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/patches: Add patch to work-around SFTP test failure
+      (LP: #2071358)
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Fri, 24 Jan 2025 22:38:24 +0000
+
 libmina-sshd-java (2.13.2-2) unstable; urgency=medium
 
   * Looping over FileStore's instead of using getFileStore(Path)
 
  -- Pierre Gruet <pgt@debian.org>  Thu, 23 Jan 2025 00:11:22 +0100
 
+libmina-sshd-java (2.13.2-1ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/patches: Add patch to work-around SFTP test failure
+      (LP: #2071358)
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Mon, 18 Nov 2024 21:44:52 +0000
+
 libmina-sshd-java (2.13.2-1) unstable; urgency=medium
 
   * New upstream version 2.13.2
@@ -17,6 +33,13 @@ libmina-sshd-java (2.13.2-1) unstable; u
 
  -- Pierre Gruet <pgt@debian.org>  Sun, 22 Sep 2024 22:40:07 +0200
 
+libmina-sshd-java (2.12.1-2ubuntu1) oracular; urgency=medium
+
+  * d/patches: Add patch to work-around SFTP test failure
+    (LP: #2071358)
+
+ -- Pushkar Kulkarni <pushkar.kulkarni@canonical.com>  Thu, 27 Jun 2024 18:14:54 +0530
+
 libmina-sshd-java (2.12.1-2) unstable; urgency=medium
 
   * Source-only upload to unstable
diff -pruN 2.13.2-2/debian/control 2.13.2-2ubuntu1/debian/control
--- 2.13.2-2/debian/control	2024-09-22 20:39:27.000000000 +0000
+++ 2.13.2-2ubuntu1/debian/control	2025-01-24 22:38:24.000000000 +0000
@@ -1,7 +1,8 @@
 Source: libmina-sshd-java
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Thomas Koch <thomas@koch.ro>,
            Pierre Gruet <pgt@debian.org>
 Build-Depends: debhelper-compat (= 13),
diff -pruN 2.13.2-2/debian/patches/fix_sftp_io_exception.patch 2.13.2-2ubuntu1/debian/patches/fix_sftp_io_exception.patch
--- 2.13.2-2/debian/patches/fix_sftp_io_exception.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2.13.2-2ubuntu1/debian/patches/fix_sftp_io_exception.patch	2025-01-24 22:38:24.000000000 +0000
@@ -0,0 +1,30 @@
+Description: Modify test SpaceAvailableExtensionImplTest.testFileStoreReport()
+  that fails only in some chroots. The changed code will run more tests including
+  the existing test. This is irrelevant to the upstream repository because it
+  is a work-around for a specific build environment and is better than skipping
+  the test altogether. See https://bugs.openjdk.org/browse/JDK-8166162.
+  .
+  Rebased on top of handling_FileStore.patch introduced in 2.13.2-2.
+Forwarded: not-needed
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libmina-sshd-java/+bug/2071358
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1074355
+Author: Pushkar Kulkarni <pushkar.kulkarni@canonical.com>
+--- a/sshd-sftp/src/test/java/org/apache/sshd/sftp/client/extensions/helpers/SpaceAvailableExtensionImplTest.java
++++ b/sshd-sftp/src/test/java/org/apache/sshd/sftp/client/extensions/helpers/SpaceAvailableExtensionImplTest.java
+@@ -23,6 +23,7 @@ import java.io.IOException;
+ import java.io.StreamCorruptedException;
+ import java.nio.file.FileStore;
+ import java.nio.file.Files;
++import java.nio.file.FileSystem;
+ import java.nio.file.Path;
+ import java.util.Collections;
+ import java.util.List;
+@@ -63,7 +64,7 @@ public class SpaceAvailableExtensionImpl
+         Path lclSftp = CommonTestSupportUtils.resolve(targetPath, SftpConstants.SFTP_SUBSYSTEM_NAME, getClass().getSimpleName(),
+                 getCurrentTestName());
+         Path parentPath = targetPath.getParent();
+-        for (FileStore store: lclSftp.getRoot().getFileSystem().getFileStores()) {
++        for(FileStore store: parentPath.getFileSystem().getFileStores()) {
+             final String queryPath = CommonTestSupportUtils.resolveRelativeRemotePath(parentPath, lclSftp);
+             final SpaceAvailableExtensionInfo expected = new SpaceAvailableExtensionInfo(store);
+ 
diff -pruN 2.13.2-2/debian/patches/series 2.13.2-2ubuntu1/debian/patches/series
--- 2.13.2-2/debian/patches/series	2025-01-22 21:27:05.000000000 +0000
+++ 2.13.2-2ubuntu1/debian/patches/series	2025-01-24 22:38:24.000000000 +0000
@@ -7,3 +7,4 @@ skip_tests_requiring_networks.patch
 missing_test_classes.patch
 skip_reruns.patch
 handling_FileStore.patch
+fix_sftp_io_exception.patch