please merge laptop-mode-tools 1.34-1 from Debian unstable

Bug #119519 reported by Tormod Volden
6
Affects Status Importance Assigned to Milestone
laptop-mode-tools (Ubuntu)
Fix Released
Undecided
Unassigned

Bug Description

Binary package hint: laptop-mode-tools

I took the merge-o-matic output and resolved the trivial conflicts in debian/rules and usr/sbin/laptop_mode. Then I compared my new diff.gz with the Debian diff.gz and updated the changelog accordingly. The remaining Ubuntu changes had not been written in the last few merge changelog entries, but I think I got some understandable hints from older changelogs.

Tags: patch
Revision history for this message
Tormod Volden (tormodvolden) wrote :

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

Revision history for this message
Tormod Volden (tormodvolden) wrote :
Revision history for this message
Tormod Volden (tormodvolden) wrote :

D'oh, forgot to set the Ubuntu maintainers in debian/control.

Revision history for this message
Tormod Volden (tormodvolden) wrote :
Revision history for this message
Emmet Hikory (persia) wrote :

To reduce archive churn, please consider including the patch for bug 77560 as one of the changes in the same upload as the merge processing.

Revision history for this message
Tormod Volden (tormodvolden) wrote :

As suggested, here is a new debdiff (relative to Debian 1.34-1) which includes Peter Whittaker's patch from bug #77560.

Changed in laptop-mode-tools:
status: Unconfirmed → Confirmed
Revision history for this message
Martin Pitt (pitti) wrote :

Uploaded, thank you!

Changed in laptop-mode-tools:
status: Confirmed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.