-
Committer:
Bazaar Package Importer
-
Author(s):
Tormod Volden
-
Date:
2007-11-21 20:42:58 UTC
-
mfrom:
(1.1.5 upstream)
-
Revision ID:
james.westby@ubuntu.com-20071121204258-x2ubrk4se4fmysx7
Tags: 1.35-1ubuntu1
* Merge from debian unstable (LP: #164387), 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.
- 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.
- debian/laptop-mode-tools.postinst: Include update-rc.d (LP: #127273)
(Debian generates the .postinst from dh_makeinit)
- debian/laptop-mode-tools.preinst: remove any old acpi scripts
- debian/rules: Don't ship acpi scripts (we handle that ourselves)
- debian/rules: use rm -f to avoid missing-file message
- debian/control: change maintainer
* New Ubuntu-only patch:
- Do not ship apm scripts and remove any old ones
* Dropped Ubuntu-patches now upstream:
- Fix error messages when run as non-root (LP: #77560)
* New upstream changes closing Ubuntu bugs:
- laptop-mode-tools uses hparm -B 255 instead of 254 (LP: #172282)