-
Committer:
Bazaar Package Importer
-
Author(s):
Tormod Volden
-
Date:
2007-05-30 22:30:20 UTC
-
mfrom:
(1.1.4 upstream)
-
Revision ID:
james.westby@ubuntu.com-20070530223020-4pzkcrigj25btclh
Tags: 1.34-1ubuntu1
* Merge from debian unstable, remaining changes:
- etc/init.d/laptop-mode: Check if laptop mode is disabled in
/etc/default/laptop-mode (that's the file laptop_mode looks into, too,
but it incorrectly evaluates the ENABLE_LAPTOP_MODE setting) as well
as in /etc/default/acpi-support.
- Add debian/laptop-mode-tools.postinst: Create /etc/default/laptop-mode
(with ENABLE_LAPTOP_MODE=false) if the file does not exist yet and we
are on ppc.
- /usr/sbin/laptop_mode: Do not parse arguments, ignore "force" and
"init" and let start/stop mean enable/disable.
- /usr/sbin/laptop_mode: Do not read $ACTIVATE_WITH_POSSIBLE_DATA_LOSS
from /var/run/laptop-mode-state to see if state has changed.
* Fix error messages when run as non-root (Ubuntu bug #77560). Patch from
Peter Whittaker.