[Pkg-xfce-commits] r1372 - desktop/trunk/xfce4-utils/debian

[huggie at alioth.debian.org]

Author: huggie
Date: 2007-10-08 13:35:19 +0000 (Mon, 08 Oct 2007)
New Revision: 1372

Modified:
   desktop/trunk/xfce4-utils/debian/changelog
   desktop/trunk/xfce4-utils/debian/rules
Log:
Make panel plugins in /usr/local/ work again when startxfce4 is used.


Modified: desktop/trunk/xfce4-utils/debian/changelog
===================================================================
--- desktop/trunk/xfce4-utils/debian/changelog	2007-10-08 13:31:55 UTC (rev 1371)
+++ desktop/trunk/xfce4-utils/debian/changelog	2007-10-08 13:35:19 UTC (rev 1372)
@@ -1,9 +1,13 @@
 xfce4-utils (4.4.1-2) UNRELEASED; urgency=low
 
+  (Yves-Alexis Perez)
   * debian/xfterm4.1, debian/xfce4-utils.1: update bug reporting address in
     manpage.
   * debian/menu: switch to new menu policy.
   * debian/postinst: use posix kill -s to avoid problems on hurd. 
+  (Simon Huggins)
+  * debian/rules: fixup mistake in startxfce4 that stops local panel plugins
+    working                                                      closes: 427918
 
  -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 17 Sep 2007 23:33:35 +0200
 

Modified: desktop/trunk/xfce4-utils/debian/rules
===================================================================
--- desktop/trunk/xfce4-utils/debian/rules	2007-10-08 13:31:55 UTC (rev 1371)
+++ desktop/trunk/xfce4-utils/debian/rules	2007-10-08 13:35:19 UTC (rev 1372)
@@ -66,6 +66,9 @@
 	perl -i -pe 's/FILEMAN=xftree4/FILEMAN=thunar/' `pwd`/debian/xfce4-utils/usr/bin/xfmountdev4
 
 	perl -i -pe 's/firefox/iceweasel/g' `pwd`/debian/xfce4-utils/usr/bin/xfbrowser4
+
+	# temp fix before upstream fix it for #427918
+	perl -i -pe 's/XDG_DATA_DIRS="usr/XDG_DATA_DIRS="\/usr/' `pwd`/debian/xfce4-utils/usr/bin/startxfce4
 	
 	rm -f `pwd`/debian/xfce4-utils/usr/lib/xfce4/mcs-plugins/*.la
 	rm -f `pwd`/debian/xfce4-utils/usr/lib/xfce4/mcs-plugins/*.a