[Pkg-xfce-commits] r892 - desktop/trunk/xfdesktop4/debian

[Yves-Alexis Perez]

Author: corsac-guest
Date: 2006-09-30 16:10:29 +0000 (Sat, 30 Sep 2006)
New Revision: 892

Modified:
   desktop/trunk/xfdesktop4/debian/changelog
   desktop/trunk/xfdesktop4/debian/rules
Log:
invert Xfce & Debian menus


Modified: desktop/trunk/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog	2006-09-30 11:43:59 UTC (rev 891)
+++ desktop/trunk/xfdesktop4/debian/changelog	2006-09-30 16:10:29 UTC (rev 892)
@@ -1,3 +1,10 @@
+xfdesktop4 (4.3.99.1-2) UNRELEASED; urgency=low
+
+  * Use Xfce menu as root menu and Debian menu as a submenu, if menu package
+  is installed.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sat, 30 Sep 2006 18:09:41 +0200
+
 xfdesktop4 (4.3.99.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/trunk/xfdesktop4/debian/rules
===================================================================
--- desktop/trunk/xfdesktop4/debian/rules	2006-09-30 11:43:59 UTC (rev 891)
+++ desktop/trunk/xfdesktop4/debian/rules	2006-09-30 16:10:29 UTC (rev 892)
@@ -66,7 +66,7 @@
 
 	# use correct Debian defaults
 	for f in `pwd`/debian/xfdesktop4/etc/xdg/xfce4/desktop/menu.xml*; do \
-	   	perl -0777 -i -pe 's/cmd="xfterm4"/cmd="x-terminal-emulator"/; s/cmd="mozilla"/cmd="sensible-browser"/; s/(<include type="system" style="simple" unique="true"\/>)/<menu name="Xfce">$$1<\/menu>\n<separator\/>\n<include type="file" src="menudefs.hook" \/>\n/; s/xffm/thunar/g' $$f; \
+	   	perl -0777 -i -pe 's/cmd="xfterm4"/cmd="x-terminal-emulator"/; s/cmd="mozilla"/cmd="sensible-browser"/; s/(<include type="system" style="simple" unique="true"\/>)/$$1\n<separator\/>\n<menu name="Debian"><include type="file" src="menudefs.hook" \/><\/menu>\n/; s/xffm/thunar/g' $$f; \
 	done
 
 	dh_installdocs README TODO