On 19.10.2010 21:52, Adam D. Barratt wrote: > On Mon, 2010-10-18 at 23:12 +0200, Michael Biebl wrote: >> On 18.10.2010 23:05, Michael Biebl wrote: >> >>> 71 files changed, 3670 insertions(+), 4923 deletions(-) >>> >>> Looks a bit scary at first. The high number of deleted lines is due to >>> libhal-glib being removed (as it is no longer used), and if you don't count the >>> very verbose Changelog, the diffstat looks a bit more sane. >> >> And the vast majority of the changes come from the switch from >> libdevkit-gobject-power to libupower-glib being a trivial search and replace. >> As you can see from the debdiff, it's mostly a s/dkp_/up_/ and s/Dkp/Up/ > > Please go ahead. Done, 2.32.0-2 has been uploaded to unstable. With all rdeps updated, attached is the debdiff for upower_0.9.5-5 which removes the deprecated libdevkit-power-gobject library, closing #595083. I've also included a fix for #586751, the patch is cherry-picked from upstream Git and rather simple. Please let me know if I can upload upower to unstable, so this task can be closed. Thanks for your hard work, Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
reverted:
--- upower-0.9.5/debian/libdevkit-power-gobject-dev.install
+++ upower-0.9.5.orig/debian/libdevkit-power-gobject-dev.install
@@ -1,3 +0,0 @@
-usr/lib/libdevkit-power-gobject.{so,a}
-usr/lib/pkgconfig/devkit-power-gobject.pc
-usr/include/DeviceKit-power/devkit-power-gobject/
reverted:
--- upower-0.9.5/debian/libdevkit-power-gobject1.install
+++ upower-0.9.5.orig/debian/libdevkit-power-gobject1.install
@@ -1 +0,0 @@
-usr/lib/libdevkit-power-gobject.so.*
diff -u upower-0.9.5/debian/rules upower-0.9.5/debian/rules
--- upower-0.9.5/debian/rules
+++ upower-0.9.5/debian/rules
@@ -7,12 +7,6 @@
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
diff -u upower-0.9.5/debian/control upower-0.9.5/debian/control
--- upower-0.9.5/debian/control
+++ upower-0.9.5/debian/control
@@ -76,29 +75,0 @@
-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.
-
diff -u upower-0.9.5/debian/changelog upower-0.9.5/debian/changelog
--- upower-0.9.5/debian/changelog
+++ upower-0.9.5/debian/changelog
@@ -1,3 +1,14 @@
+upower (0.9.5-5) UNRELEASED; urgency=low
+
+ * debian/patches/00git_dont_poll_serial_port_if_no_wup_adaptor.patch
+ - Do not continue to poll the serial port if there is no Watts Up Pro
+ adaptor. Patch cherry-picked from upstream Git. (Closes: #586751)
+ * Drop libdevkit-power-gobject library packages as all reverse dependencies
+ have been updated to use the new API provided by libupower-glib.
+ (Closes: #595083)
+
+ -- Michael Biebl <biebl@debian.org> Wed, 20 Oct 2010 00:15:28 +0200
+
upower (0.9.5-4) unstable; urgency=low
* Add 00git_initialize_polkit_gerror.patch: Ensure we've initialized errors
reverted:
--- upower-0.9.5/debian/libdevkit-power-gobject1.symbols
+++ upower-0.9.5.orig/debian/libdevkit-power-gobject1.symbols
@@ -1,58 +0,0 @@
-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
diff -u upower-0.9.5/debian/patches/series upower-0.9.5/debian/patches/series
--- upower-0.9.5/debian/patches/series
+++ upower-0.9.5/debian/patches/series
@@ -5,0 +6 @@
+00git_dont_poll_serial_port_if_no_wup_adaptor.patch
diff -u upower-0.9.5/debian/patches/00git_fix_missing_qos_dbus_return.patch upower-0.9.5/debian/patches/00git_fix_missing_qos_dbus_return.patch
--- upower-0.9.5/debian/patches/00git_fix_missing_qos_dbus_return.patch
+++ upower-0.9.5/debian/patches/00git_fix_missing_qos_dbus_return.patch
@@ -6,11 +6,11 @@
Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
-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)
+Index: upower/src/up-qos.c
+===================================================================
+--- upower.orig/src/up-qos.c 2010-07-15 01:11:54.462878054 +0200
++++ upower/src/up-qos.c 2010-10-20 00:14:19.350142439 +0200
+@@ -388,6 +388,8 @@
/* TODO: if persistent remove from datadase */
g_signal_emit (qos, signals [REQUESTS_CHANGED], 0);
diff -u upower-0.9.5/debian/patches/00git_fix_double_dbus_return.patch upower-0.9.5/debian/patches/00git_fix_double_dbus_return.patch
--- upower-0.9.5/debian/patches/00git_fix_double_dbus_return.patch
+++ upower-0.9.5/debian/patches/00git_fix_double_dbus_return.patch
@@ -13,11 +13,11 @@
Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
-diff --git a/src/up-daemon.c b/src/up-daemon.c
-index 40bab80..532ebe8 100644
---- a/src/up-daemon.c
-+++ b/src/up-daemon.c
-@@ -511,13 +511,21 @@ up_daemon_suspend_allowed (UpDaemon *daemon, DBusGMethodInvocation *context)
+Index: upower/src/up-daemon.c
+===================================================================
+--- upower.orig/src/up-daemon.c 2010-07-15 01:11:54.458876706 +0200
++++ upower/src/up-daemon.c 2010-10-20 00:14:25.662137487 +0200
+@@ -507,13 +507,21 @@
gboolean ret;
PolkitSubject *subject = NULL;
UpDaemonPrivate *priv = daemon->priv;
@@ -41,7 +41,7 @@
out:
if (subject != NULL)
-@@ -627,13 +635,21 @@ up_daemon_hibernate_allowed (UpDaemon *daemon, DBusGMethodInvocation *context)
+@@ -619,13 +627,21 @@
gboolean ret;
PolkitSubject *subject = NULL;
UpDaemonPrivate *priv = daemon->priv;
@@ -65,11 +65,11 @@
out:
if (subject != NULL)
-diff --git a/src/up-polkit.c b/src/up-polkit.c
-index 9b86394..ab2c66d 100644
---- a/src/up-polkit.c
-+++ b/src/up-polkit.c
-@@ -103,10 +103,9 @@ out:
+Index: upower/src/up-polkit.c
+===================================================================
+--- upower.orig/src/up-polkit.c 2010-10-20 00:14:18.366156223 +0200
++++ upower/src/up-polkit.c 2010-10-20 00:14:25.662137487 +0200
+@@ -103,10 +103,9 @@
* up_polkit_is_allowed:
**/
gboolean
@@ -81,7 +81,7 @@
GError *error_local = NULL;
PolkitAuthorizationResult *result;
-@@ -116,10 +115,8 @@ up_polkit_is_allowed (UpPolkit *polkit, PolkitSubject *subject, const gchar *act
+@@ -116,10 +115,8 @@
POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE,
NULL, &error_local);
if (result == NULL) {
@@ -93,11 +93,11 @@
goto out;
}
-diff --git a/src/up-polkit.h b/src/up-polkit.h
-index acee70e..1ddac58 100644
---- a/src/up-polkit.h
-+++ b/src/up-polkit.h
-@@ -60,7 +60,7 @@ gboolean up_polkit_check_auth (UpPolkit *polkit,
+Index: upower/src/up-polkit.h
+===================================================================
+--- upower.orig/src/up-polkit.h 2010-07-15 01:11:54.462878054 +0200
++++ upower/src/up-polkit.h 2010-10-20 00:14:25.666144423 +0200
+@@ -60,7 +60,7 @@
gboolean up_polkit_is_allowed (UpPolkit *polkit,
PolkitSubject *subject,
const gchar *action_id,
only in patch2:
unchanged:
--- upower-0.9.5.orig/debian/patches/00git_dont_poll_serial_port_if_no_wup_adaptor.patch
+++ upower-0.9.5/debian/patches/00git_dont_poll_serial_port_if_no_wup_adaptor.patch
@@ -0,0 +1,29 @@
+From 163d5fc355670722ce45893e5af60ea4bde06a82 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 20 Sep 2010 16:22:45 +0100
+Subject: [PATCH 1/9] Do not continue to poll the serial port if there is no Watts Up Pro adaptor
+
+---
+ src/linux/up-device-wup.c | 6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+diff --git a/src/linux/up-device-wup.c b/src/linux/up-device-wup.c
+index 73bb8e5..bf5dbb8 100644
+--- a/src/linux/up-device-wup.c
++++ b/src/linux/up-device-wup.c
+@@ -376,11 +376,7 @@ up_device_wup_coldplug (UpDevice *device)
+
+ /* coldplug */
+ egg_debug ("coldplug");
+- up_device_wup_refresh (device);
+-
+- /* hardcode true, as we'll retry later if busy */
+- ret = TRUE;
+-
++ ret = up_device_wup_refresh (device);
+ out:
+ return ret;
+ }
+--
+1.7.2.3
+
Attachment:
signature.asc
Description: OpenPGP digital signature