[Pkg-xfce-commits] r733 - in desktop/trunk: exo/debian orage/debian xfce-mcs-plugins/debian xfce4-mixer/debian xfce4-panel/debian xfce4-session/debian xfce4-utils/debian xfdesktop4/debian xfprint4/debian xfwm4/debian

Yves-Alexis Perez corsac-guest at costa.debian.org
Tue Jul 11 21:58:10 UTC 2006 

Author: corsac-guest
Date: 2006-07-11 21:58:09 +0000 (Tue, 11 Jul 2006)
New Revision: 733

Modified:
   desktop/trunk/exo/debian/libexo-0.3-0.postinst
   desktop/trunk/orage/debian/postinst
   desktop/trunk/xfce-mcs-plugins/debian/postinst
   desktop/trunk/xfce4-mixer/debian/postinst
   desktop/trunk/xfce4-panel/debian/rules
   desktop/trunk/xfce4-panel/debian/xfce4-panel.postinst
   desktop/trunk/xfce4-session/debian/postinst
   desktop/trunk/xfce4-utils/debian/postinst
   desktop/trunk/xfdesktop4/debian/postinst
   desktop/trunk/xfprint4/debian/postinst
   desktop/trunk/xfwm4/debian/postinst
Log:
don't complain if xfce-mcs-manager isn't running at rehash


Modified: desktop/trunk/exo/debian/libexo-0.3-0.postinst
===================================================================
--- desktop/trunk/exo/debian/libexo-0.3-0.postinst	2006-07-11 21:57:22 UTC (rev 732)
+++ desktop/trunk/exo/debian/libexo-0.3-0.postinst	2006-07-11 21:58:09 UTC (rev 733)
@@ -4,7 +4,7 @@
 	# Get xfce-mcs-manager to reinit
 	#Hurd doesnt have pkill so we use another way
 	#pkill -USR1 -f xfce-mcs-manager || true
-	kill -USR1 `pidof xfce-mcs-manager` || true
+	kill -USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
 
 fi
 #DEBHELPER#

Modified: desktop/trunk/orage/debian/postinst
===================================================================
--- desktop/trunk/orage/debian/postinst	2006-07-11 21:57:22 UTC (rev 732)
+++ desktop/trunk/orage/debian/postinst	2006-07-11 21:58:09 UTC (rev 733)
@@ -2,7 +2,7 @@
 
 if [ "$1" = "configure" ]; then
 	# Get xfce-mcs-manager to reinit
-	kill -USR1 `pidof xfce-mcs-manager` || true
+	kill -USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
 
 fi
 

Modified: desktop/trunk/xfce-mcs-plugins/debian/postinst
===================================================================
--- desktop/trunk/xfce-mcs-plugins/debian/postinst	2006-07-11 21:57:22 UTC (rev 732)
+++ desktop/trunk/xfce-mcs-plugins/debian/postinst	2006-07-11 21:58:09 UTC (rev 733)
@@ -4,7 +4,7 @@
 	# Get xfce-mcs-manager to reinit
 	# hurd doesnt have procps so we do it another way
 	#pkill -USR1 -f xfce-mcs-manager || true
-	kill -USR1 `pidof xfce-mcs-manager` || true
+	kill -USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
 
 fi
 

Modified: desktop/trunk/xfce4-mixer/debian/postinst
===================================================================
--- desktop/trunk/xfce4-mixer/debian/postinst	2006-07-11 21:57:22 UTC (rev 732)
+++ desktop/trunk/xfce4-mixer/debian/postinst	2006-07-11 21:58:09 UTC (rev 733)
@@ -4,7 +4,7 @@
 	# Get xfce-mcs-manager to reinit
 	# hurd doesnt have procps so we do that another way
 	#pkill -USR1 -f xfce-mcs-manager || true
-	kill -USR1 `pidof xfce-mcs-manager` || true
+	kill -USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
 
 fi
 

Modified: desktop/trunk/xfce4-panel/debian/rules
===================================================================
--- desktop/trunk/xfce4-panel/debian/rules	2006-07-11 21:57:22 UTC (rev 732)
+++ desktop/trunk/xfce4-panel/debian/rules	2006-07-11 21:58:09 UTC (rev 733)
@@ -58,6 +58,9 @@
 	rm -f `pwd`/debian/tmp/usr/lib/xfce4/mcs-plugins/*.la
 	rm -f `pwd`/debian/tmp/usr/lib/xfce4/mcs-plugins/*.a
 
+	#why on earth xfce-filemanager.png is provided by both xfce4-panel and xfce4-mcs-plugins ??
+	rm -f `pwd`/debian/tmp/usr/share/icons/hicolor/48x48/apps/xfce-filemanager.png
+
 	install -D -p -o root -g root -m 644 `pwd`/debian/lintian \
 	$(CURDIR)/debian/tmp/usr/share/lintian/overrides/xfce4-panel
 

Modified: desktop/trunk/xfce4-panel/debian/xfce4-panel.postinst
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel.postinst	2006-07-11 21:57:22 UTC (rev 732)
+++ desktop/trunk/xfce4-panel/debian/xfce4-panel.postinst	2006-07-11 21:58:09 UTC (rev 733)
@@ -4,7 +4,7 @@
 	# Get xfce-mcs-manager to reinit
 	# hurd doesnt have procps so we do it another way
 	#pkill -USR1 -f xfce-mcs-manager || true
-	kill -USR1 `pidof xfce-mcs-manager` || true
+	kill -USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
 
 	# Run ldconfig to update shared library system
 	ldconfig

Modified: desktop/trunk/xfce4-session/debian/postinst
===================================================================
--- desktop/trunk/xfce4-session/debian/postinst	2006-07-11 21:57:22 UTC (rev 732)
+++ desktop/trunk/xfce4-session/debian/postinst	2006-07-11 21:58:09 UTC (rev 733)
@@ -9,7 +9,7 @@
   	# Get xfce-mcs-manager to reinit
   	# hurd doesnt have procps so we do it another way
   	#pkill -USR1 -f xfce-mcs-manager || true
-	kill -USR1 `pidof xfce-mcs-manager` || true
+	kill -USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
 	
 fi
 

Modified: desktop/trunk/xfce4-utils/debian/postinst
===================================================================
--- desktop/trunk/xfce4-utils/debian/postinst	2006-07-11 21:57:22 UTC (rev 732)
+++ desktop/trunk/xfce4-utils/debian/postinst	2006-07-11 21:58:09 UTC (rev 733)
@@ -4,7 +4,7 @@
 	# Get xfce-mcs-manager to reinit
 	# hurd doesnt have procps so we do it another way
 	#pkill -USR1 -f xfce-mcs-manager || true
-	kill -USR1 `pidof xfce-mcs-manager` || true
+	kill -USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
 fi
 
 #DEBHELPER#

Modified: desktop/trunk/xfdesktop4/debian/postinst
===================================================================
--- desktop/trunk/xfdesktop4/debian/postinst	2006-07-11 21:57:22 UTC (rev 732)
+++ desktop/trunk/xfdesktop4/debian/postinst	2006-07-11 21:58:09 UTC (rev 733)
@@ -13,7 +13,7 @@
 	# Get xfce-mcs-manager to reinit
 	# hurd doesnt have procps so we do it another way
 	#pkill -USR1 -f xfce-mcs-manager || true
-	kill -USR1 `pidof xfce-mcs-manager` || true
+	kill -USR1 `pidof xfce-mcs-manager` > /dev/null 2>&1|| true
 
 fi
 

Modified: desktop/trunk/xfprint4/debian/postinst
===================================================================
--- desktop/trunk/xfprint4/debian/postinst	2006-07-11 21:57:22 UTC (rev 732)
+++ desktop/trunk/xfprint4/debian/postinst	2006-07-11 21:58:09 UTC (rev 733)
@@ -4,7 +4,7 @@
 	# Get xfce-mcs-manager to reinit
 	# hurd doesnt have procps so we do it another way
 	#pkill -USR1 -f xfce-mcs-manager || true
-	kill -USR1 `pidof xfce-mcs-manager` || true
+	kill -USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
 
 fi
 

Modified: desktop/trunk/xfwm4/debian/postinst
===================================================================
--- desktop/trunk/xfwm4/debian/postinst	2006-07-11 21:57:22 UTC (rev 732)
+++ desktop/trunk/xfwm4/debian/postinst	2006-07-11 21:58:09 UTC (rev 733)
@@ -11,7 +11,7 @@
 	# Get xfce-mcs-manager to reinit
 	# hurd doesnt have procps so we do it another way
 	#pkill -USR1 -f xfce-mcs-manager || true
-	kill -USR1 `pidof xfce-mcs-manager` || true
+	kill -USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
 
 fi

More information about the Pkg-xfce-commits mailing list