From 93a622d996347b48b63b61427e73ac4e9e6af90a74d9e97ee411141c273a7797 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 22 Sep 2009 19:50:40 +0000 Subject: [PATCH] Accepting request 20798 from Base:System Copy from Base:System/acpid based on submit request 20798 from user dirkmueller OBS-URL: https://build.opensuse.org/request/show/20798 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/acpid?expand=0&rev=24 --- acpid.changes | 13 +++++++++++++ acpid.spec | 2 +- power_button | 2 +- thinkpad_acpi.modprobe | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/acpid.changes b/acpid.changes index 1e78835..da25507 100644 --- a/acpid.changes +++ b/acpid.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Sep 2 17:58:25 CEST 2009 - glin@novell.com + +- Don't shutdown if dalston-power-applet is running. + +------------------------------------------------------------------- +Sun Aug 30 11:56:59 UTC 2009 - aj@suse.de + +- Remove enable from hotkey setting for think_acpi to get rid of this + kernel message: + "Please remove the hotkey=enable module parameter, it is deprecated. + Hotkeys are always enabled." + ------------------------------------------------------------------- Thu Jul 9 15:17:58 CEST 2009 - seife@suse.de diff --git a/acpid.spec b/acpid.spec index 5008e7c..4482786 100644 --- a/acpid.spec +++ b/acpid.spec @@ -21,7 +21,7 @@ Name: acpid Url: http://acpid.sourceforge.net/ Version: 1.0.10 -Release: 2 +Release: 3 %define acpi_version 0.09 License: GPL v2 or later Group: System/Daemons diff --git a/power_button b/power_button index 1bcd56d..977779c 100644 --- a/power_button +++ b/power_button @@ -47,7 +47,7 @@ while read A; do if [ "$IS_ACTIVE" = "true" -a -n "$DISP" ]; then # additional check, if none of these two apps are running, go on - if [ -n "`pidof kpowersave`" -o -n "`pidof gnome-power-manager`" -o -n "`pidof kded4`" ]; then + if [ -n "`pidof kpowersave`" -o -n "`pidof gnome-power-manager`" -o -n "`pidof kded4`" -o -n "`pidof dalston-power-applet`" ]; then echo doing nothing... exit 0 fi diff --git a/thinkpad_acpi.modprobe b/thinkpad_acpi.modprobe index a8f063a..92f74bc 100644 --- a/thinkpad_acpi.modprobe +++ b/thinkpad_acpi.modprobe @@ -9,4 +9,4 @@ # http://bugzilla.novell.com/ # -options thinkpad_acpi experimental=1 hotkey=enable,0xffffff +options thinkpad_acpi experimental=1 hotkey=0xffffff