Merge lp:~noskcaj/ubuntu/utopic/xfce4-systemload-plugin/merge into lp:ubuntu/utopic/xfce4-systemload-plugin

[Jackson Doak]

Merge from debian, add support for upower 0.99

[Martin Pitt (pitti)]

Uploaded, thanks!

review: Approve

=== removed file '.pc/applied-patches'
=== modified file 'debian/changelog'
--- debian/changelog	2013-10-15 22:05:32 +0000
+++ debian/changelog	2014-06-01 23:52:04 +0000
@@ -1,3 +1,25 @@
+xfce4-systemload-plugin (1:1.1.1-2ubuntu1) utopic; urgency=medium
+
+  * Resync with Debian testing.
+  * Readd the epoch…
+  * Add 01_upower-0.99.patch, prepares us for the upower 0.99 transition
+
+ -- Jackson Doak <[e-mail]>  Mon, 02 Jun 2014 09:40:43 +1000
+
+xfce4-systemload-plugin (1.1.1-2) unstable; urgency=low
+
+  [ Lionel Le Folgoc ]
+  * debian/control:
+    - build-dep on libupower-glib-dev and recommend upower to enable the
+      power saving feature.
+    - add myself to Uploaders.
+
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - enable all hardening flags.
+
+ -- Lionel Le Folgoc <[e-mail]>  Wed, 22 May 2013 08:42:32 +0200
+
 xfce4-systemload-plugin (1:1.1.1-1ubuntu2) saucy; urgency=low
 
   * Use dh_autotools-dev to update config.{sub,guess} for AArch64.

=== modified file 'debian/control'
--- debian/control	2012-05-17 23:18:47 +0000
+++ debian/control	2014-06-01 23:52:04 +0000
@@ -3,10 +3,11 @@
 Priority: optional
 Maintainer: Xubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian Xfce Maintainers <[e-mail]>
-Uploaders: Yves-Alexis Perez <[e-mail]>
+Uploaders: Yves-Alexis Perez <[e-mail]>,
+ Lionel Le Folgoc <[e-mail]>
 Build-Depends: autotools-dev, debhelper (>= 9), dpkg-dev (>= 1.16.1),
  xfce4-panel-dev (>= 4.8.0), libxml2-dev, libxml-parser-perl, libxfce4ui-1-dev,
- intltool
+ intltool, libupower-glib-dev
 Standards-Version: 3.9.3
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-systemload-plugin/
@@ -16,6 +17,7 @@
 Section: xfce
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: upower
 Description: system load monitor plugin for the Xfce4 panel
  This plugins displays the current CPU load, the memory in use, the swap space
  and the system uptime in the Xfce4 panel.

=== added file 'debian/patches/01_upower-0.99.patch'
--- debian/patches/01_upower-0.99.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01_upower-0.99.patch	2014-06-01 23:52:04 +0000
@@ -0,0 +1,52 @@
+From 1bc7f32ea8244575124420bd34d52913831a1ae1 Mon Sep 17 00:00:00 2001
+From: Eric Koegel <[e-mail]>
+Date: Fri, 30 May 2014 19:12:02 +0300
+Subject: [PATCH] Update for Upower 0.99
+
+Upower 0.99 changed from the "changed" signal to "notify" as well as
+the function signature. This patch adds that while still supporting
+the previous versions of upower.
+---
+ panel-plugin/systemload.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c
+index c0572a3..30636e9 100644
+--- a/panel-plugin/systemload.c
++++ b/panel-plugin/systemload.c
+@@ -624,11 +624,15 @@ monitor_set_orientation (XfcePanelPlugin *plugin, GtkOrientation orientation,
+ 
+ #ifdef HAVE_UPOWER_GLIB
+ static void
++#if UP_CHECK_VERSION(0, 99, 0)
++upower_changed_cb(UpClient *client, GParamSpec *pspec, t_global_monitor *global)
++#else /* UP_CHECK_VERSION < 0.99 */
+ upower_changed_cb(UpClient *client, t_global_monitor *global)
++#endif /* UP_CHECK_VERSION */
+ {
+     setup_timer(global);
+ }
+-#endif
++#endif /* HAVE_UPOWER_GLIB */
+ 
+ static void
+ entry_changed_cb(GtkEntry *entry, t_global_monitor *global)
+@@ -925,10 +929,15 @@ systemload_construct (XfcePanelPlugin *plugin)
+ 
+ #ifdef HAVE_UPOWER_GLIB
+     if (global->upower) {
++#if UP_CHECK_VERSION(0, 99, 0)
++        g_signal_connect (global->upower, "notify",
++                          G_CALLBACK(upower_changed_cb), global);
++#else /* UP_CHECK_VERSION < 0.99 */
+         g_signal_connect (global->upower, "changed",
+                           G_CALLBACK(upower_changed_cb), global);
++#endif /* UP_CHECK_VERSION */
+     }
+-#endif
++#endif /* HAVE_UPOWER_GLIB */
+     
+     g_signal_connect (plugin, "free-data", G_CALLBACK (monitor_free), global);
+ 
+-- 
+1.9.3

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2014-06-01 23:52:04 +0000
@@ -0,0 +1,1 @@
+01_upower-0.99.patch

=== modified file 'debian/rules'
--- debian/rules	2013-10-15 22:05:32 +0000
+++ debian/rules	2014-06-01 23:52:04 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
-export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
 		dh $@ --parallel --with autotools_dev