diff --git a/acpid.changes b/acpid.changes index be56c4f..f6e0648 100644 --- a/acpid.changes +++ b/acpid.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 20 17:31:51 CEST 2008 - thoenig@suse.de + +- The game is not over yet: Re-introduce hotkey mask for + thinkpad_acpi.modprobe (bnc#369535, bnc#382343) + ------------------------------------------------------------------- Tue Feb 26 14:22:31 CET 2008 - thoenig@suse.de diff --git a/acpid.spec b/acpid.spec index eeafd0c..dc605c6 100644 --- a/acpid.spec +++ b/acpid.spec @@ -14,7 +14,7 @@ Name: acpid Url: http://acpid.sourceforge.net/ Version: 1.0.6 -Release: 46 +Release: 61 %define acpi_version 0.09 License: GPL v2 or later Group: System/Daemons @@ -114,6 +114,9 @@ rm -rf %{buildroot} %ghost %config(noreplace,missingok) %_var/log/acpid %changelog +* Tue May 20 2008 thoenig@suse.de +- The game is not over yet: Re-introduce hotkey mask for + thinkpad_acpi.modprobe (bnc#369535, bnc#382343) * Tue Feb 26 2008 thoenig@suse.de - Drop hotkey masks for thinkpad_acpi.modprobe * Tue Sep 11 2007 thoenig@suse.de @@ -157,7 +160,7 @@ rm -rf %{buildroot} - ignore editor backup files for the event configuration. - package the provided action script samples under documentation. - cleanup the specfile %%prep section. -* Tue Oct 17 2006 hmacht@suse.de +* Wed Oct 18 2006 hmacht@suse.de - load CPUFreq modules before acpi modules, otherwise we would exit without acpi support * Tue Sep 12 2006 hmacht@suse.de @@ -221,7 +224,7 @@ rm -rf %{buildroot} * toshiba_acpi - added $SYSCONFDIR/modprobe.d/ibm_acpi for ibm_acpi to load the module with "experimental=1" -* Fri Aug 05 2005 seife@suse.de +* Sat Aug 06 2005 seife@suse.de - load ACPI modules in /etc/init.d/acpid. * Fri Aug 05 2005 trenn@suse.de - Activate acpid by default again (use -Y to force, was disabled diff --git a/thinkpad_acpi.modprobe b/thinkpad_acpi.modprobe index 822e7fa..28097a5 100644 --- a/thinkpad_acpi.modprobe +++ b/thinkpad_acpi.modprobe @@ -9,4 +9,4 @@ # http://bugzilla.novell.com/ # -options thinkpad_acpi experimental=1 +options thinkpad_acpi experimental=1 hotkey=enable,0xffffff