diff -Nru thunar-volman-0.8.0/debian/changelog thunar-volman-0.8.0/debian/changelog --- thunar-volman-0.8.0/debian/changelog 2014-02-02 20:55:10.000000000 +0000 +++ thunar-volman-0.8.0/debian/changelog 2014-04-14 01:16:04.000000000 +0000 @@ -1,3 +1,9 @@ +thunar-volman (0.8.0-4ubuntu1) trusty; urgency=medium + + * Fix auto-mounting of removable devices. LP: #1210898 + + -- Thaddäus Tintenfisch Fri, 11 Apr 2014 21:59:42 +0200 + thunar-volman (0.8.0-4) unstable; urgency=medium * debian/control: diff -Nru thunar-volman-0.8.0/debian/control thunar-volman-0.8.0/debian/control --- thunar-volman-0.8.0/debian/control 2014-02-02 20:40:52.000000000 +0000 +++ thunar-volman-0.8.0/debian/control 2014-04-14 01:16:04.000000000 +0000 @@ -1,7 +1,8 @@ Source: thunar-volman Section: xfce Priority: optional -Maintainer: Debian Xfce Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez , Lionel Le Folgoc Build-Depends: debhelper (>= 9), libexo-1-dev (>= 0.6.0), dpkg-dev (>= 1.16.1), diff -Nru thunar-volman-0.8.0/debian/patches/01_fix-auto-mounting-of-removable-devices.patch thunar-volman-0.8.0/debian/patches/01_fix-auto-mounting-of-removable-devices.patch --- thunar-volman-0.8.0/debian/patches/01_fix-auto-mounting-of-removable-devices.patch 1970-01-01 00:00:00.000000000 +0000 +++ thunar-volman-0.8.0/debian/patches/01_fix-auto-mounting-of-removable-devices.patch 2014-04-14 01:16:04.000000000 +0000 @@ -0,0 +1,46 @@ +Author: Matias De lellis +Description: Wait 1 second before automatically mounting devices +Bug: https://bugzilla.xfce.org/show_bug.cgi?id=9193 +Bug-Ubuntu: https://launchpad.net/bugs/1210898 + +--- + thunar-volman/tvm-block-device.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +--- a/thunar-volman/tvm-block-device.c ++++ b/thunar-volman/tvm-block-device.c +@@ -708,7 +708,7 @@ tvm_block_device_mount_finish (GVolume *volume, + + + +-static void ++static gboolean + tvm_block_device_mount (TvmContext *context) + { + GMountOperation *mount_operation; +@@ -751,6 +751,7 @@ tvm_block_device_mount (TvmContext *context) + /* finish processing the device */ + tvm_device_handler_finished (context); + } ++ return FALSE; + } + + +@@ -881,7 +882,7 @@ automount_disc: + if (automount) + { + /* mount the CD/DVD and continue with inspecting its contents */ +- tvm_block_device_mount (context); ++ g_timeout_add_seconds(1, tvm_block_device_mount, context); + } + } + else +@@ -904,7 +905,7 @@ automount_disc: + if (automount) + { + /* mount the partition and continue with inspecting its contents */ +- tvm_block_device_mount (context); ++ g_timeout_add_seconds(1, tvm_block_device_mount, context); + } + else + { diff -Nru thunar-volman-0.8.0/debian/patches/series thunar-volman-0.8.0/debian/patches/series --- thunar-volman-0.8.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ thunar-volman-0.8.0/debian/patches/series 2014-04-14 01:16:04.000000000 +0000 @@ -0,0 +1 @@ +01_fix-auto-mounting-of-removable-devices.patch