--- upower-0.9.5.orig/debian/upower-doc.install +++ upower-0.9.5/debian/upower-doc.install @@ -0,0 +1 @@ +usr/share/gtk-doc/html/ --- upower-0.9.5.orig/debian/upower.postinst +++ upower-0.9.5/debian/upower.postinst @@ -0,0 +1,47 @@ +#!/bin/sh + +set -e + +# Move a conffile without triggering a dpkg question +mv_conffile() { + local OLDCONFFILE="$1" + local NEWCONFFILE="$2" + + [ -e "$OLDCONFFILE" ] || return 0 + + echo "Preserving user changes to $NEWCONFFILE ..." + mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new + mv -f "$OLDCONFFILE" "$NEWCONFFILE" +} + +get_pid() { + [ -n "$1" ] || return 0 + [ -S /var/run/dbus/system_bus_socket ] || return 0 + + dbus-send --system --dest=org.freedesktop.DBus --print-reply \ + /org/freedesktop/DBus org.freedesktop.DBus.GetConnectionUnixProcessID \ + string:$1 2>/dev/null | awk '/uint32/ {print $2}' +} + +if [ "$1" = "configure" ]; then + # migrate power history from DeviceKit-power + if dpkg --compare-versions "$2" lt-nl "0.9.1-1" && [ -d /var/lib/DeviceKit-power/ ]; then + if [ ! -d /var/lib/upower ] || rmdir /var/lib/upower 2>/dev/null; then + echo "Migrating old DeviceKit-power history.." + mv /var/lib/DeviceKit-power/ /var/lib/upower + fi + fi + + if dpkg --compare-versions "$2" lt "0.9.4-2"; then + mv_conffile "/etc/UPower.conf" "/etc/UPower/UPower.conf" + fi + + # restart upowerd if it was running before + pid=$(get_pid org.freedesktop.UPower) + if [ -n "$pid" ]; then + kill $pid 2>/dev/null || true + upower --version >/dev/null || true # will trigger through D-Bus activation + fi +fi + +#DEBHELPER# --- upower-0.9.5.orig/debian/upower.install +++ upower-0.9.5/debian/upower.install @@ -0,0 +1,9 @@ +usr/bin/upower +usr/lib/upower/upowerd +usr/share/dbus-1/ +usr/share/polkit-1/ +usr/share/locale/ +usr/share/man/ +etc/dbus-1/system.d/ +etc/UPower/UPower.conf +var/lib/ --- upower-0.9.5.orig/debian/README.source +++ upower-0.9.5/debian/README.source @@ -0,0 +1,3 @@ +This package uses the quilt patch management system. + +Please refer to /usr/share/doc/quilt/README.source for further information. --- upower-0.9.5.orig/debian/watch +++ upower-0.9.5/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://upower.freedesktop.org/releases/upower-([0-9.]+)\.tar\.gz --- upower-0.9.5.orig/debian/libdevkit-power-gobject-dev.install +++ upower-0.9.5/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/ --- upower-0.9.5.orig/debian/libdevkit-power-gobject1.install +++ upower-0.9.5/debian/libdevkit-power-gobject1.install @@ -0,0 +1 @@ +usr/lib/libdevkit-power-gobject.so.* --- upower-0.9.5.orig/debian/upower.postrm +++ upower-0.9.5/debian/upower.postrm @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ "$1" = "purge" ]; then + rm -rf /var/lib/upower +fi + +#DEBHELPER# --- upower-0.9.5.orig/debian/compat +++ upower-0.9.5/debian/compat @@ -0,0 +1 @@ +7 --- upower-0.9.5.orig/debian/libupower-glib1.install +++ upower-0.9.5/debian/libupower-glib1.install @@ -0,0 +1 @@ +usr/lib/libupower-glib.so.* --- upower-0.9.5.orig/debian/rules +++ upower-0.9.5/debian/rules @@ -0,0 +1,24 @@ +#!/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 + +DEB_CONFIGURE_EXTRA_FLAGS = --enable-gtk-doc + +# upower's version number is smaller than devicekit-power's, so we need to +# epoch the transitional packages +DEB_DH_GENCONTROL_ARGS_libdevkit-power-gobject1 = -- -v1:$(DEB_VERSION) +DEB_DH_MAKESHLIBS_ARGS_libdevkit-power-gobject1 = -- -v1:$(DEB_VERSION) +DEB_DH_GENCONTROL_ARGS_libdevkit-power-gobject-dev = -- -v1:$(DEB_VERSION) + +common-post-build-arch:: + make -C po upower.pot + +binary-install/upower:: + # Only install udev rules on Linux architectures. The + # directory doesn't even exist on e.g. GNU/kFreeBSD +ifeq ($(DEB_HOST_ARCH_OS),linux) + dh_install -pupower debian/tmp/lib/udev/rules.d/ +endif --- upower-0.9.5.orig/debian/control +++ upower-0.9.5/debian/control @@ -0,0 +1,104 @@ +Source: upower +Section: admin +Priority: optional +Maintainer: Utopia Maintenance Team +Uploaders: Michael Biebl , Martin Pitt +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.21.5), + libgudev-1.0-dev [linux-any], + libkvm-dev [kfreebsd-any], + libpolkit-gobject-1-dev (>= 0.91), + libusb-1.0-0-dev (>= 1.0.0) [linux-any], + libimobiledevice-dev (>= 0.9.7) [linux-any] +Standards-Version: 3.9.1 +Vcs-Git: git://git.debian.org/git/pkg-utopia/upower.git +Vcs-Browser: http://git.debian.org/?p=pkg-utopia/upower.git;a=summary +Homepage: http://upower.freedesktop.org/ + +Package: upower +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, udev [linux-any], dbus +Recommends: pm-utils, policykit-1 +Conflicts: devicekit-power +Replaces: devicekit-power +Description: abstraction for power management + upower provides an interface to enumerate power sources on the system + and control system-wide power management. Any application can access the + org.freedesktop.UPower service on the system message bus. Some + operations (such as suspending the system) are restricted using PolicyKit. + +Package: upower-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Conflicts: devicekit-power-doc (<< 1:0) +Replaces: devicekit-power-doc (<< 1:0) +Suggests: devhelp +Description: abstraction for power management - documentation + upower provides an interface to enumerate power sources on the system + and control system-wide power management. Any application can access the + org.freedesktop.UPower service on the system message bus. Some + operations (such as suspending the system) are restricted using PolicyKit. + +Package: libupower-glib1 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: abstraction for power management - shared library + upower provides an interface to enumerate power sources on the system + and control system-wide power management. Any application can access the + org.freedesktop.UPower 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: libupower-glib-dev +Architecture: any +Section: libdevel +Depends: ${shlibs:Depends}, ${misc:Depends}, libglib2.0-dev, libupower-glib1 (= ${binary:Version}) +Description: abstraction for power management - development files + upower provides an interface to enumerate power sources on the system + and control system-wide power management. Any application can access the + org.freedesktop.UPower 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. + +Package: libdevkit-power-gobject1 +Architecture: any +Section: oldlibs +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: devicekit-power +Description: abstraction for power management - shared library (old ABI) + upower provides an interface to enumerate power sources on the system + and control system-wide power management. Any application can access the + org.freedesktop.UPower service on the system message bus. Some + operations (such as suspending the system) are restricted using PolicyKit. + . + This package contains an old version of the shared library to be used by + applications. It provides the same ABI as the old DeviceKit-power library, but + works with upower. + +Package: libdevkit-power-gobject-dev +Architecture: any +Section: oldlibs +Depends: ${shlibs:Depends}, ${misc:Depends}, libglib2.0-dev, libdevkit-power-gobject1 (= ${binary:Version}) +Description: abstraction for power management - development files (old API) + upower provides an interface to enumerate power sources on the system + and control system-wide power management. Any application can access the + org.freedesktop.UPower service on the system message bus. Some + operations (such as suspending the system) are restricted using PolicyKit. + . + This package contains development files for the old version of the shared + library. It provides the same API as the old DeviceKit-power library, but + works with upower. + --- upower-0.9.5.orig/debian/libupower-glib1.symbols +++ upower-0.9.5/debian/libupower-glib1.symbols @@ -0,0 +1,89 @@ +libupower-glib.so.1 libupower-glib1 #MINVER# + up_client_about_to_sleep_sync@Base 0.9.1 + up_client_enumerate_devices_sync@Base 0.9.0 + up_client_get_can_hibernate@Base 0.9.0 + up_client_get_can_suspend@Base 0.9.0 + up_client_get_daemon_version@Base 0.9.0 + up_client_get_devices@Base 0.9.0 + up_client_get_lid_is_closed@Base 0.9.0 + up_client_get_lid_is_present@Base 0.9.2 + up_client_get_on_battery@Base 0.9.0 + up_client_get_on_low_battery@Base 0.9.0 + up_client_get_properties_sync@Base 0.9.0 + up_client_get_type@Base 0.9.0 + up_client_hibernate_sync@Base 0.9.0 + up_client_new@Base 0.9.0 + up_client_suspend_sync@Base 0.9.0 + up_device_get_history_sync@Base 0.9.0 + up_device_get_object_path@Base 0.9.0 + up_device_get_statistics_sync@Base 0.9.0 + up_device_get_type@Base 0.9.0 + up_device_kind_from_string@Base 0.9.0 + up_device_kind_to_string@Base 0.9.0 + up_device_new@Base 0.9.0 + up_device_refresh_sync@Base 0.9.0 + up_device_set_object_path_sync@Base 0.9.0 + up_device_state_from_string@Base 0.9.0 + up_device_state_to_string@Base 0.9.0 + up_device_technology_from_string@Base 0.9.0 + up_device_technology_to_string@Base 0.9.0 + up_device_to_text@Base 0.9.0 + up_history_item_get_state@Base 0.9.0 + up_history_item_get_time@Base 0.9.0 + up_history_item_get_type@Base 0.9.0 + up_history_item_get_value@Base 0.9.0 + up_history_item_new@Base 0.9.0 + up_history_item_set_from_string@Base 0.9.2 + up_history_item_set_state@Base 0.9.0 + up_history_item_set_time@Base 0.9.0 + up_history_item_set_time_to_present@Base 0.9.2 + up_history_item_set_value@Base 0.9.0 + up_history_item_to_string@Base 0.9.2 + up_qos_item_get_cmdline@Base 0.9.0 + up_qos_item_get_cookie@Base 0.9.0 + up_qos_item_get_kind@Base 0.9.0 + up_qos_item_get_persistent@Base 0.9.0 + up_qos_item_get_pid@Base 0.9.0 + up_qos_item_get_sender@Base 0.9.0 + up_qos_item_get_timespec@Base 0.9.0 + up_qos_item_get_type@Base 0.9.0 + up_qos_item_get_uid@Base 0.9.0 + up_qos_item_get_value@Base 0.9.0 + up_qos_item_new@Base 0.9.0 + up_qos_item_set_cmdline@Base 0.9.0 + up_qos_item_set_cookie@Base 0.9.0 + up_qos_item_set_kind@Base 0.9.0 + up_qos_item_set_persistent@Base 0.9.0 + up_qos_item_set_pid@Base 0.9.0 + up_qos_item_set_sender@Base 0.9.0 + up_qos_item_set_timespec@Base 0.9.0 + up_qos_item_set_uid@Base 0.9.0 + up_qos_item_set_value@Base 0.9.0 + up_qos_kind_from_string@Base 0.9.0 + up_qos_kind_to_string@Base 0.9.0 + up_stats_item_get_accuracy@Base 0.9.0 + up_stats_item_get_type@Base 0.9.0 + up_stats_item_get_value@Base 0.9.0 + up_stats_item_new@Base 0.9.0 + up_stats_item_set_accuracy@Base 0.9.0 + up_stats_item_set_value@Base 0.9.0 + up_wakeup_item_get_cmdline@Base 0.9.0 + up_wakeup_item_get_details@Base 0.9.0 + up_wakeup_item_get_id@Base 0.9.0 + up_wakeup_item_get_is_userspace@Base 0.9.0 + up_wakeup_item_get_old@Base 0.9.0 + up_wakeup_item_get_type@Base 0.9.0 + up_wakeup_item_get_value@Base 0.9.0 + up_wakeup_item_new@Base 0.9.0 + up_wakeup_item_set_cmdline@Base 0.9.0 + up_wakeup_item_set_details@Base 0.9.0 + up_wakeup_item_set_id@Base 0.9.0 + up_wakeup_item_set_is_userspace@Base 0.9.0 + up_wakeup_item_set_old@Base 0.9.0 + up_wakeup_item_set_value@Base 0.9.0 + up_wakeups_get_data_sync@Base 0.9.1 + up_wakeups_get_has_capability@Base 0.9.1 + up_wakeups_get_properties_sync@Base 0.9.1 + up_wakeups_get_total_sync@Base 0.9.1 + up_wakeups_get_type@Base 0.9.1 + up_wakeups_new@Base 0.9.1 --- upower-0.9.5.orig/debian/upower.prerm +++ upower-0.9.5/debian/upower.prerm @@ -0,0 +1,18 @@ +#!/bin/sh + +set -e + +get_pid() { + [ -n "$1" ] || return 0 + [ -S /var/run/dbus/system_bus_socket ] || return 0 + + dbus-send --system --dest=org.freedesktop.DBus --print-reply \ + /org/freedesktop/DBus org.freedesktop.DBus.GetConnectionUnixProcessID \ + string:$1 2>/dev/null | awk '/uint32/ {print $2}' +} + +if [ "$1" = "remove" ]; then + kill $(get_pid org.freedesktop.UPower) 2>/dev/null || true +fi + +#DEBHELPER# --- upower-0.9.5.orig/debian/changelog +++ upower-0.9.5/debian/changelog @@ -0,0 +1,309 @@ +upower (0.9.5-3) unstable; urgency=low + + * Add 00git_fix_double_dbus_return.patch, + 00git_fix_missing_polkit_dbus_return.patch, + 00git_fix_missing_qos_dbus_return.patch: Fix missing or duplicate D-BUS + return values, which cause crashes. Patches cherrypicked from upstream git + head. (LP: #614119) + + -- Martin Pitt Fri, 24 Sep 2010 18:04:17 +0200 + +upower (0.9.5-2) unstable; urgency=low + + * debian/control + - Bump Standards-Version to 3.9.1. + - Use architecture wildcards for the libgudev-1.0-dev, libkvm-dev and + libusb-1.0-0-dev build dependencies. + - Update Build-Depends according to configure.ac. + * debian/upower.postinst + - Query D-Bus to find out the correct pid of the process claiming + org.freedesktop.UPower. This way we do not accidentally kill the + wrong process when being installed in a chroot. (Closes: #594871) + * debian/upower.prerm + - Stop upowerd on remove. (Closes: #590017) + + -- Michael Biebl Wed, 22 Sep 2010 01:02:15 +0200 + +upower (0.9.5-1) unstable; urgency=low + + * New upstream release: + - Dynamic testing for enough hibernate swap. (LP: #599352) + - Port UPower to libusb1 to avoid unfixable crashes. (LP: #522827) + * debian/rules: Build a PO template during package build, for translation + systems. (LP: #538321) + * debian/control: Switch libusb-dev build dependency to libusb-1.0-0-dev, + and add libimobiledevice-dev to support the new backend. + * debian/control: Bump Standards-Version to 3.9.0; no changes necessary. + * Drop transitional devicekit-power-doc package. It's been in testing long + enough, and we do not want to carry it into the squeeze release. + + -- Martin Pitt Mon, 12 Jul 2010 14:43:12 +0200 + +upower (0.9.4-2) unstable; urgency=low + + * debian/upower.install + - Install UPower.conf config file to the correct path. (Closes: #583353) + * debian/upower.{preinst,postinst} + - Move the config file on upgrades without triggering a dpkg prompt. + + -- Michael Biebl Sat, 29 May 2010 19:26:19 +0200 + +upower (0.9.4-1) unstable; urgency=low + + * New upstream bug fix release. + * Drop 00git-fix-notifications.patch, upstream now. + + -- Martin Pitt Wed, 12 May 2010 17:48:22 +0200 + +upower (0.9.3-2) unstable; urgency=low + + * Add 00git-fix-notifications.patch: Fix notifications for property changes + such as "lid closed". Taken from upstream git head. (Closes: #580983) + + -- Martin Pitt Tue, 11 May 2010 16:39:28 +0200 + +upower (0.9.3-1) unstable; urgency=low + + * New upstream release. + - Add a config file with SleepTimeout and AllowHibernateEncryptedSwap + - Bug fixes. + * debian/upower.install: Install the new conffile. + * debian/control: Add missing ${misc:Depends} to quiesce lintian. + * Add debian/source/format (1.0). + + -- Martin Pitt Sun, 09 May 2010 18:48:38 +0200 + +upower (0.9.2-1) unstable; urgency=low + + * New upstream release. + - Convert the daemon to using objects from libupower-glib. + - Get sleep capabilities, swap information and suspend and hibernate + commands from the backend, rather than hardcoding Linux specifics. + - Make dummy backend usable for architectures without a native backend. + * debian/patches/01-dummy-backend.patch + - Removed, merged upstream. + * debian/patches/99-autoreconf.patch + - Removed, no longer needed. + * debian/libupower-glib1.symbols + - Update for new API additions. + * debian/upower.install + - Install translations. + + -- Michael Biebl Wed, 07 Apr 2010 11:41:10 +0200 + +upower (0.9.1-2) unstable; urgency=low + + [ Michael Biebl ] + * debian/control + - Update Homepage field. + + [ Martin Pitt ] + * debian/watch: Update for new upstream location. + + [ Michael Biebl ] + * debian/patches/01-dummy-backend.patch + - Fix the dummy backend to compile successfully and make it usable on + GNU/Hurd which does not have a native backend (yet). + Patch based on work by Pino Toscano, thanks! + * debian/patches/99-autoreconf.patch + - Run autoreconf as the patch above needed changes to the build system. + * debian/control + - Don't build depend on libgudev-1.0-dev on hurd-i386. + - Don't build depend on libusb-dev on kfreebsd-* and hurd-i386. + + -- Michael Biebl Mon, 05 Apr 2010 00:21:22 +0200 + +upower (0.9.1-1) unstable; urgency=low + + [ Martin Pitt ] + * New upstream release. Compared to our git snapshot, this just fixes the + BSD backend to compile. + * debian/upower.postinst: Restart the daemon if we stopped it, so that + clients don't suddenly stop getting signals. + * debian/control: Add udisks Conflicts/Replaces to devicekit-power, and + an additional Conflicts: to libdevkit-gobject, so that devicekit-power + gets properly cleaned up on upgrade. + * debian/upower.postinst: Migrate DeviceKit-power history on upgrade. + * Add debian/upower.postrm: Clean up /var/lib/upower on purge. + (Closes: #571156) + + [ Michael Biebl ] + * debian/control + - Add dependency on dbus. + - Make udev a linux-only dependency. + - Add build dependency on libkvm-dev for kfreebsd-*. + - Don't build depend on libgudev-1.0-dev for kfreebsd-*. + * Install udev rules files conditionally on linux only. + * debian/*.symbols + - Bump symbol versions from previous git snapshot versions to 0.9.1. + + -- Martin Pitt Fri, 05 Mar 2010 11:07:33 +0100 + +upower (0.9.0+git20100216.b9bb78-2) unstable; urgency=low + + * Upload to unstable. + + -- Michael Biebl Tue, 23 Feb 2010 01:51:37 +0100 + +upower (0.9.0+git20100216.b9bb78-1) experimental; urgency=low + + * New upstream git snapshot: + - Fix pkgconfig file to link against the correct library. + - Fix pkgconfig file and include directory to agree on the path for + libupower-glib include files. + * debian/libupower-glib-dev.install: Update include path accordingly. + + -- Martin Pitt Sun, 21 Feb 2010 19:14:06 +0100 + +upower (0.9.0+git20100216.72bb2-1) experimental; urgency=low + + [ Martin Pitt ] + * New upstream release, and updating to current git head: + - Rename the project, library, and D-Bus interface to upower. + - Bug fixes. + - Translation updates. + - Set client library's can_{suspend,hibernate} properties to False if + suspend/hibernate is prohibited through PolicyKit. (LP: #432598) + * Drop 01-lid-status-fallback.patch, 02-dkpclient-singleton.patch: Applied + upstream. + * debian/rules, debian/control: Add an epoch to the transitional + devicekit-power-doc package, so that the upgrade will actually work. + * debian/rules: Explicitly enable gtk-doc building, upstream configure + disables that now. + * Build libdevkit-power-gobject{1,-dev} packages, but mark them as obsolete. + These are still necessary, until upowerd is fully ported to the new + libupower-glib. + + [ Michael Biebl ] + * debian/upower.install: Only install upower and upowerd, not the + transitional symlinks. + * debian/control: Bump Standards-Version to 3.8.4. No further changes. + + -- Martin Pitt Tue, 16 Feb 2010 10:10:47 +0100 + +devicekit-power (014-3) unstable; urgency=low + + * Add 02-dkpclient-singleton.patch: Make DkpClient a singleton to avoid some + weird race conditions. Patch taken from upstream git. (Closes: #567021, + LP: #425411) + + -- Martin Pitt Tue, 26 Jan 2010 20:26:03 +0100 + +devicekit-power (014-2) unstable; urgency=low + + * debian/patches/01-lid-status-fallback.patch + - Use a fallback for the capability bit when checking the lid status. + Patch pulled from upstream Git. (Closes: #555740) + + -- Michael Biebl Tue, 12 Jan 2010 09:51:53 +0100 + +devicekit-power (014-1) unstable; urgency=low + + * New upstream release. + + -- Martin Pitt Mon, 11 Jan 2010 09:33:33 +0100 + +devicekit-power (013-1) unstable; urgency=low + + * New upstream release. + * Drop 01-fix-hibernate-has-encrypted-swap-check.patch, merged upstream. + + -- Michael Biebl Mon, 07 Dec 2009 11:39:29 +0100 + +devicekit-power (012-2) unstable; urgency=low + + * debian/patches/01-fix-hibernate-has-encrypted-swap-check.patch + - Fix broken check if swap space is encrypted. (Closes: #551797) + Thanks to Michael Ott for spotting this. + + -- Michael Biebl Wed, 21 Oct 2009 16:07:56 +0200 + +devicekit-power (012-1) unstable; urgency=low + + * New upstream release + - Properly refresh update-time after AC changes. This avoids immediately + suspending again when AC state changes during suspend. (LP: #425411) + * debian/control + - Add dependency on udev. + * debian/devicekit-power.postinst + - Use start-stop-daemon instead of kill+pidof to stop the running + devkit-power-daemon process on upgrades. + + -- Michael Biebl Mon, 19 Oct 2009 17:13:24 +0200 + +devicekit-power (011-1) unstable; urgency=low + + [ Michael Biebl ] + * New upstream release. + * debian/control + - Add Recommends on pm-utils and policykit-1. + + [ Martin Pitt ] + * debian/control: This version changes the internal D-BUS API. Make library + and daemon break each other for versions prior to 011, to avoid partial + upgrades. + + -- Martin Pitt Tue, 06 Oct 2009 18:04:57 +0200 + +devicekit-power (010-2) unstable; urgency=low + + [ Martin Pitt ] + * debian/control: Add missing libdevkit-power-gobject1 dependency to -dev. + * Add debian/devicekit-power.postinst: Kill the old devkit-power-daemon on + upgrade, to ensure that the new version will be used at the next occasion. + + [ Michael Biebl ] + * debian/devicekit-power.{install,manpages}: Install manpages using the + *.install file and drop redundant *.manpages file. + * debian/libdevkit-power-gobject1.symbols: Add symbols file for improved + shlibs dependencies. + + -- Michael Biebl Mon, 28 Sep 2009 16:59:43 +0200 + +devicekit-power (010-1) unstable; urgency=low + + [ Martin Pitt ] + * New upstream release: + - Port to PolicyKit 1 API. + - Port from DeviceKit to gudev. + - Bug fixes. + * debian/control: + - libpolkit-dbus-dev → libpolkit-gobject-1-dev build dependency. + - libdevkit-gobject-dev → libgudev-1.0-dev build dependency. + - Drop devicekit dependency. + - Add Breaks to gnome-power-manager versions which aren't ported to new + PolicyKit API yet. + * Drop 0001-Add-a-notify-flag-to-set_lid_is_closed.patch, fixed upstream. + + [ Michael Biebl ] + * Add debian/README.source which refers to the quilt documentation. + * Bump Standards-Version to 3.8.3. + * Upload to unstable. + + -- Michael Biebl Mon, 28 Sep 2009 06:58:20 +0200 + +devicekit-power (009-1) experimental; urgency=low + + * New upstream release. + * debian/control: Add myself to uploaders (discussed with Michael). + * debian/devicekit-power.install: Upstream installs udev rules into + /lib/udev/rules.d now, update accordingly. + * Add 0001-Add-a-notify-flag-to-set_lid_is_closed.patch: Properly fix the + silencing of the coldplug lid event, so that the first real lid event + actually works. Thanks to Loïc Minier! (fd.o #22574) + + -- Martin Pitt Mon, 06 Jul 2009 19:12:49 +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 --- upower-0.9.5.orig/debian/libdevkit-power-gobject1.symbols +++ upower-0.9.5/debian/libdevkit-power-gobject1.symbols @@ -0,0 +1,58 @@ +libdevkit-power-gobject.so.1 libdevkit-power-gobject1 #MINVER# + dkp_client_can_hibernate@Base 1:0.9.1 + dkp_client_can_suspend@Base 1:0.9.1 + dkp_client_enumerate_devices@Base 1:0.9.1 + dkp_client_get_daemon_version@Base 1:0.9.1 + dkp_client_get_type@Base 1:0.9.1 + dkp_client_hibernate@Base 1:0.9.1 + dkp_client_lid_is_closed@Base 1:0.9.1 + dkp_client_new@Base 1:0.9.1 + dkp_client_on_battery@Base 1:0.9.1 + dkp_client_on_low_battery@Base 1:0.9.1 + dkp_client_suspend@Base 1:0.9.1 + dkp_device_get_history@Base 1:0.9.1 + dkp_device_get_object_path@Base 1:0.9.1 + dkp_device_get_statistics@Base 1:0.9.1 + dkp_device_get_type@Base 1:0.9.1 + dkp_device_new@Base 1:0.9.1 + dkp_device_print@Base 1:0.9.1 + dkp_device_refresh@Base 1:0.9.1 + dkp_device_set_object_path@Base 1:0.9.1 + dkp_device_state_from_text@Base 1:0.9.1 + dkp_device_state_to_text@Base 1:0.9.1 + dkp_device_technology_from_text@Base 1:0.9.1 + dkp_device_technology_to_text@Base 1:0.9.1 + dkp_device_type_from_text@Base 1:0.9.1 + dkp_device_type_to_text@Base 1:0.9.1 + dkp_history_obj_clear@Base 1:0.9.1 + dkp_history_obj_copy@Base 1:0.9.1 + dkp_history_obj_create@Base 1:0.9.1 + dkp_history_obj_equal@Base 1:0.9.1 + dkp_history_obj_free@Base 1:0.9.1 + dkp_history_obj_from_string@Base 1:0.9.1 + dkp_history_obj_new@Base 1:0.9.1 + dkp_history_obj_print@Base 1:0.9.1 + dkp_history_obj_to_string@Base 1:0.9.1 + dkp_qos_obj_copy@Base 1:0.9.1 + dkp_qos_obj_equal@Base 1:0.9.1 + dkp_qos_obj_free@Base 1:0.9.1 + dkp_qos_obj_new@Base 1:0.9.1 + dkp_qos_obj_print@Base 1:0.9.1 + dkp_qos_type_from_text@Base 1:0.9.1 + dkp_qos_type_to_text@Base 1:0.9.1 + dkp_stats_obj_copy@Base 1:0.9.1 + dkp_stats_obj_create@Base 1:0.9.1 + dkp_stats_obj_free@Base 1:0.9.1 + dkp_stats_obj_from_string@Base 1:0.9.1 + dkp_stats_obj_new@Base 1:0.9.1 + dkp_stats_obj_to_string@Base 1:0.9.1 + dkp_wakeups_get_data@Base 1:0.9.1 + dkp_wakeups_get_total@Base 1:0.9.1 + dkp_wakeups_get_type@Base 1:0.9.1 + dkp_wakeups_has_capability@Base 1:0.9.1 + dkp_wakeups_new@Base 1:0.9.1 + dkp_wakeups_obj_copy@Base 1:0.9.1 + dkp_wakeups_obj_equal@Base 1:0.9.1 + dkp_wakeups_obj_free@Base 1:0.9.1 + dkp_wakeups_obj_new@Base 1:0.9.1 + dkp_wakeups_obj_print@Base 1:0.9.1 --- upower-0.9.5.orig/debian/copyright +++ upower-0.9.5/debian/copyright @@ -0,0 +1,24 @@ +Name: upower +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. --- upower-0.9.5.orig/debian/libupower-glib-dev.install +++ upower-0.9.5/debian/libupower-glib-dev.install @@ -0,0 +1,3 @@ +usr/lib/libupower-glib.{so,a} +usr/lib/pkgconfig/upower-glib.pc +usr/include/libupower-glib/ --- upower-0.9.5.orig/debian/TODO +++ upower-0.9.5/debian/TODO @@ -0,0 +1,3 @@ +- Enable introspection? +- clean up /var/lib/DeviceKit-power on upgrade (if the transition is not done + because of preexisting files) --- upower-0.9.5.orig/debian/upower.preinst +++ upower-0.9.5/debian/upower.preinst @@ -0,0 +1,27 @@ +#!/bin/sh + +set -e + +# Prepare to move a conffile without triggering a dpkg question +prep_mv_conffile() { + local PKGNAME="$1" + local CONFFILE="$2" + + [ -e "$CONFFILE" ] || return 0 + + local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')" + local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \ + sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")" + if [ "$md5sum" = "$old_md5sum" ]; then + rm -f "$CONFFILE" + fi +} + +case "$1" in +install|upgrade) + if dpkg --compare-versions "$2" lt "0.9.4-2"; then + prep_mv_conffile upower "/etc/UPower.conf" + fi +esac + +#DEBHELPER# --- upower-0.9.5.orig/debian/source/format +++ upower-0.9.5/debian/source/format @@ -0,0 +1 @@ +1.0 --- upower-0.9.5.orig/debian/patches/series +++ upower-0.9.5/debian/patches/series @@ -0,0 +1,4 @@ +# Debian patches for upower +00git_fix_missing_qos_dbus_return.patch +00git_fix_double_dbus_return.patch +00git_fix_missing_polkit_dbus_return.patch --- upower-0.9.5.orig/debian/patches/00git_fix_missing_qos_dbus_return.patch +++ upower-0.9.5/debian/patches/00git_fix_missing_qos_dbus_return.patch @@ -0,0 +1,21 @@ +commit d815c491eb105c49a7dbcb29c355ca9aaa8d92c4 +Author: Matthias Clasen +Date: Thu Aug 19 12:49:06 2010 +0200 + + Add missing D-Bus return in up_qos_cancel_request() + + Signed-off-by: Martin Pitt + +diff --git a/src/up-qos.c b/src/up-qos.c +index 70f1690..f08c439 100644 +--- a/src/up-qos.c ++++ b/src/up-qos.c +@@ -395,6 +395,8 @@ up_qos_cancel_request (UpQos *qos, guint cookie, DBusGMethodInvocation *context) + /* TODO: if persistent remove from datadase */ + + g_signal_emit (qos, signals [REQUESTS_CHANGED], 0); ++ ++ dbus_g_method_return (context, NULL); + out: + if (subject != NULL) + g_object_unref (subject); --- upower-0.9.5.orig/debian/patches/00git_fix_missing_polkit_dbus_return.patch +++ upower-0.9.5/debian/patches/00git_fix_missing_polkit_dbus_return.patch @@ -0,0 +1,36 @@ +commit 4a53c56a913b002d4f7e23b3379ccb134ed454db +Author: Matthias Clasen +Date: Thu Aug 19 13:10:49 2010 +0200 + + Fix up_polkit_get_subject() D-BUS error return + + All callers of up_polkit_get_subject() just exit without returning an error to + the D-BUS caller if they fail to get the PolicyKit subject. Do that in + up_polkit_get_subject() itself now, for convenience. + + Signed-off-by: Martin Pitt + +diff --git a/src/up-polkit.c b/src/up-polkit.c +index ab2c66d..0ca2433 100644 +--- a/src/up-polkit.c ++++ b/src/up-polkit.c +@@ -52,12 +52,19 @@ static gpointer up_polkit_object = NULL; + PolkitSubject * + up_polkit_get_subject (UpPolkit *polkit, DBusGMethodInvocation *context) + { ++ GError *error; + const gchar *sender; + PolkitSubject *subject; + + sender = dbus_g_method_get_sender (context); + subject = polkit_system_bus_name_new (sender); + ++ if (subject == NULL) { ++ error = g_error_new (UP_DAEMON_ERROR, UP_DAEMON_ERROR_GENERAL, "failed to get PolicyKit subject"); ++ dbus_g_method_return_error (context, error); ++ g_error_free (error); ++ } ++ + return subject; + } + --- upower-0.9.5.orig/debian/patches/00git_fix_double_dbus_return.patch +++ upower-0.9.5/debian/patches/00git_fix_double_dbus_return.patch @@ -0,0 +1,107 @@ +commit 3967e062ef5a58c4f3f283f34d591c6e8a5d8788 +Author: Matthias Clasen +Date: Thu Aug 19 13:04:38 2010 +0200 + + Fix double D-BUS return in up_daemon_*_allowed + + Do not send a D-BUS return message any more in up_polkit_is_allowed(), since + this makes it hard for callers to ensure that they return exactly one result to + the D-BUS caller. Instead, just pass a GError to the caller. + + Update up_daemon_suspend_allowed() and up_daemon_hibernate_allowed() + accordingly, to always return either a result or an error. + + Signed-off-by: Martin Pitt + +Index: upower/src/up-daemon.c +=================================================================== +--- upower.orig/src/up-daemon.c 2010-09-24 17:51:00.000000000 +0200 ++++ upower/src/up-daemon.c 2010-09-24 17:51:25.363744999 +0200 +@@ -507,13 +507,21 @@ + gboolean ret; + PolkitSubject *subject = NULL; + UpDaemonPrivate *priv = daemon->priv; ++ GError *error; + + subject = up_polkit_get_subject (priv->polkit, context); + if (subject == NULL) + goto out; + +- ret = up_polkit_is_allowed (priv->polkit, subject, "org.freedesktop.upower.suspend", context); +- dbus_g_method_return (context, ret); ++ error = NULL; ++ ret = up_polkit_is_allowed (priv->polkit, subject, "org.freedesktop.upower.suspend", &error); ++ if (error) { ++ dbus_g_method_return_error (context, error); ++ g_error_free (error); ++ } ++ else { ++ dbus_g_method_return (context, ret); ++ } + + out: + if (subject != NULL) +@@ -619,13 +627,21 @@ + gboolean ret; + PolkitSubject *subject = NULL; + UpDaemonPrivate *priv = daemon->priv; ++ GError *error; + + subject = up_polkit_get_subject (priv->polkit, context); + if (subject == NULL) + goto out; + +- ret = up_polkit_is_allowed (priv->polkit, subject, "org.freedesktop.upower.hibernate", context); +- dbus_g_method_return (context, ret); ++ error = NULL; ++ ret = up_polkit_is_allowed (priv->polkit, subject, "org.freedesktop.upower.hibernate", &error); ++ if (error) { ++ dbus_g_method_return_error (context, error); ++ g_error_free (error); ++ } ++ else { ++ dbus_g_method_return (context, ret); ++ } + + out: + if (subject != NULL) +Index: upower/src/up-polkit.c +=================================================================== +--- upower.orig/src/up-polkit.c 2010-09-24 17:51:00.000000000 +0200 ++++ upower/src/up-polkit.c 2010-09-24 17:52:05.783745000 +0200 +@@ -100,20 +100,17 @@ + * up_polkit_is_allowed: + **/ + gboolean +-up_polkit_is_allowed (UpPolkit *polkit, PolkitSubject *subject, const gchar *action_id, DBusGMethodInvocation *context) ++up_polkit_is_allowed (UpPolkit *polkit, PolkitSubject *subject, const gchar *action_id, GError **error) + { + gboolean ret = FALSE; +- GError *error; + GError *error_local; + PolkitAuthorizationResult *result; + + /* check auth */ + result = polkit_authority_check_authorization_sync (polkit->priv->authority, subject, action_id, NULL, POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE, NULL, &error_local); + if (result == NULL) { +- error = g_error_new (UP_DAEMON_ERROR, UP_DAEMON_ERROR_GENERAL, "failed to check authorisation: %s", error_local->message); +- dbus_g_method_return_error (context, error); ++ g_set_error (error, UP_DAEMON_ERROR, UP_DAEMON_ERROR_GENERAL, "failed to check authorisation: %s", error_local->message); + g_error_free (error_local); +- g_error_free (error); + goto out; + } + +Index: upower/src/up-polkit.h +=================================================================== +--- upower.orig/src/up-polkit.h 2010-09-24 17:51:00.000000000 +0200 ++++ upower/src/up-polkit.h 2010-09-24 17:51:25.363744999 +0200 +@@ -60,7 +60,7 @@ + gboolean up_polkit_is_allowed (UpPolkit *polkit, + PolkitSubject *subject, + const gchar *action_id, +- DBusGMethodInvocation *context); ++ GError **error); + gboolean up_polkit_get_uid (UpPolkit *polkit, + PolkitSubject *subject, + uid_t *uid);