[Pkg-xfce-commits] r297 - in desktop/trunk: libxfce4mcs/debian xfcalendar/debian xfce-mcs-plugins/debian xfce4-iconbox/debian xfce4-mixer/debian xfce4-panel/debian xfce4-session/debian xfce4-utils/debian xfdesktop4/debian xffm4/debian xfprint4/debian xfwm4/debian

Yves-Alexis Perez corsac-guest at costa.debian.org
Sun Nov 13 13:19:40 UTC 2005


Author: corsac-guest
Date: 2005-11-13 13:19:39 +0000 (Sun, 13 Nov 2005)
New Revision: 297

Modified:
   desktop/trunk/libxfce4mcs/debian/changelog
   desktop/trunk/libxfce4mcs/debian/control
   desktop/trunk/xfcalendar/debian/postinst
   desktop/trunk/xfcalendar/debian/prerm
   desktop/trunk/xfce-mcs-plugins/debian/postinst
   desktop/trunk/xfce-mcs-plugins/debian/prerm
   desktop/trunk/xfce4-iconbox/debian/postinst
   desktop/trunk/xfce4-iconbox/debian/prerm
   desktop/trunk/xfce4-mixer/debian/postinst
   desktop/trunk/xfce4-mixer/debian/prerm
   desktop/trunk/xfce4-panel/debian/xfce4-panel.postinst
   desktop/trunk/xfce4-panel/debian/xfce4-panel.prerm
   desktop/trunk/xfce4-session/debian/postinst
   desktop/trunk/xfce4-session/debian/prerm
   desktop/trunk/xfce4-utils/debian/postinst
   desktop/trunk/xfce4-utils/debian/prerm
   desktop/trunk/xfdesktop4/debian/postinst
   desktop/trunk/xfdesktop4/debian/prerm
   desktop/trunk/xffm4/debian/postinst
   desktop/trunk/xffm4/debian/prerm
   desktop/trunk/xfprint4/debian/postinst
   desktop/trunk/xfprint4/debian/prerm
   desktop/trunk/xfwm4/debian/changelog
   desktop/trunk/xfwm4/debian/postinst
   desktop/trunk/xfwm4/debian/prerm
Log:
Corrected postinst/prerm scripts so install doesnt crash if xfce-mcs-manager isn't running. Added -f option to pkill in prerm scripts



Modified: desktop/trunk/libxfce4mcs/debian/changelog
===================================================================
--- desktop/trunk/libxfce4mcs/debian/changelog	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/libxfce4mcs/debian/changelog	2005-11-13 13:19:39 UTC (rev 297)
@@ -1,4 +1,4 @@
-libxfce4mcs (4.2.3-1) unstable; urgency=low
+libxfce4mcs (4.2.3.1-1) unstable; urgency=low
   
   * (Yves-Alexis Perez)
     - New Upstream Release

Modified: desktop/trunk/libxfce4mcs/debian/control
===================================================================
--- desktop/trunk/libxfce4mcs/debian/control	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/libxfce4mcs/debian/control	2005-11-13 13:19:39 UTC (rev 297)
@@ -3,7 +3,7 @@
 Section: x11
 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.0.0), xlibs-static-dev, libglib2.0-dev, libxfce4util-dev (>= 4.2.3-1), libxt-dev
+Build-Depends: debhelper (>= 4.0.0), xlibs-static-dev, libglib2.0-dev, libxfce4util-dev (>= 4.2.3.1-1), libxt-dev
 Standards-Version: 3.6.2
 
 Package: libxfce4mcs-manager-2

Modified: desktop/trunk/xfcalendar/debian/postinst
===================================================================
--- desktop/trunk/xfcalendar/debian/postinst	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfcalendar/debian/postinst	2005-11-13 13:19:39 UTC (rev 297)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "configure" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 -f xfce-mcs-manager
+	pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xfcalendar/debian/prerm
===================================================================
--- desktop/trunk/xfcalendar/debian/prerm	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfcalendar/debian/prerm	2005-11-13 13:19:39 UTC (rev 297)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "remove" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 xfce-mcs-manager
+	pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xfce-mcs-plugins/debian/postinst
===================================================================
--- desktop/trunk/xfce-mcs-plugins/debian/postinst	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfce-mcs-plugins/debian/postinst	2005-11-13 13:19:39 UTC (rev 297)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "configure" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 -f xfce-mcs-manager
+	pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xfce-mcs-plugins/debian/prerm
===================================================================
--- desktop/trunk/xfce-mcs-plugins/debian/prerm	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfce-mcs-plugins/debian/prerm	2005-11-13 13:19:39 UTC (rev 297)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "remove" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 xfce-mcs-manager
+	pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xfce4-iconbox/debian/postinst
===================================================================
--- desktop/trunk/xfce4-iconbox/debian/postinst	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfce4-iconbox/debian/postinst	2005-11-13 13:19:39 UTC (rev 297)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "configure" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 -f xfce-mcs-manager
+	pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xfce4-iconbox/debian/prerm
===================================================================
--- desktop/trunk/xfce4-iconbox/debian/prerm	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfce4-iconbox/debian/prerm	2005-11-13 13:19:39 UTC (rev 297)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "remove" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 xfce-mcs-manager
+	pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xfce4-mixer/debian/postinst
===================================================================
--- desktop/trunk/xfce4-mixer/debian/postinst	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfce4-mixer/debian/postinst	2005-11-13 13:19:39 UTC (rev 297)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "configure" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 -f xfce-mcs-manager
+	pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xfce4-mixer/debian/prerm
===================================================================
--- desktop/trunk/xfce4-mixer/debian/prerm	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfce4-mixer/debian/prerm	2005-11-13 13:19:39 UTC (rev 297)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "remove" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 xfce-mcs-manager
+	pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xfce4-panel/debian/xfce4-panel.postinst
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel.postinst	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfce4-panel/debian/xfce4-panel.postinst	2005-11-13 13:19:39 UTC (rev 297)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "configure" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 -f xfce-mcs-manager
+	pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xfce4-panel/debian/xfce4-panel.prerm
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel.prerm	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfce4-panel/debian/xfce4-panel.prerm	2005-11-13 13:19:39 UTC (rev 297)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "remove" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 xfce-mcs-manager
+	pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xfce4-session/debian/postinst
===================================================================
--- desktop/trunk/xfce4-session/debian/postinst	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfce4-session/debian/postinst	2005-11-13 13:19:39 UTC (rev 297)
@@ -7,7 +7,7 @@
     x-session-manager.1.gz /usr/share/man/man1/xfce4-session.1.gz 
 
   # Get xfce-mcs-manager to reinit
-  pkill -USR1 -f xfce-mcs-manager
+  pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xfce4-session/debian/prerm
===================================================================
--- desktop/trunk/xfce4-session/debian/prerm	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfce4-session/debian/prerm	2005-11-13 13:19:39 UTC (rev 297)
@@ -6,7 +6,7 @@
 
 if [ "$1" = "remove" ]; then
   # Get xfce-mcs-manager to reinit
-  pkill -USR1 xfce-mcs-manager
+  pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xfce4-utils/debian/postinst
===================================================================
--- desktop/trunk/xfce4-utils/debian/postinst	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfce4-utils/debian/postinst	2005-11-13 13:19:39 UTC (rev 297)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "configure" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 -f xfce-mcs-manager
+	pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xfce4-utils/debian/prerm
===================================================================
--- desktop/trunk/xfce4-utils/debian/prerm	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfce4-utils/debian/prerm	2005-11-13 13:19:39 UTC (rev 297)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "remove" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 xfce-mcs-manager
+	pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xfdesktop4/debian/postinst
===================================================================
--- desktop/trunk/xfdesktop4/debian/postinst	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfdesktop4/debian/postinst	2005-11-13 13:19:39 UTC (rev 297)
@@ -11,7 +11,7 @@
 	fi
 
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 -f xfce-mcs-manager
+	pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xfdesktop4/debian/prerm
===================================================================
--- desktop/trunk/xfdesktop4/debian/prerm	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfdesktop4/debian/prerm	2005-11-13 13:19:39 UTC (rev 297)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "remove" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 xfce-mcs-manager
+	pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xffm4/debian/postinst
===================================================================
--- desktop/trunk/xffm4/debian/postinst	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xffm4/debian/postinst	2005-11-13 13:19:39 UTC (rev 297)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "configure" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 -f xfce-mcs-manager
+	pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xffm4/debian/prerm
===================================================================
--- desktop/trunk/xffm4/debian/prerm	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xffm4/debian/prerm	2005-11-13 13:19:39 UTC (rev 297)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "remove" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 xfce-mcs-manager
+	pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xfprint4/debian/postinst
===================================================================
--- desktop/trunk/xfprint4/debian/postinst	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfprint4/debian/postinst	2005-11-13 13:19:39 UTC (rev 297)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "configure" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 -f xfce-mcs-manager
+	pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xfprint4/debian/prerm
===================================================================
--- desktop/trunk/xfprint4/debian/prerm	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfprint4/debian/prerm	2005-11-13 13:19:39 UTC (rev 297)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "remove" ]; then
 	# Get xfce-mcs-manager to reinit
-	pkill -USR1 xfce-mcs-manager
+	pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xfwm4/debian/changelog
===================================================================
--- desktop/trunk/xfwm4/debian/changelog	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfwm4/debian/changelog	2005-11-13 13:19:39 UTC (rev 297)
@@ -1,4 +1,4 @@
-xfwm4 (4.2.3-1) unstable; urgency=low
+xfwm4 (4.2.3.1-1) unstable; urgency=low
 
   * New Upstream Release
   * Send xfce-mcs-manager a SIGUSR1 so it notices the plugin.

Modified: desktop/trunk/xfwm4/debian/postinst
===================================================================
--- desktop/trunk/xfwm4/debian/postinst	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfwm4/debian/postinst	2005-11-13 13:19:39 UTC (rev 297)
@@ -9,7 +9,7 @@
   x-window-manager.1.gz /usr/share/man/man1/xfwm4.1.gz
 
   # Get xfce-mcs-manager to reinit
-  pkill -USR1 -f xfce-mcs-manager
+  pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xfwm4/debian/prerm
===================================================================
--- desktop/trunk/xfwm4/debian/prerm	2005-11-07 23:14:48 UTC (rev 296)
+++ desktop/trunk/xfwm4/debian/prerm	2005-11-13 13:19:39 UTC (rev 297)
@@ -6,7 +6,7 @@
   update-alternatives --remove x-window-manager /usr/bin/xfwm4
 
   # Get xfce-mcs-manager to reinit
-  pkill -USR1 xfce-mcs-manager
+  pkill -USR1 -f xfce-mcs-manager || true
 fi
 
 #DEBHELPER#




More information about the Pkg-xfce-commits mailing list