r31156 - in /desktop/unstable/gnome-power-manager/debian: changelog control control.in patches/09-query-gnome-screensaver-settings-with-GSettings.patch patches/series rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Wed Nov 2 19:48:05 UTC 2011


Author: biebl
Date: Wed Nov  2 19:48:04 2011
New Revision: 31156

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31156
Log:
* debian/patches/09-query-gnome-screensaver-settings-with-GSettings.patch:
  - Query gnome-screensaver settings with GSettings so the screen is
    correctly locked on lid-close. Closes: #647358
* debian/control.in:
  - Add Build-Depends on dh-autoreconf.
  - Drop Build-Depends on libgconf2-dev.
  - Add Depends on gnome-screensaver (>= 3.0) for the
    org.gnome.desktop.screensaver gsettings schema file.
* debian/rules:
  - Use autoreconf.mk to update the build system.

Added:
    desktop/unstable/gnome-power-manager/debian/patches/09-query-gnome-screensaver-settings-with-GSettings.patch
Modified:
    desktop/unstable/gnome-power-manager/debian/changelog
    desktop/unstable/gnome-power-manager/debian/control
    desktop/unstable/gnome-power-manager/debian/control.in
    desktop/unstable/gnome-power-manager/debian/patches/series
    desktop/unstable/gnome-power-manager/debian/rules

Modified: desktop/unstable/gnome-power-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/changelog?rev=31156&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/changelog [utf-8] Wed Nov  2 19:48:04 2011
@@ -1,3 +1,18 @@
+gnome-power-manager (3.0.2-3) UNRELEASED; urgency=low
+
+  * debian/patches/09-query-gnome-screensaver-settings-with-GSettings.patch:
+    - Query gnome-screensaver settings with GSettings so the screen is
+      correctly locked on lid-close. Closes: #647358
+  * debian/control.in:
+    - Add Build-Depends on dh-autoreconf.
+    - Drop Build-Depends on libgconf2-dev.
+    - Add Depends on gnome-screensaver (>= 3.0) for the
+      org.gnome.desktop.screensaver gsettings schema file.
+  * debian/rules:
+    - Use autoreconf.mk to update the build system.
+
+ -- Michael Biebl <biebl at debian.org>  Fri, 14 Oct 2011 13:38:33 +0200
+
 gnome-power-manager (3.0.2-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: desktop/unstable/gnome-power-manager/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/control?rev=31156&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/control [utf-8] Wed Nov  2 19:48:04 2011
@@ -12,13 +12,13 @@
                cdbs,
                gnome-pkg-tools (>= 0.10),
                autotools-dev,
+               dh-autoreconf,
                libdbus-glib-1-dev (>= 0.70),
                libxml-parser-perl,
                libxext-dev,
                libx11-dev,
                libglib2.0-dev (>= 2.25.9),
                libgtk-3-dev (>= 3.0.0),
-               libgconf2-dev (>= 2.31.1),
                libwnck-dev (>= 2.10.0),
                libcairo2-dev (>= 1.0.0),
                libupower-glib-dev (>= 0.9.1),
@@ -46,7 +46,8 @@
          dbus-x11,
          consolekit,
          upower,
-         gnome-settings-daemon (>= 3.0)
+         gnome-settings-daemon (>= 3.0),
+         gnome-screensaver (>= 3.0),
 Breaks: gnome-session (<< 2.28)
 Recommends: udisks
 Suggests: policykit-1

Modified: desktop/unstable/gnome-power-manager/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/control.in?rev=31156&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/control.in [utf-8] Wed Nov  2 19:48:04 2011
@@ -7,13 +7,13 @@
                cdbs,
                gnome-pkg-tools (>= 0.10),
                autotools-dev,
+               dh-autoreconf,
                libdbus-glib-1-dev (>= 0.70),
                libxml-parser-perl,
                libxext-dev,
                libx11-dev,
                libglib2.0-dev (>= 2.25.9),
                libgtk-3-dev (>= 3.0.0),
-               libgconf2-dev (>= 2.31.1),
                libwnck-dev (>= 2.10.0),
                libcairo2-dev (>= 1.0.0),
                libupower-glib-dev (>= 0.9.1),
@@ -41,7 +41,8 @@
          dbus-x11,
          consolekit,
          upower,
-         gnome-settings-daemon (>= 3.0)
+         gnome-settings-daemon (>= 3.0),
+         gnome-screensaver (>= 3.0),
 Breaks: gnome-session (<< 2.28)
 Recommends: udisks
 Suggests: policykit-1

Added: desktop/unstable/gnome-power-manager/debian/patches/09-query-gnome-screensaver-settings-with-GSettings.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/patches/09-query-gnome-screensaver-settings-with-GSettings.patch?rev=31156&op=file
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/patches/09-query-gnome-screensaver-settings-with-GSettings.patch (added)
+++ desktop/unstable/gnome-power-manager/debian/patches/09-query-gnome-screensaver-settings-with-GSettings.patch [utf-8] Wed Nov  2 19:48:04 2011
@@ -1,0 +1,145 @@
+commit c36c35b2ecd818e54de975fe81885eca05a1be98
+Author: Gary Ching-Pang Lin <chingpang at gmail.com>
+Date:   Wed Jun 8 17:01:33 2011 +0100
+
+    Query gnome-screensaver settings with GSettings
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=650464
+
+diff --git a/configure.ac b/configure.ac
+index 90bbe5f..3134ae4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -107,7 +107,6 @@ PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= 0.10)
+ 
+ PKG_CHECK_MODULES(GNOME, [
+  gtk+-3.0 >= 2.91.0
+- gconf-2.0 >= 2.31.1
+  gnome-keyring-1 >= 0.6.0
+  cairo >= 1.0.0])
+ 
+diff --git a/src/gpm-common.h b/src/gpm-common.h
+index b540c05..dabda1a 100644
+--- a/src/gpm-common.h
++++ b/src/gpm-common.h
+@@ -129,8 +129,8 @@ G_BEGIN_DECLS
+ #define GPM_SETTINGS_INFO_LAST_DEVICE			"info-last-device"
+ 
+ /* gnome-screensaver */
+-#define GS_CONF_DIR					"/apps/gnome-screensaver"
+-#define GS_CONF_PREF_LOCK_ENABLED			GS_CONF_DIR "/lock_enabled"
++#define GS_SETTINGS_SCHEMA				"org.gnome.desktop.screensaver"
++#define GS_SETTINGS_PREF_LOCK_ENABLED			"lock-enabled"
+ 
+ typedef enum {
+ 	GPM_ICON_POLICY_PRESENT,
+diff --git a/src/gpm-control.c b/src/gpm-control.c
+index 0fc864d..902db44 100644
+--- a/src/gpm-control.c
++++ b/src/gpm-control.c
+@@ -38,7 +38,6 @@
+ 
+ #include <glib/gi18n.h>
+ #include <gnome-keyring.h>
+-#include <gconf/gconf-client.h>
+ #include <libupower-glib/upower.h>
+ 
+ #include "egg-console-kit.h"
+@@ -51,8 +50,8 @@
+ 
+ struct GpmControlPrivate
+ {
+-	GConfClient		*conf;
+ 	GSettings		*settings;
++	GSettings		*settings_ss;
+ 	UpClient		*client;
+ };
+ 
+@@ -118,7 +117,7 @@ gpm_control_get_lock_policy (GpmControl *control, const gchar *policy)
+ 	   See bug #331164 for all the juicy details. :-) */
+ 	use_ss_setting = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_USE_SCREENSAVER);
+ 	if (use_ss_setting) {
+-		do_lock = gconf_client_get_bool (control->priv->conf, GS_CONF_PREF_LOCK_ENABLED, NULL);
++		do_lock = g_settings_get_boolean (control->priv->settings_ss, GS_SETTINGS_PREF_LOCK_ENABLED);
+ 		g_debug ("Using ScreenSaver settings (%i)", do_lock);
+ 	} else {
+ 		do_lock = g_settings_get_boolean (control->priv->settings, policy);
+@@ -256,8 +255,8 @@ gpm_control_finalize (GObject *object)
+ 	g_return_if_fail (GPM_IS_CONTROL (object));
+ 	control = GPM_CONTROL (object);
+ 
+-	g_object_unref (control->priv->conf);
+ 	g_object_unref (control->priv->settings);
++	g_object_unref (control->priv->settings_ss);
+ 	g_object_unref (control->priv->client);
+ 
+ 	g_return_if_fail (control->priv != NULL);
+@@ -306,7 +305,7 @@ gpm_control_init (GpmControl *control)
+ 
+ 	control->priv->client = up_client_new ();
+ 	control->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
+-	control->priv->conf = gconf_client_get_default ();
++	control->priv->settings_ss = g_settings_new (GS_SETTINGS_SCHEMA);
+ }
+ 
+ /**
+diff --git a/src/gpm-screensaver.c b/src/gpm-screensaver.c
+index 842ea7c..f41baed 100644
+--- a/src/gpm-screensaver.c
++++ b/src/gpm-screensaver.c
+@@ -25,7 +25,6 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
+-#include <gconf/gconf-client.h>
+ 
+ #include "gpm-screensaver.h"
+ #include "gpm-common.h"
+@@ -41,7 +40,7 @@ static void     gpm_screensaver_finalize   (GObject		*object);
+ struct GpmScreensaverPrivate
+ {
+ 	GDBusProxy		*proxy;
+-	GConfClient		*conf;
++	GSettings		*settings;
+ };
+ 
+ enum {
+@@ -63,7 +62,7 @@ gpm_screensaver_lock_enabled (GpmScreensaver *screensaver)
+ {
+ 	gboolean enabled;
+ 	g_return_val_if_fail (GPM_IS_SCREENSAVER (screensaver), FALSE);
+-	enabled = gconf_client_get_bool (screensaver->priv->conf, GS_CONF_PREF_LOCK_ENABLED, NULL);
++	enabled = g_settings_get_boolean (screensaver->priv->settings, GS_SETTINGS_PREF_LOCK_ENABLED);
+ 	return enabled;
+ }
+ 
+@@ -296,7 +295,7 @@ gpm_screensaver_init (GpmScreensaver *screensaver)
+ 		g_warning ("failed to setup screensaver proxy: %s", error->message);
+ 		g_error_free (error);
+ 	}
+-	screensaver->priv->conf = gconf_client_get_default ();
++	screensaver->priv->settings = g_settings_new (GS_SETTINGS_SCHEMA) ;
+ }
+ 
+ /**
+@@ -313,7 +312,7 @@ gpm_screensaver_finalize (GObject *object)
+ 	screensaver = GPM_SCREENSAVER (object);
+ 	screensaver->priv = GPM_SCREENSAVER_GET_PRIVATE (screensaver);
+ 
+-	g_object_unref (screensaver->priv->conf);
++	g_object_unref (screensaver->priv->settings);
+ 	g_object_unref (screensaver->priv->proxy);
+ 
+ 	G_OBJECT_CLASS (gpm_screensaver_parent_class)->finalize (object);
+diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c
+index e7eb21b..a444c2e 100644
+--- a/src/gpm-statistics.c
++++ b/src/gpm-statistics.c
+@@ -27,7 +27,6 @@
+ #include <glib/gi18n.h>
+ 
+ #include <gtk/gtk.h>
+-#include <gconf/gconf-client.h>
+ #include <libupower-glib/upower.h>
+ 
+ #include "gpm-array-float.h"

Modified: desktop/unstable/gnome-power-manager/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/patches/series?rev=31156&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/patches/series [utf-8] Wed Nov  2 19:48:04 2011
@@ -1,3 +1,4 @@
 02_autostart_init.patch
 06-bugreport-debian.patch
 08-desktop-bugreport-path.patch
+09-query-gnome-screensaver-settings-with-GSettings.patch

Modified: desktop/unstable/gnome-power-manager/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/rules?rev=31156&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/rules [utf-8] Wed Nov  2 19:48:04 2011
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk




More information about the pkg-gnome-commits mailing list