lp:~tormodvolden/ubuntu/karmic/laptop-mode-tools/dupl-hook

Created by Tormod Volden and last modified
Get this branch:
bzr branch lp:~tormodvolden/ubuntu/karmic/laptop-mode-tools/dupl-hook
Only Tormod Volden can upload to this branch. If you are Tormod Volden please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Tormod Volden
Status:
Merged

Recent revisions

21. By Tormod Volden

do not ship /etc/pm/sleep.d/99laptop-mode

20. By Jonas Pedersen

* Merge with Debian (LP: #350344), remaining changes:
  + Drop sdparm Recommends to Suggests: It is in universe.
  + etc/laptop-mode/laptop-mode.conf: change default spindown time and
    power management modes.
  + Add pm-utils hooks to ensure laptop-mode is running as expected after
    power change or thaw/resume
    - power.d/laptop-mode: runs laptop-mode on power change
    - sleep.d/96laptop-mode: runs laptop-mode on thaw/resume
  + 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
    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.
  + Also accept "stop" as second argument since the init script
    calls laptop_mode with "init stop"

19. By Martin Pitt

Drop sdparm Recommends to Suggests: It is in universe, and more
importantly, we never installed it by default, and doing so now is too
risky for this stage of the release.

18. By Colin Watson

[ Tom Uttenthaler ]
iwl4965 was renamed to iwlagn in Linux 2.6.27; update wireless-iwl-power
to match (LP: #275162).

17. By Colin Watson

etc/laptop-mode/laptop-mode.conf: Go back to 'hdparm -B 254';
acpi-support has been fixed to do that now, so let's not have
laptop-mode-tools undo the effectiveness of that fix in the name of
consistency with an old version (LP: #172282).

16. By Tormod Volden

[ Tormod Volden ]
* Merge from debian unstable (LP: #255446), 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
    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.
  - Also accept "stop" as second argument since the init script
    calls laptop_mode with "init stop"

[ Alexey Borzenkov ]
* Change default settings to match acpi-support (LP: #250935)
  - etc/laptop-mode/laptop-mode.conf: change default spindown time and
    power management modes
* Add pm-utils hooks to ensure laptop-mode is running as expected after
  power change or thaw/resume
  - power.d/laptop-mode: runs laptop-mode on power change
  - sleep.d/96laptop-mode: runs laptop-mode on thaw/resume

15. By Tormod Volden

fix bashisms (LP: #237266)

14. By Tormod Volden

* 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"

13. By Tormod Volden

* 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)

12. By Tormod Volden

* debian/rules: Don't ship acpi scripts (we handle that ourselves)
  (This change got lost in the last merge)
* debian/laptop-mode-tools.preinst: remove any old acpi scripts
* debian/laptop-mode-tools.postinst: Include update-rc.d (LP: #127273)
  (Debian generates the .postinst from dh_makeinit)
* debian/rules: use rm -f to avoid missing-file message

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/karmic/laptop-mode-tools
This branch contains Public information 
Everyone can see this information.

Subscribers