[Pkg-xfce-commits] r4615 - desktop/branches/experimental/xfce4-session/debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-12-04 19:15:37 +0000 (Sat, 04 Dec 2010)
New Revision: 4615

Modified:
   desktop/branches/experimental/xfce4-session/debian/control
   desktop/branches/experimental/xfce4-session/debian/rules
Log:
Readd support for the panel plugin (commented out)

Modified: desktop/branches/experimental/xfce4-session/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/control	2010-12-04 18:01:57 UTC (rev 4614)
+++ desktop/branches/experimental/xfce4-session/debian/control	2010-12-04 19:15:37 UTC (rev 4615)
@@ -18,7 +18,7 @@
 Section: xfce
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, fortune-mod, xfce4-settings, xfconf
-Recommends: xfwm4, xfce4-utils, xfdesktop4, xfce4-panel, consolekit, upower,
+Recommends: xfwm4, xfce4-utils, xfdesktop4, ${shlibs:Recommends}, consolekit, upower,
  dbus-x11, x11-xserver-utils
 Suggests: sudo
 Provides: x-session-manager

Modified: desktop/branches/experimental/xfce4-session/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/rules	2010-12-04 18:01:57 UTC (rev 4614)
+++ desktop/branches/experimental/xfce4-session/debian/rules	2010-12-04 19:15:37 UTC (rev 4615)
@@ -20,14 +20,22 @@
 override_dh_install:
 	rm -f debian/xfce4-session/usr/lib/xfce4/session/splash-engines/*.la
 	rm -f debian/xfce4-session/usr/lib/*.la
-
+	
 	chrpath -d -k debian/xfce4-session/usr/bin/* \
 		debian/xfce4-session/usr/lib/xfce4/session/xfsm-shutdown-helper \
 		debian/xfce4-session/usr/lib/xfce4/session/splash-engines/*so
+		#debian/xfce4-session/usr/lib/xfce4/panel/plugins/libxfsm-logout-plugin.so
 	
 	cat debian/debian-tips >> debian/xfce4-session/usr/share/xfce4/tips/tips
 	strfile debian/xfce4-session/usr/share/xfce4/tips/tips \
 		debian/xfce4-session/usr/share/xfce4/tips/tips.dat
+	
+	dh_install --fail-missing -X usr/lib/xfce4/panel/plugins/libxfsm-logout-plugin.la \
+		-X usr/lib/xfce4/panel/plugins/libxfsm-logout-plugin.a
 
+override_dh_shlibdeps:
+	dh_shlibdeps -X debian/xfce4-session/usr/lib/xfce4/panel/plugins/libxfsm-logout-plugin.so -- \
+    -dRecommends debian/xfce4-session/usr/lib/xfce4/panel/plugins/libxfsm-logout-plugin.so -dDepends
+
 %:
 	dh $@