diffstat of debian/ for xfce4-systemload-plugin_1.1.1-4 xfce4-systemload-plugin_1.1.2-0ubuntu2 changelog | 21 ++++++++++++++++++ control | 3 +- patches/git_upower_0.99.patch | 49 ------------------------------------------ patches/series | 1 4 files changed, 23 insertions(+), 51 deletions(-) diff -Nru xfce4-systemload-plugin-1.1.1/debian/changelog xfce4-systemload-plugin-1.1.2/debian/changelog --- xfce4-systemload-plugin-1.1.1/debian/changelog 2014-10-15 19:47:29.000000000 +0000 +++ xfce4-systemload-plugin-1.1.2/debian/changelog 2015-03-12 02:56:02.000000000 +0000 @@ -1,3 +1,24 @@ +xfce4-systemload-plugin (1:1.1.2-0ubuntu2) vivid; urgency=medium + + * No-change rebuild for libxfce4util7 + + -- Sean Davis Wed, 11 Mar 2015 22:55:14 -0400 + +xfce4-systemload-plugin (1:1.1.2-0ubuntu1) vivid; urgency=medium + + * New upstream release. + * Drop git_upower_0.99.patch, fixed upstream + + -- Jackson Doak Sat, 22 Nov 2014 07:11:32 +1100 + +xfce4-systemload-plugin (1:1.1.1-4ubuntu1) vivid; urgency=medium + + * Merge with Debian unstable. Remaining Ubuntu changes: + - Add epoch. + * Rebuild against upower 0.99 (LP: #1330037) + + -- Martin Pitt Thu, 30 Oct 2014 13:11:52 +0100 + xfce4-systemload-plugin (1.1.1-4) unstable; urgency=medium * debian/control: diff -Nru xfce4-systemload-plugin-1.1.1/debian/control xfce4-systemload-plugin-1.1.2/debian/control --- xfce4-systemload-plugin-1.1.1/debian/control 2014-10-15 19:40:19.000000000 +0000 +++ xfce4-systemload-plugin-1.1.2/debian/control 2014-11-24 17:09:58.000000000 +0000 @@ -1,7 +1,8 @@ Source: xfce4-systemload-plugin Section: xfce Priority: optional -Maintainer: Debian Xfce Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez , Lionel Le Folgoc Build-Depends: autotools-dev, debhelper (>= 9), dpkg-dev (>= 1.16.1), diff -Nru xfce4-systemload-plugin-1.1.1/debian/patches/git_upower_0.99.patch xfce4-systemload-plugin-1.1.2/debian/patches/git_upower_0.99.patch --- xfce4-systemload-plugin-1.1.1/debian/patches/git_upower_0.99.patch 2014-07-15 21:09:54.000000000 +0000 +++ xfce4-systemload-plugin-1.1.2/debian/patches/git_upower_0.99.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -From abdcb383f380bf7a048cf512fa079581321b64fa Mon Sep 17 00:00:00 2001 -From: Eric Koegel -Date: Fri, 30 May 2014 19:12:02 +0300 -Subject: 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. - -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); - --- -cgit v0.10.1 diff -Nru xfce4-systemload-plugin-1.1.1/debian/patches/series xfce4-systemload-plugin-1.1.2/debian/patches/series --- xfce4-systemload-plugin-1.1.1/debian/patches/series 2014-07-15 21:09:54.000000000 +0000 +++ xfce4-systemload-plugin-1.1.2/debian/patches/series 2014-11-24 17:09:58.000000000 +0000 @@ -1 +0,0 @@ -git_upower_0.99.patch