--- devicekit-power-008.orig/debian/libdevkit-power-gobject-dev.install +++ devicekit-power-008/debian/libdevkit-power-gobject-dev.install @@ -0,0 +1,3 @@ +usr/lib/libdevkit-power-gobject.{so,a} +usr/lib/pkgconfig/devkit-power-gobject.pc +usr/include/DeviceKit-power/devkit-power-gobject/ --- devicekit-power-008.orig/debian/rules +++ devicekit-power-008/debian/rules @@ -0,0 +1,7 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + --- devicekit-power-008.orig/debian/changelog +++ devicekit-power-008/debian/changelog @@ -0,0 +1,34 @@ +devicekit-power (008-2~ubuntu1) karmic; urgency=low + + * All Ubuntu changes committed to Debian git. Upload git snapshot to get + recent lid handling bug fix. + + -- Martin Pitt Wed, 01 Jul 2009 11:55:26 +0200 + +devicekit-power (008-2) UNRELEASED; urgency=low + + [ Martin Pitt ] + * Add 01-pm_powersave.patch: Call pm-powersave, so that packages which ship + /etc/pm/power.d/ scripts continue to work. Patch taken from upstream git + head. + * Add 02-suppress-startup-lid-event.patch: Suppress lid change event on + startup. Otherwise, gnome-power-manager picks up a "lid is closed" change + event when dk-p gets D-BUS activated, and thus immediately suspends the + machine on startup. (FD #22574, LP: #385135) + * Add quilt build dependency. + + -- Michael Biebl Wed, 01 Jul 2009 11:04:45 +0200 + +devicekit-power (008-1) experimental; urgency=low + + * New upstream release. + * debian/copyright + - Add Name, Maintainer and Source field as recommended by DEP-5. + + -- Michael Biebl Wed, 03 Jun 2009 13:47:15 +0200 + +devicekit-power (007-1) experimental; urgency=low + + * Initial release. (Closes: #521363) + + -- Michael Biebl Mon, 18 May 2009 08:50:24 +0200 --- devicekit-power-008.orig/debian/watch +++ devicekit-power-008/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://hal.freedesktop.org/releases/DeviceKit-power-(\d+)\.tar\.gz --- devicekit-power-008.orig/debian/devicekit-power.manpages +++ devicekit-power-008/debian/devicekit-power.manpages @@ -0,0 +1,3 @@ +debian/tmp/usr/share/man/man1/devkit-power.1 +debian/tmp/usr/share/man/man8/devkit-power-daemon.8 +debian/tmp/usr/share/man/man7/DeviceKit-power.7 --- devicekit-power-008.orig/debian/copyright +++ devicekit-power-008/debian/copyright @@ -0,0 +1,24 @@ +Name: DeviceKit-power +Maintainer: David Zeuthen + Richard Hughes +Source: http://hal.freedesktop.org/releases/ + +Files: * +Copyright: 2008 David Zeuthen + 2008 Richard Hughes +License: GPL-2+ + The full text of the GPL is distributed as in + /usr/share/common-licenses/GPL-2 on Debian systems. + +Files: doc/* +Copyright: 2008 David Zeuthen + 2008 Richard Hughes +License: GFDL-1.1+ + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation + License (GFDL), Version 1.1 or any later version published + by the Free Software Foundation with no Invariant Sections, + no Front-Cover Texts, and no Back-Cover Texts. + . + The full text of the GFDL is distributed as in + /usr/share/common-licenses/GFDL on Debian systems. --- devicekit-power-008.orig/debian/compat +++ devicekit-power-008/debian/compat @@ -0,0 +1 @@ +7 --- devicekit-power-008.orig/debian/libdevkit-power-gobject1.install +++ devicekit-power-008/debian/libdevkit-power-gobject1.install @@ -0,0 +1 @@ +usr/lib/libdevkit-power-gobject.so.* --- devicekit-power-008.orig/debian/devicekit-power-doc.install +++ devicekit-power-008/debian/devicekit-power-doc.install @@ -0,0 +1 @@ +debian/tmp/usr/share/gtk-doc/html/devkit-power/ --- devicekit-power-008.orig/debian/devicekit-power.install +++ devicekit-power-008/debian/devicekit-power.install @@ -0,0 +1,7 @@ +debian/tmp/usr/bin/ +debian/tmp/usr/lib/devicekit-power/ +debian/tmp/usr/share/dbus-1/ +debian/tmp/usr/share/PolicyKit/ +debian/tmp/etc/dbus-1/system.d/org.freedesktop.DeviceKit.Power.conf +debian/tmp/etc/udev/rules.d/* lib/udev/rules.d/ +debian/tmp/var/lib/DeviceKit-power/ --- devicekit-power-008.orig/debian/control +++ devicekit-power-008/debian/control @@ -0,0 +1,68 @@ +Source: devicekit-power +Section: admin +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Utopia Maintenance Team +Uploaders: Michael Biebl +Build-Depends: debhelper (>= 7), + cdbs, + autotools-dev, + quilt, + pkg-config, + xsltproc, + gtk-doc-tools, + intltool (>= 0.40.0), + libdbus-glib-1-dev (>= 0.76), + libdbus-1-dev (>= 1.0), + libglib2.0-dev (>= 2.16.1), + libdevkit-gobject-dev (>= 002), + libpolkit-dbus-dev (>= 0.7), + libusb-dev +Standards-Version: 3.8.1 +Vcs-Git: git://git.debian.org/git/pkg-utopia/devicekit-power.git +Vcs-Browser: http://git.debian.org/?p=pkg-utopia/devicekit-power.git;a=summary +Homepage: http://hal.freedesktop.org/docs/DeviceKit-power + +Package: devicekit-power +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, devicekit +Description: abstraction for power management + DeviceKit-power provides an interface to enumerate power sources on the system + and control system-wide power management. Any application can access the + org.freedesktop.DeviceKit.Power service on the system message bus. Some + operations (such as suspending the system) are restricted using PolicyKit. + +Package: devicekit-power-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: devhelp +Description: abstraction for power management - documentation + DeviceKit-power provides an interface to enumerate power sources on the system + and control system-wide power management. Any application can access the + org.freedesktop.DeviceKit.Power service on the system message bus. Some + operations (such as suspending the system) are restricted using PolicyKit. + +Package: libdevkit-power-gobject1 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: abstraction for power management - shared library + DeviceKit-power provides an interface to enumerate power sources on the system + and control system-wide power management. Any application can access the + org.freedesktop.DeviceKit.Power service on the system message bus. Some + operations (such as suspending the system) are restricted using PolicyKit. + . + This package contains the shared library to be used by applications. + +Package: libdevkit-power-gobject-dev +Architecture: any +Section: libdevel +Depends: ${shlibs:Depends}, ${misc:Depends}, libglib2.0-dev +Description: abstraction for power management - development files + DeviceKit-power provides an interface to enumerate power sources on the system + and control system-wide power management. Any application can access the + org.freedesktop.DeviceKit.Power service on the system message bus. Some + operations (such as suspending the system) are restricted using PolicyKit. + . + This package contains files that are needed to build applications. --- devicekit-power-008.orig/debian/patches/01-pm_powersave.patch +++ devicekit-power-008/debian/patches/01-pm_powersave.patch @@ -0,0 +1,63 @@ +# Call pm-powersave, so that packages which ship /etc/pm/power.d/ scripts continue to work. +# Taken from upstream git head: +# http://cgit.freedesktop.org/DeviceKit/DeviceKit-power/commit/?id=cad70317771fa6ce1f52af9d357165d47e971d7d +# http://cgit.freedesktop.org/DeviceKit/DeviceKit-power/commit/?id=e808a5063bd4819ca499dcf114371299da88c665 +# http://cgit.freedesktop.org/DeviceKit/DeviceKit-power/commit/?id=269fc33a3bb1f8144439cc4c98543510708ab251 + +Index: devicekit-power/src/dkp-daemon.c +=================================================================== +--- devicekit-power.orig/src/dkp-daemon.c 2009-07-01 11:02:09.000000000 +0200 ++++ devicekit-power/src/dkp-daemon.c 2009-07-01 11:02:22.000000000 +0200 +@@ -448,6 +448,32 @@ + } + + /** ++ * dkp_daemon_set_pmutils_powersave: ++ * ++ * Uses pm-utils to run scripts in power.d ++ **/ ++static gboolean ++dkp_daemon_set_pmutils_powersave (DkpDaemon *daemon, gboolean powersave) ++{ ++ gboolean ret; ++ gchar *command; ++ GError *error = NULL; ++ ++ /* run script from pm-utils */ ++ command = g_strdup_printf ("/usr/sbin/pm-powersave %s", powersave ? "true" : "false"); ++ egg_debug ("excuting command: %s", command); ++ ret = g_spawn_command_line_async (command, &error); ++ if (!ret) { ++ egg_warning ("failed to run script: %s", error->message); ++ g_error_free (error); ++ goto out; ++ } ++out: ++ g_free (command); ++ return ret; ++} ++ ++/** + * gpk_daemon_device_changed: + **/ + static void +@@ -472,6 +498,9 @@ + daemon->priv->on_battery = ret; + egg_debug ("now on_battery = %s", ret ? "yes" : "no"); + g_signal_emit (daemon, signals[CHANGED_SIGNAL], 0); ++ ++ /* set pm-utils power policy */ ++ dkp_daemon_set_pmutils_powersave (daemon, daemon->priv->on_battery); + } + ret = dkp_daemon_get_low_battery_local (daemon); + if (ret != daemon->priv->low_battery) { +@@ -875,6 +904,9 @@ + !dkp_daemon_get_on_ac_local (daemon)); + daemon->priv->low_battery = dkp_daemon_get_low_battery_local (daemon); + ++ /* set pm-utils power policy */ ++ dkp_daemon_set_pmutils_powersave (daemon, daemon->priv->on_battery); ++ + return daemon; + } + --- devicekit-power-008.orig/debian/patches/series +++ devicekit-power-008/debian/patches/series @@ -0,0 +1,2 @@ +01-pm_powersave.patch +02-suppress-startup-lid-event.patch --- devicekit-power-008.orig/debian/patches/02-suppress-startup-lid-event.patch +++ devicekit-power-008/debian/patches/02-suppress-startup-lid-event.patch @@ -0,0 +1,34 @@ +# Description: Suppress lid change event on startup. Otherwise, gnome-power-manager picks up a "lid is closed" change event when dk-p gets D-BUS activated, and thus immediately suspends the machine on startup. +# Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22574 +# Ubuntu: https://launchpad.net/bugs/385135 + +Index: devicekit-power/src/dkp-daemon.c +=================================================================== +--- devicekit-power.orig/src/dkp-daemon.c 2009-07-01 11:15:56.000000000 +0200 ++++ devicekit-power/src/dkp-daemon.c 2009-07-01 11:20:25.000000000 +0200 +@@ -102,6 +102,7 @@ + dkp_daemon_set_lid_is_closed (DkpDaemon *daemon, gboolean lid_is_closed) + { + gboolean ret = FALSE; ++ static gboolean initialized = FALSE; + + g_return_val_if_fail (DKP_IS_DAEMON (daemon), FALSE); + +@@ -112,7 +113,16 @@ + } + + /* save */ +- g_signal_emit (daemon, signals[CHANGED_SIGNAL], 0); ++ if (!initialized) { ++ /* Do not emit an event on startup. Otherwise, e. g. ++ * gnome-power-manager would pick up a "lid is closed" change ++ * event when dk-p gets D-BUS activated, and thus would ++ * immediately suspend the machine on startup. FD#22574 */ ++ egg_debug ("not emitting lid change event for daemon startup"); ++ initialized = TRUE; ++ } else { ++ g_signal_emit (daemon, signals[CHANGED_SIGNAL], 0); ++ } + daemon->priv->lid_is_closed = lid_is_closed; + ret = TRUE; + out: