Hello community,
here is the log from the commit of package gnome-power-manager for
openSUSE:Factory
checked in at Fri Jul 8 11:53:52 CEST 2011.
--------
--- GNOME/gnome-power-manager/gnome-power-manager.changes 2011-05-26
22:37:10.000000000 +0200
+++
/mounts/work_src_done/STABLE/gnome-power-manager/gnome-power-manager.changes
2011-07-04 11:55:55.000000000 +0200
@@ -1,0 +2,34 @@
+Mon Jul 4 11:44:05 CEST 2011 - [email protected]
+
+- Re-enable gnome-patch-translation support now that we have new
+ strings in patches again.
+
+-------------------------------------------------------------------
+Thu Jun 30 07:29:59 UTC 2011 - [email protected]
+
+- Rebase gnome-power-manager-notify-idle-sleep.patch and
+ gnome-power-manager-no-fallback-to-hibernate.patch
+- Own %{_datadir}/GConf and %{_datadir}/GConf/gsettings
+ directories.
+- Add gnome-icon-theme and polkit BuildRequires, that own some
+ directories.
+
+-------------------------------------------------------------------
+Thu Jun 16 15:31:42 CEST 2011 - [email protected]
+
+- Drop now unneeded pkgconfig(gconf-2.0) BuildRequires.
+
+-------------------------------------------------------------------
+Tue Jun 14 09:40:08 CEST 2011 - [email protected]
+
+- Update to version 3.1.2:
+ + Don't crash if there is no ConsoleKit session. [rh#699020]
+ + gnome-power-bugreport.sh: Use sysfs instead of hal if available
+ + Manually update the idle status property
+ + Query gnome-screensaver settings with GSettings
+ + Remove GpmTrayIcon
+ + Updated translations.
+- Drop gnome-power-manager-update-status-property.patch: fixed
+ upstream.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gnome-power-manager-3.0.2.tar.bz2
gnome-power-manager-update-status-property.patch
New:
----
gnome-power-manager-3.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-power-manager.spec ++++++
--- /var/tmp/diff_new_pack.vSdnFV/_old 2011-07-08 11:52:45.000000000 +0200
+++ /var/tmp/diff_new_pack.vSdnFV/_new 2011-07-08 11:52:45.000000000 +0200
@@ -18,7 +18,7 @@
Name: gnome-power-manager
-Version: 3.0.2
+Version: 3.1.2
Release: 1
License: GPLv2+
Summary: Power Management for GNOME
@@ -27,24 +27,25 @@
Source:
ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.16/%{name}-%{version}.tar.bz2
# PATCH-NEEDS-REBASE gnome-power-manager-schedule-wakeups.patch gburt
fate302448 -- add tab to prefs to schedule rtcwake (was PATCH-FEATURE-OPENSUSE)
Patch10: gnome-power-manager-schedule-wakeups.patch
-# PATCH-NEEDS-REBASE gnome-power-manager-notify-idle-sleep.patch hmacht
bnc#439018 bgo575467 -- notify user about auto suspend when returning from
sleep (WAS: PATCH-FEATURE-UPSTREAM)
+# PATCH-FEATURE-UPSTREAM gnome-power-manager-notify-idle-sleep.patch hmacht
bnc#439018 bgo575467 -- notify user about auto suspend when returning from sleep
Patch12: gnome-power-manager-notify-idle-sleep.patch
-# PATCH-NEEDS-REBASE gnome-power-manager-no-fallback-to-hibernate.patch
[email protected] bnc#440410 (WAS: PATCH-FIX-OPENSUSE)
+# PATCH-FIX-OPENSUSE gnome-power-manager-no-fallback-to-hibernate.patch
[email protected] bnc#440410
Patch14: gnome-power-manager-no-fallback-to-hibernate.patch
-# PATCH-FIX-UPSTREAM gnome-power-manager-update-status-property.patch
[email protected] bnc#692794 -- update the session status manually
-Patch15: gnome-power-manager-update-status-property.patch
BuildRequires: docbook-utils
BuildRequires: fdupes
BuildRequires: gnome-doc-utils-devel
+# For directory ownership
+BuildRequires: gnome-icon-theme
BuildRequires: gnome-patch-translation
BuildRequires: intltool
BuildRequires: libcanberra-devel
BuildRequires: libgnome-keyring-devel
BuildRequires: libnotify-devel
BuildRequires: libupower-glib-devel
+# For directory ownership
+BuildRequires: polkit
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
-BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: xmlto
%if 0%{?BUILD_FROM_VCS}
BuildRequires: gnome-common
@@ -68,14 +69,13 @@
%lang_package
%prep
%setup -q
-%patch15 -p1
translation-update-upstream
-#gnome-patch-translation-prepare
+gnome-patch-translation-prepare
# Needs rebase:
#%patch10 -p1
-#%patch12 -p1
-#%patch14 -p1
-#gnome-patch-translation-update
+%patch12 -p1
+%patch14 -p1
+gnome-patch-translation-update
%if 0%{?BUILD_FROM_VCS}
[ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh
@@ -125,6 +125,9 @@
%{_bindir}/*
%{_sbindir}/gnome-power-backlight-helper
%{_sysconfdir}/xdg/autostart/*.desktop
+# Own the directory since we can't depend on gconf providing them
+%dir %{_datadir}/GConf
+%dir %{_datadir}/GConf/gsettings
%{_datadir}/GConf/gsettings/org.gnome.power-manager.gschema.migrate
%{_datadir}/applications/*.desktop
%{_datadir}/dbus-1/services/gnome-power-manager.service
++++++ gnome-power-manager-3.0.2.tar.bz2 -> gnome-power-manager-3.1.2.tar.bz2
++++++
++++ 16381 lines of diff (skipped)
++++++ gnome-power-manager-no-fallback-to-hibernate.patch ++++++
--- /var/tmp/diff_new_pack.vSdnFV/_old 2011-07-08 11:52:46.000000000 +0200
+++ /var/tmp/diff_new_pack.vSdnFV/_new 2011-07-08 11:52:46.000000000 +0200
@@ -1,20 +1,22 @@
-Index: gnome-power-manager-2.28.1/src/gpm-manager.c
-===================================================================
---- gnome-power-manager-2.28.1.orig/src/gpm-manager.c
-+++ gnome-power-manager-2.28.1/src/gpm-manager.c
-@@ -602,14 +602,9 @@ gpm_manager_idle_do_sleep (GpmManager *m
- egg_debug ("suspending, reason: System idle");
+diff --git a/src/gpm-manager.c b/src/gpm-manager.c
+index 3572c13..84651c9 100644
+--- a/src/gpm-manager.c
++++ b/src/gpm-manager.c
+@@ -840,15 +840,10 @@ gpm_manager_idle_do_sleep (GpmManager *manager)
+ manager->priv->idle_sleep = TRUE;
ret = gpm_control_suspend (manager->priv->control, &error);
if (!ret) {
-- egg_warning ("cannot suspend (error: %s), so trying
hibernate", error->message);
-+ egg_warning ("cannot suspend (error: %s)",
error->message);
+- g_warning ("cannot suspend (error: %s), so trying
hibernate", error->message);
++ g_warning ("cannot suspend (error: %s)",
error->message);
g_error_free (error);
error = NULL;
- ret = gpm_control_hibernate (manager->priv->control,
&error);
- if (!ret) {
-- egg_warning ("cannot suspend or hibernate: %s",
error->message);
+- g_warning ("cannot suspend or hibernate: %s",
error->message);
- g_error_free (error);
+- manager->priv->idle_sleep = FALSE;
- }
- } else {
- /* we're back from suspend without an error, tell the
- * user that we've actually suspended due to system
++ manager->priv->idle_sleep = FALSE;
+ }
+
+ } else if (policy == GPM_ACTION_POLICY_HIBERNATE) {
++++++ gnome-power-manager-notify-idle-sleep.patch ++++++
--- /var/tmp/diff_new_pack.vSdnFV/_old 2011-07-08 11:52:46.000000000 +0200
+++ /var/tmp/diff_new_pack.vSdnFV/_new 2011-07-08 11:52:46.000000000 +0200
@@ -1,55 +1,56 @@
-From 331e3d5383acc74daee8989f7c0e9df01a3b1421 Mon Sep 17 00:00:00 2001
-From: Vincent Untz <[email protected]>
-Date: Mon, 20 Jul 2009 14:37:02 +0200
-Subject: [PATCH] Add a notification when coming back from idle sleep
-
-This lets the user know what happened.
----
- data/gnome-power-manager.schemas.in | 12 ++++++++++++
- src/gpm-common.h | 1 +
- src/gpm-manager.c | 35 +++++++++++++++++++++++++++++++++++
- 3 files changed, 48 insertions(+), 0 deletions(-)
-
-Index: gnome-power-manager-2.30.0/data/gnome-power-manager.schemas.in
-===================================================================
---- gnome-power-manager-2.30.0.orig/data/gnome-power-manager.schemas.in
-+++ gnome-power-manager-2.30.0/data/gnome-power-manager.schemas.in
-@@ -504,6 +504,18 @@
- </schema>
-
- <schema>
-+ <key>/schemas/apps/gnome-power-manager/notify/idle_sleep</key>
-+ <applyto>/apps/gnome-power-manager/notify/idle_sleep</applyto>
-+ <owner>gnome-power-manager</owner>
-+ <type>bool</type>
+diff --git a/data/org.gnome.power-manager.gschema.migrate
b/data/org.gnome.power-manager.gschema.migrate
+index 4365245..4209855 100644
+--- a/data/org.gnome.power-manager.gschema.migrate
++++ b/data/org.gnome.power-manager.gschema.migrate
+@@ -20,6 +20,7 @@ notify-fully-charged =
/apps/gnome-power-manager/notify/fully_charged
+ notify-sleep-failed = /apps/gnome-power-manager/notify/sleep_failed
+ notify-sleep-failed-uri = /apps/gnome-power-manager/notify/sleep_failed_uri
+ notify-low-power-system = /apps/gnome-power-manager/notify/low_power
++notify-idle-sleep = /apps/gnome-power-manager/notify/idle_sleep
+ info-history-graph-points = /apps/gnome-power-manager/statistics/show_events
+ info-history-graph-smooth = /apps/gnome-power-manager/statistics/smooth_data
+ info-history-type = /apps/gnome-power-manager/statistics/graph_type
+diff --git a/data/org.gnome.power-manager.gschema.xml.in
b/data/org.gnome.power-manager.gschema.xml.in
+index 8611416..e4cebba 100644
+--- a/data/org.gnome.power-manager.gschema.xml.in
++++ b/data/org.gnome.power-manager.gschema.xml.in
+@@ -142,6 +142,11 @@
+ <_summary>Notify on a low power</_summary>
+ <_description>If a notification message should be displayed when
battery in a device attached to the computer is getting low.</_description>
+ </key>
++ <key name="notify-idle-sleep" type="b">
+ <default>false</default>
-+ <locale name="C">
-+ <short>If an information message should be displayed when returning
from idle sleep.</short>
-+ <long>If an information message should be displayed when returning
from idle sleep.</long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
- <key>/schemas/apps/gnome-power-manager/statistics/show_axis_labels</key>
- <applyto>/apps/gnome-power-manager/statistics/show_axis_labels</applyto>
- <owner>gnome-power-manager</owner>
-Index: gnome-power-manager-2.30.0/src/gpm-common.h
-===================================================================
---- gnome-power-manager-2.30.0.orig/src/gpm-common.h
-+++ gnome-power-manager-2.30.0/src/gpm-common.h
-@@ -108,6 +108,7 @@ G_BEGIN_DECLS
- #define GPM_CONF_NOTIFY_SLEEP_FAILED GPM_CONF_DIR
"/notify/sleep_failed"
- #define GPM_CONF_NOTIFY_SLEEP_FAILED_URI GPM_CONF_DIR
"/notify/sleep_failed_uri"
- #define GPM_CONF_NOTIFY_LOW_POWER GPM_CONF_DIR "/notify/low_power"
-+#define GPM_CONF_NOTIFY_IDLE_SLEEP GPM_CONF_DIR
"/notify/idle_sleep"
-
- /* statistics */
- #define GPM_CONF_STATS_SHOW_AXIS_LABELS GPM_CONF_DIR
"/statistics/show_axis_labels"
-Index: gnome-power-manager-2.30.0/src/gpm-manager.c
-===================================================================
---- gnome-power-manager-2.30.0.orig/src/gpm-manager.c
-+++ gnome-power-manager-2.30.0/src/gpm-manager.c
-@@ -716,6 +716,31 @@ gpm_manager_get_preferences_options (Gpm
++ <_summary>If an information message should be displayed when returning
from idle sleep.</_summary>
++ <_description>If an information message should be displayed when
returning from idle sleep.</_description>
++ </key>
+ <key name="info-history-graph-points" type="b">
+ <default>true</default>
+ <_summary>Whether we should show the history data points</_summary>
+diff --git a/src/gpm-common.h b/src/gpm-common.h
+index dabda1a..ab5e1b8 100644
+--- a/src/gpm-common.h
++++ b/src/gpm-common.h
+@@ -95,6 +95,7 @@ G_BEGIN_DECLS
+ #define GPM_SETTINGS_NOTIFY_SLEEP_FAILED_URI
"notify-sleep-failed-uri"
+ #define GPM_SETTINGS_NOTIFY_LOW_POWER_SYSTEM
"notify-low-power-system"
+ #define GPM_SETTINGS_NOTIFY_LOW_POWER_DEVICE
"notify-low-power-device"
++#define GPM_SETTINGS_NOTIFY_IDLE_SLEEP
"notify-idle-sleep"
+
+ /* thresholds */
+ #define GPM_SETTINGS_PERCENTAGE_LOW "percentage-low"
+diff --git a/src/gpm-manager.c b/src/gpm-manager.c
+index 9bb0591..3572c13 100644
+--- a/src/gpm-manager.c
++++ b/src/gpm-manager.c
+@@ -114,6 +114,7 @@ struct GpmManagerPrivate
+ GDBusConnection *bus_connection;
+ guint bus_owner_id;
+ guint bus_object_id;
++ gboolean idle_sleep;
+ };
+
+ typedef enum {
+@@ -788,6 +789,31 @@ gpm_manager_perform_policy (GpmManager *manager, const
gchar *policy_key, const
}
/**
@@ -64,10 +65,10 @@
+{
+ gboolean show_idle_sleep;
+
-+ /* only show this if specified in gconf */
-+ show_idle_sleep = gconf_client_get_bool (manager->priv->conf,
GPM_CONF_NOTIFY_IDLE_SLEEP, NULL);
++ /* only show this if specified in gsettings */
++ show_idle_sleep = g_settings_get_boolean (manager->priv->settings,
GPM_SETTINGS_NOTIFY_IDLE_SLEEP);
+
-+ /* only emit if in GConf */
++ /* only emit if in gsettings */
+ if (show_idle_sleep)
+ gpm_manager_notify (manager,
&manager->priv->notification_general,
+ _("System resumed from sleep"),
@@ -81,27 +82,55 @@
* gpm_manager_idle_do_sleep:
* @manager: This class instance
*
-@@ -751,6 +776,11 @@ gpm_manager_idle_do_sleep (GpmManager *m
- egg_warning ("cannot suspend or hibernate: %s",
error->message);
+@@ -811,6 +837,7 @@ gpm_manager_idle_do_sleep (GpmManager *manager)
+
+ } else if (policy == GPM_ACTION_POLICY_SUSPEND) {
+ g_debug ("suspending, reason: System idle");
++ manager->priv->idle_sleep = TRUE;
+ ret = gpm_control_suspend (manager->priv->control, &error);
+ if (!ret) {
+ g_warning ("cannot suspend (error: %s), so trying
hibernate", error->message);
+@@ -820,11 +847,13 @@ gpm_manager_idle_do_sleep (GpmManager *manager)
+ if (!ret) {
+ g_warning ("cannot suspend or hibernate: %s",
error->message);
g_error_free (error);
++ manager->priv->idle_sleep = FALSE;
}
-+ } else {
-+ /* we're back from suspend without an error, tell the
-+ * user that we've actually suspended due to system
-+ * idleness */
-+ gpm_manager_notify_idle_sleep (manager);
}
} else if (policy == GPM_ACTION_POLICY_HIBERNATE) {
-@@ -765,6 +795,11 @@ gpm_manager_idle_do_sleep (GpmManager *m
- egg_warning ("cannot suspend or hibernate: %s",
error->message);
+ g_debug ("hibernating, reason: System idle");
++ manager->priv->idle_sleep = TRUE;
+ ret = gpm_control_hibernate (manager->priv->control, &error);
+ if (!ret) {
+ g_warning ("cannot hibernate (error: %s), so trying
suspend", error->message);
+@@ -834,6 +863,7 @@ gpm_manager_idle_do_sleep (GpmManager *manager)
+ if (!ret) {
+ g_warning ("cannot suspend or hibernate: %s",
error->message);
g_error_free (error);
++ manager->priv->idle_sleep = FALSE;
}
-+ } else {
-+ /* we're back from hibernate without an error, tell the
-+ * user that we've actually suspended due to system
-+ * idleness */
-+ gpm_manager_notify_idle_sleep (manager);
}
}
- g_free (action);
+@@ -2003,6 +2033,12 @@ gpm_manager_reset_just_resumed_cb (gpointer user_data)
+ gpm_manager_notify_close (manager,
manager->priv->notification_fully_charged);
+
+ manager->priv->just_resumed = FALSE;
++
++ if (manager->priv->idle_sleep) {
++ gpm_manager_notify_idle_sleep (manager);
++ manager->priv->idle_sleep = FALSE;
++ }
++
+ return FALSE;
+ }
+
+@@ -2266,6 +2302,8 @@ gpm_manager_init (GpmManager *manager)
+ /* init to not just_resumed */
+ manager->priv->just_resumed = FALSE;
+
++ manager->priv->idle_sleep = FALSE;
++
+ /* don't apply policy when not active, so listen to ConsoleKit */
+ manager->priv->console = egg_console_kit_new ();
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
