revno: 380
fixes bug: https://launchpad.net/bugs/1040902
committer: Lionel Le Folgoc mrpo...@ubuntu.com
branch nick: xubuntu-default-settings
timestamp: Wed 2012-08-29 01:41:08 +0200
message:
* etc/xdg/xdg-xubuntu/menus/*.menu:
- updated to show more Settings' apps in xfce4-settings-manager,
per other-q-xubuntu-settings-manager-launchers. lp: #1040902
- fix typo, xfrun4.desktop is actually named xfce4-run.desktop.
added:
etc/xdg/xdg-xubuntu/menus/xfce-settings-manager.menu
modified:
debian/changelog
etc/xdg/xdg-xubuntu/menus/xfce-applications.menu
--
lp:xubuntu-default-settings
https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk
Your team Xubuntu Team is subscribed to branch lp:xubuntu-default-settings.
To unsubscribe from this branch go to
https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk/+edit-subscription
=== modified file 'debian/changelog'
--- debian/changelog 2012-08-23 19:02:08 +
+++ debian/changelog 2012-08-28 23:41:08 +
@@ -1,3 +1,12 @@
+xubuntu-default-settings (12.10.4) UNRELEASED; urgency=low
+
+ * etc/xdg/xdg-xubuntu/menus/*.menu:
+- updated to show more Settings' apps in xfce4-settings-manager,
+per other-q-xubuntu-settings-manager-launchers. lp: #1040902
+- fix typo, xfrun4.desktop is actually named xfce4-run.desktop.
+
+ -- Lionel Le Folgoc mrpo...@ubuntu.com Wed, 29 Aug 2012 01:35:06 +0200
+
xubuntu-default-settings (12.10.3) quantal; urgency=low
* Replace datetime by clock now that it features a calendar as well.
=== modified file 'etc/xdg/xdg-xubuntu/menus/xfce-applications.menu'
--- etc/xdg/xdg-xubuntu/menus/xfce-applications.menu 2012-08-23 18:53:47 +
+++ etc/xdg/xdg-xubuntu/menus/xfce-applications.menu 2012-08-28 23:41:08 +
@@ -11,6 +11,7 @@
Include
Filenameexo-web-browser.desktop/Filename
Filenameexo-mail-reader.desktop/Filename
+Filenamexfce-settings-manager.desktop/Filename
Filenameubuntu-software-center.desktop/Filename
Filenamexfhelp4.desktop/Filename
Filenamexfce4-about.desktop/Filename
@@ -21,7 +22,7 @@
Filenameexo-web-browser.desktop/Filename
Filenameexo-mail-reader.desktop/Filename
Separator/
-MenunameSettings/Menuname
+Filenamexfce-settings-manager.desktop/Filename
Separator/
Merge type=all/
Separator/
@@ -33,27 +34,6 @@
/Layout
Menu
-NameSettings/Name
-Directoryxfce-settings.directory/Directory
-Include
-Filenamexfce-settings-manager.desktop/Filename
-Filenamexfce4-settings-editor.desktop/Filename
-And
-CategorySettings/Category
-NotCategoryXFCE/Category/Not
-NotCategoryX-XFCE-SettingsDialog/Category/Not
-NotCategorySystem/Category/Not
-/And
-/Include
-
-Layout
-Filenamexfce-settings-manager.desktop/Filename
-Separator/
-Merge type=all/
-/Layout
-/Menu
-
-Menu
NameAccessories/Name
Directoryxfce-accessories.directory/Directory
Include
@@ -73,7 +53,7 @@
/Exclude
Layout
-Filenamexfrun4.desktop/Filename
+Filenamexfce4-run.desktop/Filename
Filenamexfce4-appfinder.desktop/Filename
Separator/
Merge type=all/
@@ -155,6 +135,7 @@
/Include
Exclude
Or
+CategorySettings/Category
Filenamexfce4-session-logout.desktop/Filename
Filenameubuntu-software-center.desktop/Filename
/Or
=== added file 'etc/xdg/xdg-xubuntu/menus/xfce-settings-manager.menu'
--- etc/xdg/xdg-xubuntu/menus/xfce-settings-manager.menu 1970-01-01 00:00:00 +
+++ etc/xdg/xdg-xubuntu/menus/xfce-settings-manager.menu 2012-08-28 23:41:08 +
@@ -0,0 +1,124 @@
+!DOCTYPE Menu PUBLIC -//freedesktop//DTD Menu 1.0//EN
+ http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd;
+
+Menu
+ NameSettings/Name
+
+ DefaultAppDirs/
+ DefaultDirectoryDirs/
+ DefaultMergeDirs/
+
+ Layout
+ MenunamePersonal/Menuname
+ MenunameHardware/Menuname
+ MenunameSystem/Menuname
+ MenunameOther/Menuname
+ Merge type=all /
+ /Layout
+
+ Include
+And
+ CategorySettings/Category
+ Not
+Or
+ CategoryX-XFCE-PersonalSettings/Category
+ CategoryX-XFCE-HardwareSettings/Category
+ CategoryX-XFCE-SystemSettings/Category
+/Or
+ /Not
+/And
+ /Include
+
+ Exclude
+Filenamexfce-settings-manager.desktop/Filename
+ /Exclude
+
+ Menu
+NamePersonal/Name
+Directoryxfce-personal.directory/Directory
+Include
+ And
+CategorySettings/Category
+CategoryX-XFCE-SettingsDialog/Category
+CategoryX-XFCE-PersonalSettings/Category
+