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

[Sjoerd Simons]

Author: sjoerd
Date: 2006-09-04 19:16:41 +0000 (Mon, 04 Sep 2006)
New Revision: 988

Added:
   packages/unstable/hal/debian/patches/23_addon_acpi.patch
Modified:
   packages/unstable/hal/debian/README.Debian
   packages/unstable/hal/debian/changelog
Log:
  detecting scsi cdrom drives as partitions (From upstream git)
* debian/patches/23_addon_acpi.patch
  - Added. Don't use the kernel acpi event interface if acpid is installed.
  (Closes: #380520, #352512)
* debian/README.Debian: Update documentations about the configuration of the
  callouts. Also mention how hal's acpi addon interacts with acpid.

Modified: packages/unstable/hal/debian/README.Debian
===================================================================
--- packages/unstable/hal/debian/README.Debian	2006-09-04 13:24:34 UTC (rev 987)
+++ packages/unstable/hal/debian/README.Debian	2006-09-04 19:16:41 UTC (rev 988)
@@ -1,6 +1,13 @@
- For now only the powermanagement callouts are enabled in the default hal
- config (org.freedesktop.Hal.Device.SystemPowerManagement and
- org.freedesktop.Hal.Device.LaptopPanel). The users in group powerdev can 
- access these. 
+ 
+ The powermanagement callouts are in the default hal config
+ (org.freedesktop.Hal.Device.SystemPowerManagement and
+ org.freedesktop.Hal.Device.LaptopPanel) can be used by users in group
+ powerdev. The storage callouts (org.freedesktop.Hal.Device.Volume.*) can by
+ used by users in the group plugdev.
 
+ The acpi addon won't use the kernel acpi events interface but the acpid's
+ event  socket if acpid is installed. If acpid is removed, hal needs to be
+ restarted to enable monitoring of acpi events again. And if apci is installed,
+ hal needs a restart to free the kernels acpi events interface for acpid.
+
  -- Sjoerd Simons <sjoerd at debian.org>

Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2006-09-04 13:24:34 UTC (rev 987)
+++ packages/unstable/hal/debian/changelog	2006-09-04 19:16:41 UTC (rev 988)
@@ -2,9 +2,14 @@
 
   * debian/patches/22_recognize_partitions.patch
     - Added. More robust recognition that a block device is a partition. Fixes
-    detecting scsi cdrom drives as partitions (From upstream git) 
+    detecting scsi cdrom drives as partitions (From upstream git)
+  * debian/patches/23_addon_acpi.patch
+    - Added. Don't use the kernel acpi event interface if acpid is installed.
+    (Closes: #380520, #352512)
+  * debian/README.Debian: Update documentations about the configuration of the
+    callouts. Also mention how hal's acpi addon interacts with acpid.
 
- -- Sjoerd Simons <sjoerd at debian.org>  Mon,  4 Sep 2006 14:51:47 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon,  4 Sep 2006 20:47:30 +0200
 
 hal (0.5.7.1-1) unstable; urgency=low
 

Added: packages/unstable/hal/debian/patches/23_addon_acpi.patch
===================================================================
--- packages/unstable/hal/debian/patches/23_addon_acpi.patch	                        (rev 0)
+++ packages/unstable/hal/debian/patches/23_addon_acpi.patch	2006-09-04 19:16:41 UTC (rev 988)
@@ -0,0 +1,19 @@
+diff -Naur hal-0.5.7.1.vanilla/hald/linux2/addons/addon-acpi.c hal-0.5.7.1/hald/linux2/addons/addon-acpi.c
+--- hal-0.5.7.1.vanilla/hald/linux2/addons/addon-acpi.c	2006-09-04 20:07:20.000000000 +0200
++++ hal-0.5.7.1/hald/linux2/addons/addon-acpi.c	2006-09-04 20:33:15.000000000 +0200
+@@ -46,9 +46,14 @@
+ acpi_get_event_fp_kernel (void)
+ {
+ 	FILE *fp = NULL;
++	struct stat sbuf;
+ 
+-	fp = fopen ("/proc/acpi/event", "r");
++	if (stat("/usr/sbin/acpid", &sbuf) == 0)  {
++		dbg("acpid installed, not using the kernel acpi event interface");
++		return NULL;
++	}
+ 
++	fp = fopen ("/proc/acpi/event", "r");
+ 	if (fp == NULL)
+ 		dbg ("Cannot open /proc/acpi/event: %s", strerror (errno));
+