diff -Nru gvfs-1.44.1/debian/changelog gvfs-1.44.1/debian/changelog --- gvfs-1.44.1/debian/changelog 2020-04-14 11:03:29.000000000 -0400 +++ gvfs-1.44.1/debian/changelog 2021-10-16 05:11:15.000000000 -0400 @@ -1,3 +1,9 @@ +gvfs (1.44.1-1ubuntu1-test) focal; urgency=medium + + * fix trashd hang. merges commit dc21a0948bcbe8a6d79d674bd1e4d63ded57d340 from gvfs gitlab (https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/96) + + -- David B Sat, 16 Oct 2021 05:11:15 -0400 + gvfs (1.44.1-1ubuntu1) focal; urgency=medium * Merge with debian. Remaining changes: diff -Nru gvfs-1.44.1/debian/patches/fix-trashd-hang.patch gvfs-1.44.1/debian/patches/fix-trashd-hang.patch --- gvfs-1.44.1/debian/patches/fix-trashd-hang.patch 1969-12-31 19:00:00.000000000 -0500 +++ gvfs-1.44.1/debian/patches/fix-trashd-hang.patch 2021-10-16 01:06:28.000000000 -0400 @@ -0,0 +1,22 @@ +--- a/daemon/trashlib/dirwatch.c 2020-03-27 08:29:59.000000000 -0400 ++++ b/daemon/trashlib/dirwatch.c 2021-10-16 00:57:40.985738068 -0400 +@@ -216,6 +216,7 @@ + watch->state = FALSE; + } + ++ g_file_monitor_cancel (watch->parent_monitor); + g_object_unref (watch->parent_monitor); + watch->parent_monitor = NULL; + } +@@ -271,7 +272,10 @@ + if (watch != NULL) + { + if (watch->parent_monitor) +- g_object_unref (watch->parent_monitor); ++ { ++ g_file_monitor_cancel (watch->parent_monitor); ++ g_object_unref (watch->parent_monitor); ++ } + + g_object_unref (watch->directory); + g_object_unref (watch->topdir); diff -Nru gvfs-1.44.1/debian/patches/series gvfs-1.44.1/debian/patches/series --- gvfs-1.44.1/debian/patches/series 2020-04-14 11:03:29.000000000 -0400 +++ gvfs-1.44.1/debian/patches/series 2021-10-16 05:07:56.000000000 -0400 @@ -8,3 +8,4 @@ Remove-version-from-polkit-gobject-dependency.patch Revert-fuse-Remove-max_write-limit.patch Revert-fuse-Adapt-gvfsd-fuse-to-use-fuse-3.x.patch +fix-trashd-hang.patch