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

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-01-02 17:08:33 +0000 (Sun, 02 Jan 2011)
New Revision: 4774

Modified:
   desktop/branches/experimental/xfce4-session/debian/changelog
   desktop/branches/experimental/xfce4-session/debian/control
   desktop/branches/experimental/xfce4-session/debian/rules
Log:
* Reenable building of the panel plugin:
  - debian/control: build-depends on xfce4-panel-dev >= 4.7.0
  - debian/rules: add it to chrpath and override dh_shlibdeps to move its
    deps as recommends.

Modified: desktop/branches/experimental/xfce4-session/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/changelog	2011-01-02 16:52:49 UTC (rev 4773)
+++ desktop/branches/experimental/xfce4-session/debian/changelog	2011-01-02 17:08:33 UTC (rev 4774)
@@ -32,6 +32,10 @@
     - 03_gk-start-with-path.patch: dropped, included upstream
     - 04_gk-dont-check-running-use-start.patch: ditto
     - 05_reuse-existing-ck-session.patch: dropped too.
+  * Reenable building of the panel plugin:
+    - debian/control: build-depends on xfce4-panel-dev >= 4.7.0
+    - debian/rules: add it to chrpath and override dh_shlibdeps to move its
+      deps as recommends.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sun, 02 Jan 2011 14:52:47 +0100
 

Modified: desktop/branches/experimental/xfce4-session/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/control	2011-01-02 16:52:49 UTC (rev 4773)
+++ desktop/branches/experimental/xfce4-session/debian/control	2011-01-02 17:08:33 UTC (rev 4774)
@@ -5,7 +5,7 @@
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
  Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), libx11-dev, libxml-parser-perl, chrpath,
- fortune-mod, libdbus-1-dev, libdbus-glib-1-dev, 
+ fortune-mod, libdbus-1-dev, libdbus-glib-1-dev, xfce4-panel-dev (>= 4.7.0),
  libxfce4util-dev (>= 4.6.0), libxfce4ui-1-dev (>= 4.7.0), libwnck-dev, 
  x11-xserver-utils, libxfconf-0-dev (>= 4.7.0), libglade2-dev, 
  intltool (>= 0.31), hardening-includes

Modified: desktop/branches/experimental/xfce4-session/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/rules	2011-01-02 16:52:49 UTC (rev 4773)
+++ desktop/branches/experimental/xfce4-session/debian/rules	2011-01-02 17:08:33 UTC (rev 4774)
@@ -25,16 +25,16 @@
 	
 	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
+		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
 
-#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
+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 $@