[Pkg-xfce-commits] r329 - desktop/trunk/xfdesktop4/debian
Simon Huggins
huggie-guest at costa.debian.org
Sun Nov 27 14:17:31 UTC 2005
Author: huggie-guest
Date: 2005-11-27 14:17:30 +0000 (Sun, 27 Nov 2005)
New Revision: 329
Removed:
desktop/trunk/xfdesktop4/debian/system.menu.xml
Modified:
desktop/trunk/xfdesktop4/debian/changelog
desktop/trunk/xfdesktop4/debian/rules
desktop/trunk/xfdesktop4/debian/xfdesktop4.menu-method
Log:
Really finally honestly really fix the menu system for locales. I mean how
many times can we get it wrong? ;)
Modified: desktop/trunk/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog 2005-11-27 12:30:32 UTC (rev 328)
+++ desktop/trunk/xfdesktop4/debian/changelog 2005-11-27 14:17:30 UTC (rev 329)
@@ -1,9 +1,14 @@
xfdesktop4 (4.2.3-1) unstable; urgency=low
- * New Upstream Release
- * Send xfce-mcs-manager a SIGUSR1 so it notices the plugin.
+ * Yves-Alexis Perez
+ * New Upstream Release
+ * Send xfce-mcs-manager a SIGUSR1 so it notices the plugin.
+ * Simon Huggins
+ * Rejig the menu system yet again so hopefully this time it really will
+ work in all cases of locales/no locale and user/root setups.
+ closes: #320601
- -- Yves-Alexis Perez <corsac at corsac.net> Sun, 06 Nov 2005 22:01:12 +0100
+ -- Yves-Alexis Perez <corsac at corsac.net> Sun, 27 Nov 2005 13:21:38 +0000
xfdesktop4 (4.2.2-1) unstable; urgency=low
Modified: desktop/trunk/xfdesktop4/debian/rules
===================================================================
--- desktop/trunk/xfdesktop4/debian/rules 2005-11-27 12:30:32 UTC (rev 328)
+++ desktop/trunk/xfdesktop4/debian/rules 2005-11-27 14:17:30 UTC (rev 329)
@@ -59,13 +59,9 @@
dh_testdir
dh_testroot
- # install menu files with entry for menudefs.hook
- cp `pwd`/debian/system.menu.xml \
- `pwd`/debian/xfdesktop4/etc/xdg/xfce4/desktop/system.menu.xml
-
# Also change mozilla for sensible-browser for Debian
for f in `pwd`/debian/xfdesktop4/etc/xdg/xfce4/desktop/menu.xml*; do \
- perl -0777 -i -pe 's/cmd="mozilla"/cmd="sensible-browser"/;' $$f; \
+ perl -0777 -i -pe '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/' $$f; \
done
dh_installdocs README TODO
Deleted: desktop/trunk/xfdesktop4/debian/system.menu.xml
===================================================================
--- desktop/trunk/xfdesktop4/debian/system.menu.xml 2005-11-27 12:30:32 UTC (rev 328)
+++ desktop/trunk/xfdesktop4/debian/system.menu.xml 2005-11-27 14:17:30 UTC (rev 329)
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xfdesktop-menu>
-
-<!--
- Explanantion of Xfce 4 menu file:
- =================================
- Here we will try to explain the format of the menu file. Look at the
- actual menu below for the real examples. You shouldn't really need to
- edit this manually; check out xfce4-menueditor instead.
--->
-
-<!-- Obviously, this is how you make a comment ;-) -->
-
-<!--
-
- + Everything is between exactly one pair of
- <xfdesktop-menu></xfdesktop-menu> tags.
-
- + Applications:
- <app name="Name in menu" cmd="Command to run" term="false"
- icon="iconfile" snotify="false" visible="true" />
- The 'term' attribute determines if the program needs a terminal to run,
- and 'snotify' sets whether or not the program supports startup
- notification. You can set an icon to be displayed next to the item with
- the 'icon' attribute. Only 'name' and 'cmd' are required.
-
- + Separators:
- <separator visible="true" />
- Creates a horizontal separator. The 'visible' attribute is optional.
-
- + Submenus:
- <menu name="Name in menu" icon="iconfile" visible="true"></menu>
- Only 'name' is required, but you can also set an icon to be displayed using
- the 'icon' attribute. Between the menu tags you can define more
- applications, separators and menus.
-
- + Titles
- <title name="Name in menu" icon="iconfile" visible="true" />
- Creates an insensitive menu title. You can even add an optional icon to
- the title if you'd like.
-
- + Including other files:
- <include type="file" src="menu2.xml" visible="true" />
- Includes the file menu2.xml. A relative path is assumed to be rooted at
- ~/.xfce4/. An absolute path will be treated as such.
-
- + Including an autogenerated system menu:
- <include type="system" style="simple" unique="true" visible="true" />
- Includes a system menu. style can be "simple" or "multilevel". If unique
- is set to "false", multiple menu items will be generated if the app
- appears in multiple categories.
--->
-
-<xfdesktop-menu>
-
- <title name="Desktop Menu" icon="xfce4-backdrop"/>
-
- <separator/>
-
- <app name="Run Program..." cmd="xfrun4" icon="gnome-fs-executable"/>
-
- <separator/>
-
- <app name="Terminal" cmd="xfterm4" icon="gnome-terminal"/>
- <app name="File Manager (xffm)" cmd="xffm" icon="file-manager"/>
- <app name="Web Browser" cmd="sensible-browser" icon="gnome-globe"/>
-
- <separator/>
-
- <menu name="Settings" icon="gnome-settings">
- <app name="Settings Manager" cmd="xfce-setting-show" icon="gnome-settings"/>
- </menu>
-
- <separator/>
-
- <!--
- The next line includes the autogenerated menu at the current level. If
- you want, you can put this in its own submenu.
- -->
- <menu name="Xfce Menu">
- <include type="system" />
- </menu>
-
- <separator/>
-
- <include type="file" src="menudefs.hook" />
-
- <!--
- Uncomment the following line (and comment the above) if you would rather
- include a separate menu file instead of using the autogenerated menu.
- -->
- <!-- <include type="file" src="menu2.xml"/> -->
-
- <separator/>
-
- <app name="Help" cmd="xfhelp4" icon="gnome-help"/>
- <app name="About Xfce" cmd="xfce4-about" icon="gnome-info"/>
- <!--
- This will cause xfce4-session to quit, after first displaying a log-out
- dialog box. If xfce4-session isn't running, it will quit xfdesktop.
- -->
- <builtin name="Quit" cmd="quit" icon="gnome-logout"/>
-
-</xfdesktop-menu>
Modified: desktop/trunk/xfdesktop4/debian/xfdesktop4.menu-method
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4.menu-method 2005-11-27 12:30:32 UTC (rev 328)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop4.menu-method 2005-11-27 14:17:30 UTC (rev 329)
@@ -14,7 +14,9 @@
preoutput="<!-- Automatically generated file. Do not edit (see /usr/share/doc/menu/html/index.html) -->\n<xfdesktop-menu>"
postoutput="</xfdesktop-menu>"
treewalk="M)"
-postrun="cp /etc/xdg/xfce4/desktop/system.menu.xml " prefix() "/menu.xml"
+postrun="if [ \"/etc/xdg/xfce4/desktop/menu.xml\" != \"" prefix() \
+ "/menu.xml\" ]; then cp /etc/xdg/xfce4/desktop/menu.xml " prefix() \
+ "/menu.xml; fi"
function charreplace($str,$toreplace,$with,$lastchar)=replacewith(escwith($str,$toreplace,$with),$toreplace,$lastchar)
More information about the Pkg-xfce-commits
mailing list