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

Sun Apr 3 12:49:09 UTC 2011

Author: mrpouit-guest
Date: 2011-04-03 12:49:02 +0000 (Sun, 03 Apr 2011)
New Revision: 5324

Added:
   goodies/trunk/xfce4-timer-plugin/debian/patches/02_Fix-segfault-when-creating-plugin-in-4.8-panel.patch
Modified:
   goodies/trunk/xfce4-timer-plugin/
   goodies/trunk/xfce4-timer-plugin/debian/changelog
   goodies/trunk/xfce4-timer-plugin/debian/control
   goodies/trunk/xfce4-timer-plugin/debian/patches/01_improve-timer-stop.patch
   goodies/trunk/xfce4-timer-plugin/debian/patches/series
   goodies/trunk/xfce4-timer-plugin/debian/rules
Log:
merge experimental changes into trunk


Property changes on: goodies/trunk/xfce4-timer-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-timer-plugin:4960-5323

Modified: goodies/trunk/xfce4-timer-plugin/debian/changelog
===================================================================

--- goodies/trunk/xfce4-timer-plugin/debian/changelog	2011-04-03 12:46:47 UTC (rev 5323)
+++ goodies/trunk/xfce4-timer-plugin/debian/changelog	2011-04-03 12:49:02 UTC (rev 5324)
@@ -1,6 +1,21 @@
 xfce4-timer-plugin (0.6.1-4) UNRELEASED; urgency=low
 
   * debian/control: change Section to 'xfce'.
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -O1, -z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
+    - add .pc dir to po/POTFILES.skip, and remove it at clean time.
+  * debian/patches:
+    - 01_improve-timer-stop.patch: drop the POTFILES.skip part, done in
+      debian/rules now.
+    - 02_Fix-segfault-when-creating-plugin-in-4.8-panel.patch: make the
+      plugin work with Xfce 4.8.
+    - series: refreshed.
+  * debian/control:
+    - update standards version to 3.9.1.
+    - add build-dep on hardening-includes.
+    - bump debhelper b-dep to (>= 7.0.50~) for the overrides.
 
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 11 Apr 2010 20:05:11 +0200
 

Modified: goodies/trunk/xfce4-timer-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-timer-plugin/debian/control	2011-04-03 12:46:47 UTC (rev 5323)
+++ goodies/trunk/xfce4-timer-plugin/debian/control	2011-04-03 12:49:02 UTC (rev 5324)
@@ -4,10 +4,10 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>,
  Simon Huggins <huggie at earth.li>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7), cdbs, libxml-parser-perl,
+Build-Depends: debhelper (>= 7.0.50~), cdbs, libxml-parser-perl,
  xfce4-panel-dev (>= 4.4.0), intltool, pkg-config, libglib2.0-dev,
- libgtk2.0-dev, libxfcegui4-dev, autotools-dev
-Standards-Version: 3.8.3
+ libgtk2.0-dev, libxfcegui4-dev, autotools-dev, hardening-includes
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-timer-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-timer-plugin/
 

Modified: goodies/trunk/xfce4-timer-plugin/debian/patches/01_improve-timer-stop.patch
===================================================================
--- goodies/trunk/xfce4-timer-plugin/debian/patches/01_improve-timer-stop.patch	2011-04-03 12:46:47 UTC (rev 5323)
+++ goodies/trunk/xfce4-timer-plugin/debian/patches/01_improve-timer-stop.patch	2011-04-03 12:49:02 UTC (rev 5324)
@@ -19,7 +19,3 @@
                                      GTK_MESSAGE_WARNING,
                                      GTK_BUTTONS_CLOSE,
                                      _("Beeep! :) \nTime is up!"));
---- /dev/null
-+++ xfce4-timer-plugin-0.6.1/po/POTFILES.skip
-@@ -0,0 +1 @@
-+.pc/01_improve-timer-stop.patch/src/xfcetimer.c

Copied: goodies/trunk/xfce4-timer-plugin/debian/patches/02_Fix-segfault-when-creating-plugin-in-4.8-panel.patch (from rev 5323, goodies/branches/experimental/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	                        (rev 0)
+++ goodies/trunk/xfce4-timer-plugin/debian/patches/02_Fix-segfault-when-creating-plugin-in-4.8-panel.patch	2011-04-03 12:49:02 UTC (rev 5324)
@@ -0,0 +1,43 @@
+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-04-03 12:46:47 UTC (rev 5323)
+++ goodies/trunk/xfce4-timer-plugin/debian/patches/series	2011-04-03 12:49:02 UTC (rev 5324)
@@ -1 +1,2 @@
 01_improve-timer-stop.patch
+02_Fix-segfault-when-creating-plugin-in-4.8-panel.patch

Modified: goodies/trunk/xfce4-timer-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-timer-plugin/debian/rules	2011-04-03 12:46:47 UTC (rev 5323)
+++ goodies/trunk/xfce4-timer-plugin/debian/rules	2011-04-03 12:49:02 UTC (rev 5324)
@@ -1,5 +1,20 @@
 #!/usr/bin/make -f
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+include /usr/share/hardening-includes/hardening.make
 
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
+
+export CFLAGS LDFLAGS
+
+override_dh_auto_configure:
+	find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
+	dh_auto_configure
+
+override_dh_auto_clean:
+	rm -f po/POTFILES.skip
+	dh_auto_clean
+
 %:
 	dh $@


