--- upower-0.9.1.orig/debian/libdevkit-power-gobject-dev.install +++ upower-0.9.1/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.1.orig/debian/libdevkit-power-gobject1.install +++ upower-0.9.1/debian/libdevkit-power-gobject1.install @@ -0,0 +1 @@ +usr/lib/libdevkit-power-gobject.so.* --- upower-0.9.1.orig/debian/README.source +++ upower-0.9.1/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.1.orig/debian/TODO +++ upower-0.9.1/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.1.orig/debian/compat +++ upower-0.9.1/debian/compat @@ -0,0 +1 @@ +7 --- upower-0.9.1.orig/debian/libupower-glib-dev.install +++ upower-0.9.1/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.1.orig/debian/libupower-glib1.install +++ upower-0.9.1/debian/libupower-glib1.install @@ -0,0 +1 @@ +usr/lib/libupower-glib.so.* --- upower-0.9.1.orig/debian/upower.postrm +++ upower-0.9.1/debian/upower.postrm @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "$1" = "purge" ]; then + rm -rf /var/lib/upower +fi + +#DEBHELPER# --- upower-0.9.1.orig/debian/libdevkit-power-gobject1.symbols +++ upower-0.9.1/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.1.orig/debian/watch +++ upower-0.9.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://upower.freedesktop.org/releases/upower-([0-9.]+)\.tar\.gz --- upower-0.9.1.orig/debian/copyright +++ upower-0.9.1/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.1.orig/debian/control +++ upower-0.9.1/debian/control @@ -0,0 +1,111 @@ +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.16.1), + libgudev-1.0-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386], + libkvm-dev [kfreebsd-amd64 kfreebsd-i386], + libpolkit-gobject-1-dev (>= 0.91), + libusb-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386] +Standards-Version: 3.8.4 +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: devicekit-power-doc +Architecture: all +Section: oldlibs +Depends: upower-doc +Description: transitional package to upower-doc + This is a transitional package to faciliate the upgrade to the new name + upower-doc. It can be safely removed after the upgrade. + +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.1.orig/debian/upower.install +++ upower-0.9.1/debian/upower.install @@ -0,0 +1,7 @@ +usr/bin/upower +usr/lib/upower/upowerd +usr/share/dbus-1/ +usr/share/polkit-1/ +usr/share/man/ +etc/dbus-1/system.d/ +var/lib/ --- upower-0.9.1.orig/debian/upower.postinst +++ upower-0.9.1/debian/upower.postinst @@ -0,0 +1,19 @@ +#!/bin/sh +set -e + +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 + + # restart upowerd + if start-stop-daemon --stop --quiet --exec /usr/lib/upower/upowerd; then + upower --version >/dev/null || true # will trigger through D-Bus activation + fi +fi + +#DEBHELPER# --- upower-0.9.1.orig/debian/upower-doc.install +++ upower-0.9.1/debian/upower-doc.install @@ -0,0 +1 @@ +usr/share/gtk-doc/html/ --- upower-0.9.1.orig/debian/libupower-glib1.symbols +++ upower-0.9.1/debian/libupower-glib1.symbols @@ -0,0 +1,85 @@ +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_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_state@Base 0.9.0 + up_history_item_set_time@Base 0.9.0 + up_history_item_set_value@Base 0.9.0 + 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.1.orig/debian/changelog +++ upower-0.9.1/debian/changelog @@ -0,0 +1,216 @@ +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.1.orig/debian/rules +++ upower-0.9.1/debian/rules @@ -0,0 +1,22 @@ +#!/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_devicekit-power-doc = -- -v1:$(DEB_VERSION) +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) + +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.1.orig/debian/patches/99-autoreconf.patch +++ upower-0.9.1/debian/patches/99-autoreconf.patch @@ -0,0 +1,197 @@ +Index: upower/src/Makefile.in +=================================================================== +--- upower.orig/src/Makefile.in 2010-03-26 07:56:49.688691489 +0100 ++++ upower/src/Makefile.in 2010-03-26 07:56:41.784688652 +0100 +@@ -40,13 +40,11 @@ + @BACKEND_TYPE_DUMMY_TRUE@ dummy/libupshared.la + + @BACKEND_TYPE_FREEBSD_TRUE@am__append_2 = \ +-@BACKEND_TYPE_FREEBSD_TRUE@ freebsd/libupshared.la \ +-@BACKEND_TYPE_FREEBSD_TRUE@ $(DEVKIT_POWER_LIBS) ++@BACKEND_TYPE_FREEBSD_TRUE@ freebsd/libupshared.la + + @BACKEND_TYPE_LINUX_TRUE@am__append_3 = \ + @BACKEND_TYPE_LINUX_TRUE@ linux/libupshared.la \ +-@BACKEND_TYPE_LINUX_TRUE@ $(GUDEV_LIBS) \ +-@BACKEND_TYPE_LINUX_TRUE@ $(DEVKIT_POWER_LIBS) ++@BACKEND_TYPE_LINUX_TRUE@ $(GUDEV_LIBS) + + @EGG_BUILD_TESTS_TRUE@check_PROGRAMS = up-self-test$(EXEEXT) + @EGG_BUILD_TESTS_TRUE@TESTS = up-self-test$(EXEEXT) +@@ -85,8 +83,7 @@ + @EGG_BUILD_TESTS_TRUE@ $(am__objects_1) + up_self_test_OBJECTS = $(am_up_self_test_OBJECTS) + am__DEPENDENCIES_1 = +-@EGG_BUILD_TESTS_TRUE@up_self_test_DEPENDENCIES = \ +-@EGG_BUILD_TESTS_TRUE@ dummy/libupshared.la \ ++@EGG_BUILD_TESTS_TRUE@up_self_test_DEPENDENCIES = dummy/libuptest.la \ + @EGG_BUILD_TESTS_TRUE@ $(am__DEPENDENCIES_1) \ + @EGG_BUILD_TESTS_TRUE@ $(am__DEPENDENCIES_1) \ + @EGG_BUILD_TESTS_TRUE@ $(am__DEPENDENCIES_1) \ +@@ -107,11 +104,10 @@ + $(am__objects_2) + upowerd_OBJECTS = $(am_upowerd_OBJECTS) + @BACKEND_TYPE_LINUX_TRUE@am__DEPENDENCIES_2 = linux/libupshared.la \ +-@BACKEND_TYPE_LINUX_TRUE@ $(am__DEPENDENCIES_1) \ +-@BACKEND_TYPE_LINUX_TRUE@ $(DEVKIT_POWER_LIBS) ++@BACKEND_TYPE_LINUX_TRUE@ $(am__DEPENDENCIES_1) + upowerd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) $(UPOWER_LIBS) $(am__append_1) \ +- $(am__append_2) $(am__DEPENDENCIES_2) ++ $(am__DEPENDENCIES_1) $(UPOWER_LIBS) $(DEVKIT_POWER_LIBS) \ ++ $(am__append_1) $(am__append_2) $(am__DEPENDENCIES_2) + upowerd_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(upowerd_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +@@ -447,8 +443,8 @@ + $(AM_CPPFLAGS) + + upowerd_LDADD = -lm $(USB_LIBS) $(GIO_LIBS) $(DBUS_GLIB_LIBS) \ +- $(POLKIT_LIBS) $(UPOWER_LIBS) $(am__append_1) $(am__append_2) \ +- $(am__append_3) ++ $(POLKIT_LIBS) $(UPOWER_LIBS) $(DEVKIT_POWER_LIBS) \ ++ $(am__append_1) $(am__append_2) $(am__append_3) + upowerd_CFLAGS = \ + $(WARNINGFLAGS_C) \ + $(NULL) +@@ -479,7 +475,7 @@ + + @EGG_BUILD_TESTS_TRUE@up_self_test_LDADD = \ + @EGG_BUILD_TESTS_TRUE@ -lm \ +-@EGG_BUILD_TESTS_TRUE@ dummy/libupshared.la \ ++@EGG_BUILD_TESTS_TRUE@ dummy/libuptest.la \ + @EGG_BUILD_TESTS_TRUE@ $(GLIB_LIBS) \ + @EGG_BUILD_TESTS_TRUE@ $(GIO_CFLAGS) \ + @EGG_BUILD_TESTS_TRUE@ $(DBUS_GLIB_LIBS) \ +Index: upower/src/dummy/Makefile.in +=================================================================== +--- upower.orig/src/dummy/Makefile.in 2010-03-26 07:56:50.264693640 +0100 ++++ upower/src/dummy/Makefile.in 2010-03-26 07:56:41.908688797 +0100 +@@ -34,6 +34,8 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ ++@BACKEND_TYPE_DUMMY_TRUE@am__append_1 = libupshared.la ++@EGG_BUILD_TESTS_TRUE@am__append_2 = libuptest.la + subdir = src/dummy + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -51,6 +53,16 @@ + AM_V_lt = $(am__v_lt_$(V)) + am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) + am__v_lt_0 = --silent ++@BACKEND_TYPE_DUMMY_TRUE@am_libupshared_la_rpath = ++libuptest_la_LIBADD = ++am__libuptest_la_SOURCES_DIST = up-backend.c up-native.c ++am__objects_1 = libuptest_la-up-backend.lo libuptest_la-up-native.lo ++@EGG_BUILD_TESTS_TRUE@am_libuptest_la_OBJECTS = $(am__objects_1) ++libuptest_la_OBJECTS = $(am_libuptest_la_OBJECTS) ++libuptest_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libuptest_la_CFLAGS) \ ++ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++@EGG_BUILD_TESTS_TRUE@am_libuptest_la_rpath = + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -77,8 +89,9 @@ + AM_V_GEN = $(am__v_GEN_$(V)) + am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) + am__v_GEN_0 = @echo " GEN " $@; +-SOURCES = $(libupshared_la_SOURCES) +-DIST_SOURCES = $(libupshared_la_SOURCES) ++SOURCES = $(libupshared_la_SOURCES) $(libuptest_la_SOURCES) ++DIST_SOURCES = $(libupshared_la_SOURCES) \ ++ $(am__libuptest_la_SOURCES_DIST) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -256,19 +269,19 @@ + INCLUDES = \ + -I$(top_builddir)/src -I$(top_srcdir)/src \ + -DUP_COMPILATION \ +- -DEGG_TEST \ +- -I$(top_srcdir)/devkit-power-gobject \ + -I$(top_srcdir)/libupower-glib \ + $(DBUS_GLIB_CFLAGS) \ + $(POLKIT_CFLAGS) \ + $(GLIB_CFLAGS) + +-noinst_LTLIBRARIES = libupshared.la ++noinst_LTLIBRARIES = $(am__append_1) $(am__append_2) + libupshared_la_SOURCES = \ + up-backend.c \ + up-native.c \ + $(BUILT_SOURCES) + ++@EGG_BUILD_TESTS_TRUE@libuptest_la_CFLAGS = -DEGG_TEST ++@EGG_BUILD_TESTS_TRUE@libuptest_la_SOURCES = $(libupshared_la_SOURCES) + all: all-am + + .SUFFIXES: +@@ -313,7 +326,9 @@ + rm -f "$${dir}/so_locations"; \ + done + libupshared.la: $(libupshared_la_OBJECTS) $(libupshared_la_DEPENDENCIES) +- $(AM_V_CCLD)$(LINK) $(libupshared_la_OBJECTS) $(libupshared_la_LIBADD) $(LIBS) ++ $(AM_V_CCLD)$(LINK) $(am_libupshared_la_rpath) $(libupshared_la_OBJECTS) $(libupshared_la_LIBADD) $(LIBS) ++libuptest.la: $(libuptest_la_OBJECTS) $(libuptest_la_DEPENDENCIES) ++ $(AM_V_CCLD)$(libuptest_la_LINK) $(am_libuptest_la_rpath) $(libuptest_la_OBJECTS) $(libuptest_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -321,6 +336,8 @@ + distclean-compile: + -rm -f *.tab.c + ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libuptest_la-up-backend.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libuptest_la-up-native.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/up-backend.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/up-native.Plo@am__quote@ + +@@ -348,6 +365,22 @@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + ++libuptest_la-up-backend.lo: up-backend.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libuptest_la_CFLAGS) $(CFLAGS) -MT libuptest_la-up-backend.lo -MD -MP -MF $(DEPDIR)/libuptest_la-up-backend.Tpo -c -o libuptest_la-up-backend.lo `test -f 'up-backend.c' || echo '$(srcdir)/'`up-backend.c ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libuptest_la-up-backend.Tpo $(DEPDIR)/libuptest_la-up-backend.Plo ++@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='up-backend.c' object='libuptest_la-up-backend.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libuptest_la_CFLAGS) $(CFLAGS) -c -o libuptest_la-up-backend.lo `test -f 'up-backend.c' || echo '$(srcdir)/'`up-backend.c ++ ++libuptest_la-up-native.lo: up-native.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libuptest_la_CFLAGS) $(CFLAGS) -MT libuptest_la-up-native.lo -MD -MP -MF $(DEPDIR)/libuptest_la-up-native.Tpo -c -o libuptest_la-up-native.lo `test -f 'up-native.c' || echo '$(srcdir)/'`up-native.c ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libuptest_la-up-native.Tpo $(DEPDIR)/libuptest_la-up-native.Plo ++@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='up-native.c' object='libuptest_la-up-native.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libuptest_la_CFLAGS) $(CFLAGS) -c -o libuptest_la-up-native.lo `test -f 'up-native.c' || echo '$(srcdir)/'`up-native.c ++ + mostlyclean-libtool: + -rm -f *.lo + +Index: upower/src/freebsd/Makefile.in +=================================================================== +--- upower.orig/src/freebsd/Makefile.in 2010-03-26 07:56:50.112694665 +0100 ++++ upower/src/freebsd/Makefile.in 2010-03-26 07:56:42.064688001 +0100 +@@ -264,7 +264,6 @@ + INCLUDES = \ + -I$(top_builddir)/src -I$(top_srcdir)/src \ + -DUP_COMPILATION \ +- -I$(top_srcdir)/devkit-power-gobject \ + -I$(top_srcdir)/libupower-glib \ + $(DBUS_GLIB_CFLAGS) \ + $(POLKIT_CFLAGS) \ +Index: upower/src/linux/Makefile.in +=================================================================== +--- upower.orig/src/linux/Makefile.in 2010-03-26 07:56:49.824694569 +0100 ++++ upower/src/linux/Makefile.in 2010-03-26 07:56:42.232687338 +0100 +@@ -267,7 +267,6 @@ + -I$(top_builddir)/src -I$(top_srcdir)/src \ + -DUP_COMPILATION \ + -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \ +- -I$(top_srcdir)/devkit-power-gobject \ + -I$(top_srcdir)/libupower-glib \ + $(GIO_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ --- upower-0.9.1.orig/debian/patches/01-dummy-backend.patch +++ upower-0.9.1/debian/patches/01-dummy-backend.patch @@ -0,0 +1,173 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 9a04709..74fa3b7 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -95,7 +95,8 @@ upowerd_LDADD = \ + $(GIO_LIBS) \ + $(DBUS_GLIB_LIBS) \ + $(POLKIT_LIBS) \ +- $(UPOWER_LIBS) ++ $(UPOWER_LIBS) \ ++ $(DEVKIT_POWER_LIBS) + + if BACKEND_TYPE_DUMMY + upowerd_LDADD += \ +@@ -104,15 +105,13 @@ endif + + if BACKEND_TYPE_FREEBSD + upowerd_LDADD += \ +- freebsd/libupshared.la \ +- $(DEVKIT_POWER_LIBS) ++ freebsd/libupshared.la + endif + + if BACKEND_TYPE_LINUX + upowerd_LDADD += \ + linux/libupshared.la \ +- $(GUDEV_LIBS) \ +- $(DEVKIT_POWER_LIBS) ++ $(GUDEV_LIBS) + endif + + upowerd_CFLAGS = \ +@@ -149,7 +148,7 @@ up_self_test_SOURCES = \ + + up_self_test_LDADD = \ + -lm \ +- dummy/libupshared.la \ ++ dummy/libuptest.la \ + $(GLIB_LIBS) \ + $(GIO_CFLAGS) \ + $(DBUS_GLIB_LIBS) \ +diff --git a/src/dummy/Makefile.am b/src/dummy/Makefile.am +index bcfe937..71c094a 100644 +--- a/src/dummy/Makefile.am ++++ b/src/dummy/Makefile.am +@@ -3,20 +3,28 @@ + INCLUDES = \ + -I$(top_builddir)/src -I$(top_srcdir)/src \ + -DUP_COMPILATION \ +- -DEGG_TEST \ +- -I$(top_srcdir)/devkit-power-gobject \ + -I$(top_srcdir)/libupower-glib \ + $(DBUS_GLIB_CFLAGS) \ + $(POLKIT_CFLAGS) \ + $(GLIB_CFLAGS) + +-noinst_LTLIBRARIES = libupshared.la ++noinst_LTLIBRARIES = ++ ++if BACKEND_TYPE_DUMMY ++noinst_LTLIBRARIES += libupshared.la ++endif + + libupshared_la_SOURCES = \ + up-backend.c \ + up-native.c \ + $(BUILT_SOURCES) + ++if EGG_BUILD_TESTS ++noinst_LTLIBRARIES += libuptest.la ++libuptest_la_CFLAGS = -DEGG_TEST ++libuptest_la_SOURCES = $(libupshared_la_SOURCES) ++endif ++ + clean-local : + rm -f *~ + +diff --git a/src/dummy/up-backend.c b/src/dummy/up-backend.c +index 02909e9..8c99359 100644 +--- a/src/dummy/up-backend.c ++++ b/src/dummy/up-backend.c +@@ -43,9 +43,13 @@ static void up_backend_finalize (GObject *object); + struct UpBackendPrivate + { + UpDaemon *daemon; ++#ifdef EGG_TEST + UpDevice *device; ++#endif + UpDeviceList *device_list; /* unused */ ++#ifdef EGG_TEST + GObject *native; ++#endif + }; + + enum { +@@ -58,6 +62,7 @@ static guint signals [SIGNAL_LAST] = { 0 }; + + G_DEFINE_TYPE (UpBackend, up_backend, G_TYPE_OBJECT) + ++#ifdef EGG_TEST + /** + * up_backend_changed_time_cb: + **/ +@@ -99,6 +104,7 @@ up_backend_add_cb (UpBackend *backend) + out: + return FALSE; + } ++#endif + + /** + * up_backend_coldplug: +@@ -116,8 +122,10 @@ up_backend_coldplug (UpBackend *backend, UpDaemon *daemon) + backend->priv->daemon = g_object_ref (daemon); + backend->priv->device_list = up_daemon_get_device_list (daemon); + ++#ifdef EGG_TEST + /* small delay until first device is added */ + g_timeout_add_seconds (1, (GSourceFunc) up_backend_add_cb, backend); ++#endif + + return TRUE; + } +@@ -157,6 +165,7 @@ up_backend_init (UpBackend *backend) + backend->priv = UP_BACKEND_GET_PRIVATE (backend); + backend->priv->daemon = NULL; + backend->priv->device_list = NULL; ++#ifdef EGG_TEST + backend->priv->native = g_object_new (UP_TYPE_DEVICE, NULL); + backend->priv->device = up_device_new (); + +@@ -181,6 +190,7 @@ up_backend_init (UpBackend *backend) + "energy-rate", 5.0f, + "percentage", 50.0f, + NULL); ++#endif + } + + /** +@@ -200,8 +210,10 @@ up_backend_finalize (GObject *object) + if (backend->priv->device_list != NULL) + g_object_unref (backend->priv->device_list); + ++#ifdef EGG_TEST + g_object_unref (backend->priv->native); + g_object_unref (backend->priv->device); ++#endif + + G_OBJECT_CLASS (up_backend_parent_class)->finalize (object); + } +diff --git a/src/freebsd/Makefile.am b/src/freebsd/Makefile.am +index c524522..2bf50f5 100644 +--- a/src/freebsd/Makefile.am ++++ b/src/freebsd/Makefile.am +@@ -3,7 +3,6 @@ + INCLUDES = \ + -I$(top_builddir)/src -I$(top_srcdir)/src \ + -DUP_COMPILATION \ +- -I$(top_srcdir)/devkit-power-gobject \ + -I$(top_srcdir)/libupower-glib \ + $(DBUS_GLIB_CFLAGS) \ + $(POLKIT_CFLAGS) \ +diff --git a/src/linux/Makefile.am b/src/linux/Makefile.am +index e6d9630..3e715a3 100644 +--- a/src/linux/Makefile.am ++++ b/src/linux/Makefile.am +@@ -4,7 +4,6 @@ INCLUDES = \ + -I$(top_builddir)/src -I$(top_srcdir)/src \ + -DUP_COMPILATION \ + -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \ +- -I$(top_srcdir)/devkit-power-gobject \ + -I$(top_srcdir)/libupower-glib \ + $(GIO_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ --- upower-0.9.1.orig/debian/patches/series +++ upower-0.9.1/debian/patches/series @@ -0,0 +1,3 @@ +# Debian patches for upower +01-dummy-backend.patch +99-autoreconf.patch