[Pkg-utopia-commits] r1300 - in packages/experimental/hal/debian: . patches

[Michael Biebl]

Author: biebl
Date: 2007-03-21 19:01:56 +0000 (Wed, 21 Mar 2007)
New Revision: 1300

Removed:
   packages/experimental/hal/debian/patches/29_handle_non_hal_mounts.patch
Modified:
   packages/experimental/hal/debian/changelog
Log:
Remove this now obsolete patch as hal handles this case now properly.


Modified: packages/experimental/hal/debian/changelog
===================================================================
--- packages/experimental/hal/debian/changelog	2007-03-21 18:40:10 UTC (rev 1299)
+++ packages/experimental/hal/debian/changelog	2007-03-21 19:01:56 UTC (rev 1300)
@@ -1,7 +1,7 @@
 hal (0.5.9~rc1-1) experimental; urgency=low
 
   * New upstream release.
-  * Patches removed as they were applied upstream:
+  * Patches removed as they were applied or fixed upstream:
     - debian/patches/03_macbookpro_configure.patch
     - debian/patches/04_cd_write.patch
     - debian/patches/05_one_formfactor_fallback.patch
@@ -17,13 +17,14 @@
     - debian/patches/25_correctly_free_lists.patch
     - debian/patches/26_fix_hald_not_running_coredump.patch
     - debian/patches/27_hal_fix_dbus_error_is_set.patch
+    - debian/patches/29_handle_non_hal_mounts.patch
   * Revised patches:
     - debian/patches/02_powerscripts.patch
     - debian/patches/30_cdrom_bogus_tocinfo.patch
     - debian/patches/13_hal_callout_bashism.patch
   * debian/patches/19_sonypi_support.patch
     - Removed. Instead of relying on the external spicctrl tool, /dev/sonypi
-      is used directly.
+      is used directly now.
   * debian/patches/55_nonpolkit-mount-policy.patch
     - Removed. We depend on PolicyKit now to check if a user is authorized to
       mount local partitions.

Deleted: packages/experimental/hal/debian/patches/29_handle_non_hal_mounts.patch
===================================================================
--- packages/experimental/hal/debian/patches/29_handle_non_hal_mounts.patch	2007-03-21 18:40:10 UTC (rev 1299)
+++ packages/experimental/hal/debian/patches/29_handle_non_hal_mounts.patch	2007-03-21 19:01:56 UTC (rev 1300)
@@ -1,17 +0,0 @@
-diff --git a/hald/linux/blockdev.c b/hald/linux/blockdev.c
-index 6c43ba2..d2f3164 100644
---- a/hald/linux/blockdev.c
-+++ b/hald/linux/blockdev.c
-@@ -1211,9 +1211,9 @@ force_unmount (HalDevice *d, void *end_token)
- 					cleanup_mountpoint_cb,
- 					g_strdup (mount_point), NULL);
- */
--	}
--
--
-+	} else {
-+		hal_util_callout_device_remove (d, blockdev_callouts_remove_done, end_token, NULL);
-+  }
- }
- 
- void