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

[Michael Biebl]

Author: biebl
Date: 2007-04-01 18:32:14 +0000 (Sun, 01 Apr 2007)
New Revision: 1312

Removed:
   packages/experimental/hal/debian/patches/30_cdrom_bogus_tocinfo.patch
Modified:
   packages/experimental/hal/debian/changelog
Log:
* Update to rc3
* 30_cdrom_bogus_tocinfo patch has been applied upstream. Remove it.


Modified: packages/experimental/hal/debian/changelog
===================================================================
--- packages/experimental/hal/debian/changelog	2007-03-31 17:48:29 UTC (rev 1311)
+++ packages/experimental/hal/debian/changelog	2007-04-01 18:32:14 UTC (rev 1312)
@@ -1,4 +1,4 @@
-hal (0.5.9~rc2-1) experimental; urgency=low
+hal (0.5.9~rc3-1) experimental; urgency=low
 
   * New upstream release.
   * Patches removed as they were applied or fixed upstream:
@@ -19,9 +19,9 @@
     - 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
+    - debian/patches/30_cdrom_bogus_tocinfo.patch
   * Revised patches:
     - debian/patches/02_powerscripts.patch
-    - debian/patches/30_cdrom_bogus_tocinfo.patch
   * debian/patches/19_sonypi_support.patch
     - Removed. Instead of relying on the external spicctrl tool, /dev/sonypi
       is used directly now by the hal-system-sonypic addon.

Deleted: packages/experimental/hal/debian/patches/30_cdrom_bogus_tocinfo.patch
===================================================================
--- packages/experimental/hal/debian/patches/30_cdrom_bogus_tocinfo.patch	2007-03-31 17:48:29 UTC (rev 1311)
+++ packages/experimental/hal/debian/patches/30_cdrom_bogus_tocinfo.patch	2007-04-01 18:32:14 UTC (rev 1312)
@@ -1,18 +0,0 @@
-diff --git a/hald/linux/probing/probe-volume.c b/hald/linux/probing/probe-volume.c
-index 1a255a7..a84d0c6 100644
---- a/hald/linux/probing/probe-volume.c
-+++ b/hald/linux/probing/probe-volume.c
-@@ -613,7 +613,12 @@ main (int argc, char *argv[])
- 			int vid_ret;
- 			HAL_INFO (("invoking volume_id_probe_all, offset=%d, size=%d", vol_probe_offset, vol_size));
- 			vid_ret = volume_id_probe_all (vid, vol_probe_offset , vol_size);
--			HAL_INFO (("volume_id_probe_all returned %d"));
-+			if (vid_ret != 0 && is_disc && vol_probe_offset != 0) {
-+				/* Some cd-rom drives report the offset of the session in the cd's TOC wrong.
-+				* Fallback to probing at offset 0, just to be sure */
-+				vid_ret = volume_id_probe_all (vid, 0 , vol_size);
-+			}
-+			HAL_INFO (("volume_id_probe_all returned %d", vid_ret));
- 			if (vid_ret == 0) {
- 				set_volume_id_values(ctx, udi, cs, vid);
- 				if (disc_may_have_data) {