[Pkg-xfce-commits] r1536 - in desktop/trunk/xfce-mcs-manager/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-01-13 22:29:08 +0000 (Sun, 13 Jan 2008)
New Revision: 1536

Added:
   desktop/trunk/xfce-mcs-manager/debian/patches/
   desktop/trunk/xfce-mcs-manager/debian/patches/01_ignore-usr1-signal-at-reload.patch
   desktop/trunk/xfce-mcs-manager/debian/patches/series
Modified:
   desktop/trunk/xfce-mcs-manager/debian/changelog
   desktop/trunk/xfce-mcs-manager/debian/control
   desktop/trunk/xfce-mcs-manager/debian/rules
Log:
ignore usr1 signal when reloading


Modified: desktop/trunk/xfce-mcs-manager/debian/changelog
===================================================================
--- desktop/trunk/xfce-mcs-manager/debian/changelog	2008-01-11 21:53:56 UTC (rev 1535)
+++ desktop/trunk/xfce-mcs-manager/debian/changelog	2008-01-13 22:29:08 UTC (rev 1536)
@@ -1,9 +1,15 @@
 xfce-mcs-manager (4.4.2-2) UNRELEASED; urgency=low
 
-  * debian/rules: don't patch at build.
-  * debian/control: remove build-dep on dpatch.
+  * debian/control: 
+    - remove build-dep on dpatch, add one on quilt.
+    - add my debian.org address to uploaders field.
+    - update standards version to 3.7.3 (no changes needed).
+  * debian/rules: include quilt patch rules.
+  * debian/patches:
+    - 01_ignore-usr1-signal-at-reload: ignore USR1 (reload) signal during
+      reload.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Wed, 19 Dec 2007 08:38:53 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 13 Jan 2008 22:14:35 +0100
 
 xfce-mcs-manager (4.4.2-1) unstable; urgency=low
 

Modified: desktop/trunk/xfce-mcs-manager/debian/control
===================================================================
--- desktop/trunk/xfce-mcs-manager/debian/control	2008-01-11 21:53:56 UTC (rev 1535)
+++ desktop/trunk/xfce-mcs-manager/debian/control	2008-01-13 22:29:08 UTC (rev 1536)
@@ -2,9 +2,9 @@
 Section: x11
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at corsac.net>
-Build-Depends: debhelper (>= 4.1.25), libgtk2.0-dev (>= 2.10.1), libxfce4mcs-dev (>= 4.4.2), libxfcegui4-dev (>= 4.4.2), libxft-dev, chrpath
-Standards-Version: 3.7.2
+Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
+Build-Depends: debhelper (>= 4.1.25), libgtk2.0-dev (>= 2.10.1), libxfce4mcs-dev (>= 4.4.2), libxfcegui4-dev (>= 4.4.2), libxft-dev, chrpath, quilt
+Standards-Version: 3.7.3
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce-mcs-manager/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce-mcs-manager/

Added: desktop/trunk/xfce-mcs-manager/debian/patches/01_ignore-usr1-signal-at-reload.patch
===================================================================
--- desktop/trunk/xfce-mcs-manager/debian/patches/01_ignore-usr1-signal-at-reload.patch	                        (rev 0)
+++ desktop/trunk/xfce-mcs-manager/debian/patches/01_ignore-usr1-signal-at-reload.patch	2008-01-13 22:29:08 UTC (rev 1536)
@@ -0,0 +1,26 @@
+--- trouc/xfce-mcs-manager/xfce-mcs-manager.orig	2007-11-17 20:31:18.000000000 +0100
++++ trouc/xfce-mcs-manager/xfce-mcs-manager.c	2008-01-13 22:43:18.000000000 +0100
+@@ -336,6 +336,9 @@
+ {
+     guint32 sigstate = 0;
+     gsize bread = 0;
++#ifdef HAVE_SIGACTION
++    struct sigaction act;
++#endif
+     
+     if (G_IO_ERROR_NONE == g_io_channel_read (source, (gchar *)&sigstate,
+                                               sizeof (sigstate), &bread)
+@@ -345,6 +348,13 @@
+         {
+             case RESTART:
+                 /* unload all plugins and destroy the manager */
++				/* ignore USR1 plugin until the end… */
++#ifdef HAVE_SIGACTION
++				    act.sa_handler = SIG_IGN;
++				    sigaction (SIGUSR1, &act, NULL);
++#else /* !HAVE_SIGACTION */
++				    signal (SIGUSR1, SIG_IGN);
++#endif
+                 unload_plugins ();
+                 mcs_manager_destroy (manager);
+ 

Added: desktop/trunk/xfce-mcs-manager/debian/patches/series
===================================================================
--- desktop/trunk/xfce-mcs-manager/debian/patches/series	                        (rev 0)
+++ desktop/trunk/xfce-mcs-manager/debian/patches/series	2008-01-13 22:29:08 UTC (rev 1536)
@@ -0,0 +1 @@
+01_ignore-usr1-signal-at-reload.patch

Modified: desktop/trunk/xfce-mcs-manager/debian/rules
===================================================================
--- desktop/trunk/xfce-mcs-manager/debian/rules	2008-01-11 21:53:56 UTC (rev 1535)
+++ desktop/trunk/xfce-mcs-manager/debian/rules	2008-01-13 22:29:08 UTC (rev 1536)
@@ -11,7 +11,9 @@
 	CFLAGS += -O2
 endif
 
-config.status: configure
+include /usr/share/quilt/quilt.make
+
+config.status: patch configure
 	
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --disable-rpath --enable-final
@@ -24,7 +26,7 @@
 	$(MAKE)
 	touch build-stamp
 	
-clean:
+clean: unpatch
 
 	dh_testdir
 	dh_testroot