-
Committer:
Package Import Robot
-
Author(s):
Matthias Klose
-
Date:
2013-02-26 09:01:13 UTC
-
mfrom:
(2.1.42 sid)
-
Revision ID:
package-import@ubuntu.com-20130226090113-80a0hdqutgqzmxi6
Tags: 1:2.0.18-1ubuntu1
* Merge with Debian; 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/control: Bump build-dependency on debhelper for Upstart-aware
dh_installinit
- 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.
- debian/acpid.install, debian/acpid.links:
Don't install socket and service files needed by systemd
* Fix build failure with GCC 4.8.