[Pkg-xfce-commits] r5813 - in goodies/trunk/xfce4-timer-plugin/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-06-19 10:06:58 +0000 (Sun, 19 Jun 2011)
New Revision: 5813

Removed:
   goodies/trunk/xfce4-timer-plugin/debian/patches/02_Fix-segfault-when-creating-plugin-in-4.8-panel.patch
Modified:
   goodies/trunk/xfce4-timer-plugin/debian/changelog
   goodies/trunk/xfce4-timer-plugin/debian/patches/series
Log:
* New upstream release.
* debian/patches:
  - 02_Fix-segfault-when-creating-plugin-in-4.8-panel.patch: dropped,
    included upstream.
  - series: refreshed.

Modified: goodies/trunk/xfce4-timer-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-timer-plugin/debian/changelog	2011-06-19 09:43:25 UTC (rev 5812)
+++ goodies/trunk/xfce4-timer-plugin/debian/changelog	2011-06-19 10:06:58 UTC (rev 5813)
@@ -1,3 +1,13 @@
+xfce4-timer-plugin (0.6.2-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/patches:
+    - 02_Fix-segfault-when-creating-plugin-in-4.8-panel.patch: dropped,
+      included upstream.
+    - series: refreshed.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 19 Jun 2011 12:03:46 +0200
+
 xfce4-timer-plugin (0.6.1-4) unstable; urgency=low
 
   [ Lionel Le Folgoc ]

Deleted: goodies/trunk/xfce4-timer-plugin/debian/patches/02_Fix-segfault-when-creating-plugin-in-4.8-panel.patch
===================================================================
--- goodies/trunk/xfce4-timer-plugin/debian/patches/02_Fix-segfault-when-creating-plugin-in-4.8-panel.patch	2011-06-19 09:43:25 UTC (rev 5812)
+++ goodies/trunk/xfce4-timer-plugin/debian/patches/02_Fix-segfault-when-creating-plugin-in-4.8-panel.patch	2011-06-19 10:06:58 UTC (rev 5813)
@@ -1,43 +0,0 @@
-From 03ff202f818fe3f075a6c864ab688b57b1bb1cb4 Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick at xfce.org>
-Date: Thu, 27 Jan 2011 22:18:45 +0100
-Subject: Fix segfault when creating plugin in 4.8 panel.
-
-Used invalid function type to construct the plugin.
----
- src/xfcetimer.c |    5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/xfcetimer.c b/src/xfcetimer.c
-index c27d37a..de7bd2b 100644
---- a/src/xfcetimer.c
-+++ b/src/xfcetimer.c
-@@ -42,7 +42,7 @@
- 
- #include "xfcetimer.h"
- 
--static gboolean create_plugin_control (XfcePanelPlugin *plugin);
-+static void create_plugin_control (XfcePanelPlugin *plugin);
- XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(create_plugin_control);
- 
- void make_menu(plugin_data *pd);
-@@ -1366,7 +1366,7 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
-  *
-  * Returns %TRUE on success, %FALSE on failure.
-  **/
--static gboolean
-+static void
- create_plugin_control (XfcePanelPlugin *plugin)
- {
- 
-@@ -1461,7 +1461,6 @@ create_plugin_control (XfcePanelPlugin *plugin)
-   xfce_panel_plugin_menu_show_configure (plugin);
-   g_signal_connect (plugin, "configure-plugin",
-                       G_CALLBACK (plugin_create_options), pd);
--  return(TRUE);
- }
- 
- 
--- 
-1.7.2.3
-

Modified: goodies/trunk/xfce4-timer-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-timer-plugin/debian/patches/series	2011-06-19 09:43:25 UTC (rev 5812)
+++ goodies/trunk/xfce4-timer-plugin/debian/patches/series	2011-06-19 10:06:58 UTC (rev 5813)
@@ -1,2 +1 @@
 01_improve-timer-stop.patch
-02_Fix-segfault-when-creating-plugin-in-4.8-panel.patch