Date: Friday, April 16, 2010 @ 15:48:23 Author: jgc Revision: 77643 upgpkg: pm-utils 1.3.0-2 Add dependency on pm-quirks (FS#19068), support upower for on_ac_power (FS#19091)
Added: pm-utils/trunk/on_ac_power-upower.patch Modified: pm-utils/trunk/PKGBUILD --------------------------+ PKGBUILD | 23 +++++++---- on_ac_power-upower.patch | 89 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-04-16 19:40:56 UTC (rev 77642) +++ PKGBUILD 2010-04-16 19:48:23 UTC (rev 77643) @@ -1,20 +1,24 @@ # $Id$ -# Maintainer: Thayer Williams <[email protected]> +# Maintainer: Jan de Groot <[email protected]> +# Contributor: Thayer Williams <[email protected]> # Contributor: Giovanni Scafora <[email protected]> pkgname=pm-utils pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Utilities and scripts for suspend and hibernate power management" arch=('i686' 'x86_64') url="http://pm-utils.freedesktop.org"; license=('GPL') -depends=('bash' 'procps' 'vbetool') -makedepends=('xmlto') +depends=('bash' 'procps' 'vbetool' 'pm-quirks') +optdepends=('upower') +makedepends=('xmlto' 'docbook-xml' 'docbook-xsl') source=(http://pm-utils.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz + on_ac_power-upower.patch 11netcfg daemons.patch) md5sums=('37d71f8adbb409442212a85a080d324d' + '676855c54039a3b2c3171e69ccee2113' '9839687c8787d99fd4ff36aa3238c27b' '7be3f7460569d5a382474abd7f7b53fb') @@ -22,14 +26,17 @@ cd "${srcdir}/${pkgname}-${pkgver}" # make sure Arch Linux daemons are properly handled - patch -Np1 -i ${srcdir}/daemons.patch || return 1 + patch -Np1 -i "${srcdir}/daemons.patch" || return 1 + # Support upower for on_ac_power + patch -Np1 -i "${srcdir}/on_ac_power-upower.patch" || return 1 + ./configure --prefix=/usr \ --sysconfdir=/etc \ - --localstatedir=/var + --localstatedir=/var || return 1 make || return 1 - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR="${pkgdir}" install || return 1 # install additional hooks - install -m755 ${srcdir}/11netcfg "${pkgdir}/usr/lib/pm-utils/sleep.d/11netcfg" + install -m755 "${srcdir}/11netcfg" "${pkgdir}/usr/lib/pm-utils/sleep.d/" || return 1 } Added: on_ac_power-upower.patch =================================================================== --- on_ac_power-upower.patch (rev 0) +++ on_ac_power-upower.patch 2010-04-16 19:48:23 UTC (rev 77643) @@ -0,0 +1,89 @@ +From e8d0b58a9df080f021d04b4c2d358003974092f3 Mon Sep 17 00:00:00 2001 +From: Michal Schmidt <[email protected]> +Date: Tue, 23 Feb 2010 13:57:05 +0000 +Subject: on_ac_power: support UPower (new name for DeviceKit-power) + +DeviceKit-power got renamed to UPower and its D-Bus interface changed +accordingly. + +Try UPower first in on_ac_power. +If it fails, try DeviceKit-power. +It if fails too, try hal. + +Also update documentation. + +Signed-off-by: Michael Biebl <[email protected]> +--- +diff --git a/man/pm-action.xml b/man/pm-action.xml +index ccb4153..6e9f639 100644 +--- a/man/pm-action.xml ++++ b/man/pm-action.xml +@@ -104,7 +104,7 @@ + For some options external programs are needed. + </para> + <para> +- These commands will usually be called by <command>DeviceKit-power</command> ++ These commands will usually be called by <command>UPower</command> + or <command>hald</command> when triggered to do so by a program + in a desktop session such as <command>gnome-power-manager</command>. + Calling them from the command line is also possible, but it is not +diff --git a/man/pm-is-supported.xml b/man/pm-is-supported.xml +index 88bb9fd..d07c87d 100644 +--- a/man/pm-is-supported.xml ++++ b/man/pm-is-supported.xml +@@ -89,7 +89,7 @@ + <para> + The intended purpose of <command>&dhpackage;</command> is to + find out which power management modes are supported by the +- system. hald(8) will call it to do just that. (Note that DeviceKit-power ++ system. hald(8) will call it to do just that. (Note that UPower + does not use this.) + </para> + </refsect1> +@@ -161,10 +161,6 @@ + <!-- In alpabetical order. --> + <para> + <citerefentry> +- <refentrytitle>DeviceKit-power</refentrytitle> +- <manvolnum>7</manvolnum> +- </citerefentry>, +- <citerefentry> + <refentrytitle>hald</refentrytitle> + <manvolnum>8</manvolnum> + </citerefentry>, +@@ -175,6 +171,10 @@ + <citerefentry> + <refentrytitle>s2both</refentrytitle> + <manvolnum>8</manvolnum> ++ </citerefentry>, ++ <citerefentry> ++ <refentrytitle>UPower</refentrytitle> ++ <manvolnum>7</manvolnum> + </citerefentry> + </para> + </refsect1> +diff --git a/src/on_ac_power b/src/on_ac_power +index fdbcb36..1f9c59e 100755 +--- a/src/on_ac_power ++++ b/src/on_ac_power +@@ -30,7 +30,17 @@ + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + # + +-# prefer DeviceKit-power if available ++# prefer UPower if available ++if s="$(dbus-send --system --print-reply \ ++ --dest=org.freedesktop.UPower \ ++ /org/freedesktop/UPower \ ++ org.freedesktop.DBus.Properties.Get \ ++ string:org.freedesktop.UPower string:OnBattery)"; then ++ echo "$s" | grep -q 'boolean false' ++ exit $? ++fi ++ ++# try its old name 'DeviceKit-power' too + if s="$(dbus-send --system --print-reply \ + --dest=org.freedesktop.DeviceKit.Power \ + /org/freedesktop/DeviceKit/Power \ +-- +cgit v0.8.3-6-g21f6
