acpi-support

Merge lp:~debfx/acpi-support/fix-lp387750 into lp:acpi-support

  1. fix-lp387750
  2. Merge into trunk
Proposed by Felix Geyer
Status: Merged
Approved by: Steve Langasek
Approved revision: 160
Merged at revision: not available
Proposed branch: lp:~debfx/acpi-support/fix-lp387750
Merge into: lp:acpi-support
Diff against target: 47 lines
2 files modified
debian/changelog (+6/-1)
lib/policy-funcs (+15/-1)
To merge this branch: bzr merge lp:~debfx/acpi-support/fix-lp387750
To post a comment you must log in.
Revision history for this message
Felix Geyer (debfx) wrote :

Sync the 0.126 upload to bzr and fix bug #387750

lp:~debfx/acpi-support/fix-lp387750 updated
151. By Steve Langasek

merge from trunk

152. By Steve Langasek

Drop /etc/acpi/start.d/90-hdparm.sh: this is redundant because we're
already calling pm-powersave on start (either via /etc/acpi/power.sh,
or by one of the desktop power managers as enumerated in
lib/policy-funcs) so there's no reason we should be reapplying the
policy here. LP: #443992.

153. By Steve Langasek

Add guidance-power-manager to the list of known desktop power managers.
LP: #154910

154. By Steve Langasek

  policy here. LP: #443992, LP: #438355.

155. By Steve Langasek

another bug fixed

156. By Steve Langasek

merge from Michael Terry

157. By Steve Langasek

use a shorter variable name, and declare it local so we don't worry about
polluting the caller's namespace

158. By Steve Langasek

releasing version 0.127

159. By Steve Langasek

Get laptop-mode-tools out of Suggests. Finally-really-fixes LP: #74683.

160. By Felix Geyer

Recognize KDE4 PowerDevil as a power manager

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2009-10-06 08:41:00 +0000
+++ debian/changelog 2009-10-07 20:53:09 +0000
@@ -1,8 +1,13 @@
1acpi-support (0.128) UNRELEASED; urgency=low1acpi-support (0.128) UNRELEASED; urgency=low
22
3 [ Steve Langasek ]
3 * Get laptop-mode-tools out of Suggests. Finally-really-fixes LP: #74683.4 * Get laptop-mode-tools out of Suggests. Finally-really-fixes LP: #74683.
45
5 -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 06 Oct 2009 01:39:15 -07006 [ Felix Geyer ]
7 * lib/policy-funcs: Recognize KDE4 PowerDevil as a power manager.
8 LP: #387750.
9
10 -- Felix Geyer <debfx-pkg@fobos.de> Wed, 07 Oct 2009 22:49:42 +0200
611
7acpi-support (0.127) karmic; urgency=low12acpi-support (0.127) karmic; urgency=low
813
914
=== modified file 'lib/policy-funcs'
--- lib/policy-funcs 2009-10-06 03:10:38 +0000
+++ lib/policy-funcs 2009-10-07 20:53:09 +0000
@@ -3,9 +3,23 @@
3 PMS="gnome-power-manager kpowersave xfce4-power-manager"3 PMS="gnome-power-manager kpowersave xfce4-power-manager"
4 PMS="$PMS guidance-power-manager.py dalston-power-applet"4 PMS="$PMS guidance-power-manager.py dalston-power-applet"
5 if pidof -x $PMS > /dev/null ||5 if pidof -x $PMS > /dev/null ||
6 (pidof dcopserver > /dev/null && test -x /usr/bin/dcop && /usr/bin/dcop kded kded loadedModules | grep -q klaptopdaemon) ; then6 (pidof dcopserver > /dev/null && test -x /usr/bin/dcop && /usr/bin/dcop kded kded loadedModules | grep -q klaptopdaemon) ||
7 PowerDevilRunning ; then
7 echo 0;8 echo 0;
8 else9 else
9 echo 1;10 echo 1;
10 fi11 fi
11}12}
13
14PowerDevilRunning() {
15 test -x /usr/bin/dbus-send || return 1
16
17 for p in $(pidof kded4); do
18 test -r /proc/$p/environ || continue
19 local DBUS_SESS=$(cat /proc/$p/environ | grep -z "DBUS_SESSION_BUS_ADDRESS=")
20 test "$DBUS_SESS" != "" || continue
21 (su - $(ps -o user= $p) -c "$DBUS_SESS dbus-send --print-reply --dest=org.kde.kded /kded org.kde.kded.loadedModules" | grep -q powerdevil) && return 0
22 done
23
24 return 1
25}

Subscribers

People subscribed via source and target branches