[Pkg-utopia-commits] r1034 - in packages/unstable/hal/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-09-27 15:37:42 +0000 (Wed, 27 Sep 2006)
New Revision: 1034

Added:
   packages/unstable/hal/debian/patches/04_cd_write.patch
Modified:
   packages/unstable/hal/debian/changelog
Log:
* debian/patches/03_macbookpro_configure.patch
* debian/patches/04_cd_write.patch
  - Added. don't crash on cd drives without write capabilities (From
    upstream git)

Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2006-09-26 19:27:09 UTC (rev 1033)
+++ packages/unstable/hal/debian/changelog	2006-09-27 15:37:42 UTC (rev 1034)
@@ -35,12 +35,15 @@
     for the definition of ARPHRD_IEEE80211_RADIOTAP
   * debian/hal.install: Scripts are no longer in /usr/share/hal but in
     /usr/lib/hal
-  * debian/patches/03_macbookpro_configure.patch 
+  * debian/patches/03_macbookpro_configure.patch
     - Added. Change configure so the macbook pro utils can actually be
     disabled.
   * debian/rules: Disable the macbook pro backlight addon.
+  * debian/patches/04_cd_write.patch
+    - Added. don't crash on cd drives without write capabilities (From
+      upstream git)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Tue, 26 Sep 2006 21:11:18 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Wed, 27 Sep 2006 17:24:29 +0200
 
 hal (0.5.7.1-2) unstable; urgency=low
 

Added: packages/unstable/hal/debian/patches/04_cd_write.patch
===================================================================
--- packages/unstable/hal/debian/patches/04_cd_write.patch	                        (rev 0)
+++ packages/unstable/hal/debian/patches/04_cd_write.patch	2006-09-27 15:37:42 UTC (rev 1034)
@@ -0,0 +1,26 @@
+commit c127f54ee1a91743989ccdbe93025740fe9cec73
+Author: David Zeuthen <davidz at redhat.com>
+Date:   Tue Sep 26 15:50:51 2006 -0400
+
+    don't crash on cd drives without write capabilities
+    
+    This fix needs to be forward-ported to master. Probably we shouldn't
+    be looking for write speeds unless the drive can write. This fix
+    will do it for the 0.5.8 series though.
+
+diff --git a/hald/linux/probing/probe-storage.c b/hald/linux/probing/probe-storage.c
+index 41c43bd..8afeb8d 100644
+--- a/hald/linux/probing/probe-storage.c
++++ b/hald/linux/probing/probe-storage.c
+@@ -254,8 +254,10 @@ main (int argc, char *argv[])
+ 						free (write_speeds);
+ 					}
+ 				} else {
++					gchar *wspeeds[1] = {NULL};
+ 					libhal_changeset_set_property_int (cs, "storage.cdrom.write_speed", 0);
+-					libhal_changeset_set_property_strlist (cs, "storage.cdrom.write_speeds", NULL);
++					libhal_changeset_set_property_strlist (cs, "storage.cdrom.write_speeds", 
++									       (const char **) wspeeds);
+ 				}
+ 			}
+