-
Committer:
Bazaar Package Importer
-
Author(s):
Lorenzo De Liso
-
Date:
2010-11-23 20:26:47 UTC
-
mfrom:
(2.1.23 sid)
-
Revision ID:
james.westby@ubuntu.com-20101123202647-hqa0em8qq34fcqo1
Tags: 1:2.0.7-1ubuntu1
* Merge from debian unstable (LP: #507778), 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/preinst, debian/acpid.install, debian/control, 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 (LP: #508073)
- 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; LP: #570450
* Dropped changes:
- New patch, missing-includes, to fix missing includes of sys/types.h and
sys/stat.h for umask() and stat() in acpid.c; fixes FTBFS: no longer
needed
- Update patch missing-includes to also fix the same missing includes in
sock.c; this is all fixed in 2.0.x versions of acpid: no longer needed