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

[Sjoerd Simons]

Author: sjoerd
Date: 2006-09-27 21:12:19 +0000 (Wed, 27 Sep 2006)
New Revision: 1040

Added:
   packages/unstable/hal/debian/debian-storage-policy-fixed-drives.fdi
   packages/unstable/hal/debian/patches/09_check_hashtable_initialisation.patch
Modified:
   packages/unstable/hal/debian/changelog
   packages/unstable/hal/debian/hal.install
Log:
  - Removed. Replaced by the new version of the mount scripts
  bugs caused by falling back when not needed.
  use that info to detect the formfactor.
* debian/debian-storage-policy-fixed-drives.fdi
  - Added. Add policy to hal so it refuses to mount and unmount fixed
  drives.
* debian/patches/09_check_hashtable_initialisation.patch
  - Added. Check if the udi to method queue hashtable is initialized before
  using it. (From upstream)

Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2006-09-27 19:59:06 UTC (rev 1039)
+++ packages/unstable/hal/debian/changelog	2006-09-27 21:12:19 UTC (rev 1040)
@@ -25,8 +25,7 @@
   * debian/patches/19_sonypi_support.patch
     - Updated. Upstream supports spicctrl but assumes it's in a different path
   * debian/patches/15_mount_scripts_pmount.patch
-    - TODO TODO! Removed for now, new hal mount programs need to be
-      re-evaluated!
+    - Removed. Replaced by the new version of the mount scripts
   * debian/rules: Disable PolicyKit
   * debian/control: Add build-depend on libvolume-id-dev
   * debian/patches/23_addon_acpi.patch
@@ -44,7 +43,7 @@
       upstream git)
   * debian/patches/05_one_formfactor_fallback.patch
     - Added. Use one fallback to an unknown formfactor instead of three. Fixes
-    bugs caused by falling back when not needed.  
+    bugs caused by falling back when not needed.
   * debian/patches/06_smbios_return.patch
     - Added. Only let the prober return success if it actually found some
     usefull info.
@@ -53,9 +52,15 @@
     it as being able to suspend even though mem isn't in /sys/power/state
   * debian/patches/08_openfirmware.patch
     - Added. Extra model and machine compatibility from openfirmware and
-    use that info to detect the formfactor. 
+    use that info to detect the formfactor.
+  * debian/debian-storage-policy-fixed-drives.fdi
+    - Added. Add policy to hal so it refuses to mount and unmount fixed
+    drives.
+  * debian/patches/09_check_hashtable_initialisation.patch
+    - Added. Check if the udi to method queue hashtable is initialized before
+    using it. (From upstream)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Wed, 27 Sep 2006 17:41:09 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Wed, 27 Sep 2006 23:09:39 +0200
 
 hal (0.5.7.1-2) unstable; urgency=low
 

Added: packages/unstable/hal/debian/debian-storage-policy-fixed-drives.fdi
===================================================================
--- packages/unstable/hal/debian/debian-storage-policy-fixed-drives.fdi	                        (rev 0)
+++ packages/unstable/hal/debian/debian-storage-policy-fixed-drives.fdi	2006-09-27 21:12:19 UTC (rev 1040)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> 
+
+<deviceinfo version="0.2">
+<device>
+  <match key="@block.storage_device:storage.hotpluggable" bool="false">
+    <match key="@block.storage_device:storage.removable" bool="false">
+      <merge key="volume.ignore" type="bool">true</merge>
+    </match>
+  </match>
+</device>
+</deviceinfo>

Modified: packages/unstable/hal/debian/hal.install
===================================================================
--- packages/unstable/hal/debian/hal.install	2006-09-27 19:59:06 UTC (rev 1039)
+++ packages/unstable/hal/debian/hal.install	2006-09-27 21:12:19 UTC (rev 1040)
@@ -9,3 +9,4 @@
 debian/tmp/usr/lib/hal/
 debian/tmp/usr/share/hal/fdi
 debian/preferences.fdi  etc/hal/fdi/policy
+debian/debian-storage-policy-fixed-drives.fdi usr/share/hal/fdi/policy/10osvendor

Added: packages/unstable/hal/debian/patches/09_check_hashtable_initialisation.patch
===================================================================
--- packages/unstable/hal/debian/patches/09_check_hashtable_initialisation.patch	                        (rev 0)
+++ packages/unstable/hal/debian/patches/09_check_hashtable_initialisation.patch	2006-09-27 21:12:19 UTC (rev 1040)
@@ -0,0 +1,18 @@
+diff --git a/doc/api/.gitignore b/doc/api/.gitignore
+diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
+diff --git a/doc/api/hal-docs.xml b/doc/api/hal-docs.xml
+diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c
+index 7a51bfb..741a52e 100644
+--- a/hald/hald_dbus.c
++++ b/hald/hald_dbus.c
+@@ -2902,7 +2902,8 @@ device_is_executing_method (HalDevice *d
+ 
+ 	ret = FALSE;
+ 
+-	if (g_hash_table_lookup_extended (udi_to_method_queue, d->udi, &origkey, (gpointer) &queue)) {
++	if (udi_to_method_queue != NULL &&
++	    g_hash_table_lookup_extended (udi_to_method_queue, d->udi, &origkey, (gpointer) &queue)) {
+ 
+ 		if (queue != NULL) {
+ 			MethodInvocation *mi;
+diff --git a/tools/hal-storage-shared.c b/tools/hal-storage-shared.c