[Pkg-xfce-commits] r8449 - in /desktop/branches/experimental/xfce4-settings/debian: changelog control patches/02_upower_0.99.patch patches/series

Jackson Doak noskcaj-guest at moszumanska.debian.org
Thu Jun 5 09:43:40 UTC 2014


Author: noskcaj-guest
Date: Thu Jun  5 09:43:40 2014
New Revision: 8449

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8449
Log:
* Add 02_upower_0.99.patch to support the new upower
* debian/control: Bump build-depend on upower to 0.99

Added:
    desktop/branches/experimental/xfce4-settings/debian/patches/02_upower_0.99.patch
Modified:
    desktop/branches/experimental/xfce4-settings/debian/changelog
    desktop/branches/experimental/xfce4-settings/debian/control
    desktop/branches/experimental/xfce4-settings/debian/patches/series

Modified: desktop/branches/experimental/xfce4-settings/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-settings/debian/changelog?rev=8449&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-settings/debian/changelog	(original)
+++ desktop/branches/experimental/xfce4-settings/debian/changelog	Thu Jun  5 09:43:40 2014
@@ -1,10 +1,15 @@
 xfce4-settings (4.11.2-2) UNRELEASED; urgency=medium
 
+  [ Lionel Le Folgoc ]
   * debian/rules: do not set DH_VERBOSE=1, that's too verbose.
   * debian/control:
     - update my email address.
     - drop Conflicts/Replaces on xfce4-mcs-{manager,plugins}, they are long
       gone.
+
+  [ Jackson Doak ]
+  * Add 02_upower_0.99.patch to support the new upower
+  * debian/control: Bump build-depend on upower to 0.99
 
  -- Lionel Le Folgoc <lionel at lefolgoc.net>  Sun, 09 Mar 2014 14:39:35 +0100
 

Modified: desktop/branches/experimental/xfce4-settings/debian/control
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-settings/debian/control?rev=8449&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-settings/debian/control	(original)
+++ desktop/branches/experimental/xfce4-settings/debian/control	Thu Jun  5 09:43:40 2014
@@ -8,7 +8,7 @@
  libxfce4util-dev (>= 4.10.0), libxfce4ui-1-dev (>= 4.11.0),
  libexo-1-dev (>= 0.8.0), libxfconf-0-dev (>= 4.10.0), libwnck-dev,
  libxklavier-dev (>= 5.0), libnotify-dev, intltool (>= 0.31),
- libgarcon-1-0-dev (>= 0.2.0), libupower-glib-dev
+ libgarcon-1-0-dev (>= 0.2.0), libupower-glib-dev (>= 0.99)
 Build-Conflicts: libxfcegui4-dev (<< 4.7.0)
 Standards-Version: 3.9.5
 Homepage: http://www.xfce.org

Added: desktop/branches/experimental/xfce4-settings/debian/patches/02_upower_0.99.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-settings/debian/patches/02_upower_0.99.patch?rev=8449&op=file
==============================================================================
--- desktop/branches/experimental/xfce4-settings/debian/patches/02_upower_0.99.patch	(added)
+++ desktop/branches/experimental/xfce4-settings/debian/patches/02_upower_0.99.patch	Thu Jun  5 09:43:40 2014
@@ -0,0 +1,64 @@
+From 5247716c9105dc68a737757da5a2b260538945a9 Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel at gmail.com>
+Date: Wed, 28 May 2014 07:55:39 +0300
+Subject: [PATCH] Update for Upower 0.99
+
+Upower changed a singal handler.
+---
+ xfsettingsd/displays-upower.c | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/xfsettingsd/displays-upower.c b/xfsettingsd/displays-upower.c
+index bbb3028..e1fab38 100644
+--- a/xfsettingsd/displays-upower.c
++++ b/xfsettingsd/displays-upower.c
+@@ -34,9 +34,15 @@
+ 
+ 
+ static void             xfce_displays_upower_dispose                        (GObject                 *object);
++
++#if UP_CHECK_VERSION(0, 99, 0)
+ static void             xfce_displays_upower_property_changed               (UpClient                *client,
++                                                                             GParamSpec              *pspec,
+                                                                              XfceDisplaysUPower      *upower);
+-
++#else
++static void             xfce_displays_upower_property_changed               (UpClient                *client,
++                                                                             XfceDisplaysUPower      *upower);
++#endif
+ 
+ 
+ struct _XfceDisplaysUPowerClass
+@@ -95,10 +101,17 @@ xfce_displays_upower_init (XfceDisplaysUPower *upower)
+ {
+     upower->client = up_client_new ();
+     upower->lid_is_closed = up_client_get_lid_is_closed (upower->client);
++#if UP_CHECK_VERSION(0, 99, 0)
++    upower->handler = g_signal_connect (G_OBJECT (upower->client),
++                                        "notify",
++                                        G_CALLBACK (xfce_displays_upower_property_changed),
++                                        upower);
++#else
+     upower->handler = g_signal_connect (G_OBJECT (upower->client),
+                                         "changed",
+                                         G_CALLBACK (xfce_displays_upower_property_changed),
+                                         upower);
++#endif
+ }
+ 
+ 
+@@ -122,8 +135,14 @@ xfce_displays_upower_dispose (GObject *object)
+ 
+ 
+ static void
++#if UP_CHECK_VERSION(0, 99, 0)
+ xfce_displays_upower_property_changed (UpClient           *client,
++                                       GParamSpec         *pspec,
+                                        XfceDisplaysUPower *upower)
++#else
++xfce_displays_upower_property_changed (UpClient           *client,
++                                       XfceDisplaysUPower *upower)
++#endif
+ {
+     gboolean lid_is_closed;
+ 

Modified: desktop/branches/experimental/xfce4-settings/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-settings/debian/patches/series?rev=8449&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-settings/debian/patches/series	(original)
+++ desktop/branches/experimental/xfce4-settings/debian/patches/series	Thu Jun  5 09:43:40 2014
@@ -1 +1,2 @@
 01_use-tango-icon-theme.patch
+02_upower_0.99.patch




More information about the Pkg-xfce-commits mailing list