please merge laptop-mode-tools 1.41-1 from Debian unstable main

 laptop-mode-tools (1.41-1ubuntu1) intrepid; urgency=low
 .
   * 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)
 .

The patch in the previous comment includes this as well:
   * 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"

Bryce: can you please take a look at it?

Note that 1.42-1 has been uploaded to the Debian archive.

Bart, I'll wait for 1.43 before I try another merge :)

Tormod Volden wrote:
> Bart, I'll wait for 1.43 before I try another merge :)

:-) Well, then at least don't merge 1.41 yet, it has some bugs that you
don't want to have around. Notably, it doesn't detect AC power when the
AC adapter is not called "AC" in sysfs -- and that's more common than
you'd think.

Bart, can you please comment on the patch in bug #206217 (also submitted to Debian), since I would like to include it in the new merge?

Thanks Tormod, I was able to get your prior debdiff applied against 1.42 and have sponsored your upload.

Tormod Volden wrote:
> Bart, can you please comment on the patch in bug #206217 (also submitted
> to Debian), since I would like to include it in the new merge?

Sorry about the delay. It's been applied to the upstream as well --
works like a charm.

Cheers,
Bart