-
Committer:
Bazaar Package Importer
-
Author(s):
Tormod Volden
-
Date:
2008-05-12 16:24:50 UTC
-
mfrom:
(1.1.6 upstream)
-
Revision ID:
james.westby@ubuntu.com-20080512162450-n0lm5jnbafdf89l0
Tags: 1.42-1ubuntu1
* Merge from debian unstable (LP: #229579), 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.
- /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.
- debian/rules: Do not ship acpi/apm scripts (we handle that ourselves)
- debian/laptop-mode-tools.preinst: Remove any old acpi/apm scripts
- 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.
- debian/control: Change maintainer
* Use #DEBHELPER# in .postinst and .preinst (LP: #226788)
* Avoid using temporary files in init script to avoid hangs on
shutdown if filesystem is read-only (LP: #206217)
* Also accept "stop" as second argument since the init script
calls laptop_mode with "init stop"