-
Committer:
Package Import Robot
-
Author(s):
Michael Vogt
-
Date:
2014-11-03 15:18:22 UTC
-
mfrom:
(2.1.49 sid)
-
Revision ID:
package-import@ubuntu.com-20141103151822-1wlqx1b8flpymjzp
Tags: 1:2.0.23-1ubuntu1
* Merge from Debian unstable. Remaining changes:
- Replace init script with Upstart job
+ This does not load modules, unlike the init script, since these are
all loaded by ACPI:* modaliases now (and thus by udev)
- debian/acpid.install, debian/acpid.preinst, debian/rules:
continue installing /etc/acpi/events/powerbtn and /etc/acpi/powerbtn.sh,
deferring the migration to acpi-support-base; and drop the Recommends:
on acpi-support-base for the same reason.
- Source /usr/share/acpi-support/power-funcs in powerbtn.sh
- debian/powerbtn.sh: ensure that /usr/share/acpi-support/power-funcs
exists before sourcing it; note that acpid does not depend on
acpi-support (which is fine, as it brings in lots of X dependencies
not appropriate for servers); this fix will allow Ubuntu servers
(especially those in VMs) to run acpid and catch and handle power
button events again.
- debian/powerbtn.sh: gnome-power-manager is no more, check for
gnome-settings-daemon now. This fixes immediate shutdown when the power
button is pressed.
- Change pointless shutdown message "exiting" from NOTICE to DEBUG
level, such that it's not emitted by default.
- debian/powerbtn.sh: add support for mate-settings-daemon,
unity-settings-daemon
- ./debian/powerbtn.sh: Don't do anything if logind is running, as
that already handles power button presses. This fixes unconditional
shutdowns if a desktop environment wants to handle the power key by
itself (and inhibits logind). (LP: #1201180)