diff -u udisks-1.0.1/debian/control udisks-1.0.1/debian/control
--- udisks-1.0.1/debian/control
+++ udisks-1.0.1/debian/control
@@ -1,7 +1,8 @@
 Source: udisks
 Section: admin
 Priority: optional
-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
 Uploaders: Michael Biebl <biebl@debian.org>, Martin Pitt <mpitt@debian.org>
 Build-Depends: debhelper (>= 7),
  cdbs,
diff -u udisks-1.0.1/debian/changelog udisks-1.0.1/debian/changelog
--- udisks-1.0.1/debian/changelog
+++ udisks-1.0.1/debian/changelog
@@ -1,3 +1,15 @@
+udisks (1.0.1-1ubuntu1) lucid-proposed; urgency=low
+
+  * Add 00git-fix-floppy-probing-hangs.patch: A lot of modern machines do not
+    have a floppy drive any more, but still have a floppy controller somewhere
+    (or at least the BIOS pretends to). Trying to open(/dev/fd0) on these
+    machines causes long hangs, which lead to long desktop startup times.
+    To fix this, avoid probing floppies for media in update_info().
+    nautilus/gvfs do not expect the media state to be correct for floppies
+    anyway. (LP: #539515)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 03 Jun 2010 12:15:33 +0200
+
 udisks (1.0.1-1build1) lucid; urgency=low
 
   * no change rebuild against libparted to fix hardy to lucid
diff -u udisks-1.0.1/debian/patches/series udisks-1.0.1/debian/patches/series
--- udisks-1.0.1/debian/patches/series
+++ udisks-1.0.1/debian/patches/series
@@ -1,4 +1,5 @@
 # Debian patches for udisks
+00git-fix-floppy-probing-hangs.patch
 01-mkfs-tempdir.patch
 02-defer_smart_probing.patch
 05-german-translations.patch
only in patch2:
unchanged:
--- udisks-1.0.1.orig/debian/patches/00git-fix-floppy-probing-hangs.patch
+++ udisks-1.0.1/debian/patches/00git-fix-floppy-probing-hangs.patch
@@ -0,0 +1,29 @@
+commit ca93d4e2d9e7f483b2fde1725da086e2cca44164
+Author: Martin Pitt <martin.pitt@ubuntu.com>
+Date:   Wed Jun 2 15:56:07 2010 +0200
+
+    Fix long hangs on probing nonexistant floppy drives
+    
+    A lot of modern machines do not have a floppy drive any more, but still have a
+    floppy controller somewhere (or at least the BIOS pretends to). Trying to
+    open(/dev/fd0) on these machines causes long hangs, which lead to long desktop
+    startup times.
+    
+    To fix this, avoid probing floppies for media in update_info().
+    
+Bug-Ubuntu: https://launchpad.net/bugs/539515
+
+diff --git a/src/device.c b/src/device.c
+index 763385c..0e87f1d 100644
+--- a/src/device.c
++++ b/src/device.c
+@@ -4471,7 +4471,8 @@ update_info (Device *device)
+     {
+       media_available = FALSE;
+ 
+-      if (!g_udev_device_get_property_as_boolean (device->priv->d, "ID_CDROM"))
++      if (!g_udev_device_get_property_as_boolean (device->priv->d, "ID_CDROM") &&
++          !g_udev_device_get_property_as_boolean (device->priv->d, "ID_DRIVE_FLOPPY"))
+         {
+           int fd;
+           fd = open (device->priv->device_file, O_RDONLY);