xubuntu-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 231
committer: Lionel Le Folgoc <mrpouit@xxxxxxxxxx>
branch nick: xubuntu-default-settings
timestamp: Fri 2010-12-17 20:32:34 +0100
message:
  usr/share/xubuntu/applications/aumix.desktop: added, only used to hide the
  entry by default instead of adding another hack in the menu file.
added:
  usr/share/xubuntu/applications/aumix.desktop
renamed:
  usr/share/xubuntu/applications/xfce4-help.desktop => usr/share/xubuntu/applications/xfhelp4.desktop
  usr/share/xubuntu/applications/xfce4-logout.desktop => usr/share/xubuntu/applications/xfce4-session-logout.desktop
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	2010-12-17 19:07:38 +0000
+++ debian/changelog	2010-12-17 19:32:34 +0000
@@ -12,6 +12,8 @@
   * etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml:
     added.
   * debian/{preinst,postinst,postrm}: handle removal of old xdg config files.
+  * usr/share/xubuntu/applications/aumix.desktop: added, only used to hide the
+    entry by default instead of adding another hack in the menu file.
 
  -- Lionel Le Folgoc <mrpouit@xxxxxxxxxx>  Sat, 25 Sep 2010 18:14:43 +0200
 

=== modified file 'etc/xdg/xdg-xubuntu/menus/xfce-applications.menu'
--- etc/xdg/xdg-xubuntu/menus/xfce-applications.menu	2010-09-25 16:22:18 +0000
+++ etc/xdg/xdg-xubuntu/menus/xfce-applications.menu	2010-12-17 19:32:34 +0000
@@ -9,9 +9,9 @@
     
     <Include>
         <Filename>ubuntu-software-center.desktop</Filename>
-        <Filename>xfce4-help.desktop</Filename>
-        <Filename>xfce4-about-xfce.desktop</Filename>
-        <Filename>xfce4-logout.desktop</Filename>
+        <Filename>xfhelp4.desktop</Filename>
+        <Filename>xfce4-about.desktop</Filename>
+        <Filename>xfce4-session-logout.desktop</Filename>
     </Include>
 
     <Layout>
@@ -21,9 +21,9 @@
         <Separator/>
         <Filename>ubuntu-software-center.desktop</Filename>
         <Separator/>
-        <Filename>xfce4-help.desktop</Filename>
-        <Filename>xfce4-about-xfce.desktop</Filename>
-        <Filename>xfce4-logout.desktop</Filename>
+        <Filename>xfhelp4.desktop</Filename>
+        <Filename>xfce4-about.desktop</Filename>
+        <Filename>xfce4-session-logout.desktop</Filename>
     </Layout>
     
     <Menu>
@@ -43,6 +43,13 @@
             <Merge type="all"/>
         </Layout>
         
+        <Menu>
+            <Name>Screensavers</Name>
+            <Directory>xfce-screensavers.directory</Directory>
+            <Include>
+                <Category>Screensaver</Category>
+            </Include>
+        </Menu>
     </Menu>
     
     <Menu>
@@ -98,9 +105,6 @@
             <Category>Video</Category>
             <Category>AudioVideo</Category>
         </Include>
-        <Exclude>
-            <Filename>aumix.desktop</Filename>
-        </Exclude>
     </Menu>
     
     <Menu>
@@ -118,12 +122,23 @@
             <Category>Office</Category>
         </Include>
     </Menu>
+
+    <Menu>
+        <Name>Science</Name>
+        <Directory>xfce-science.directory</Directory>
+        <Include>
+            <Category>Science</Category>
+        </Include>
+    </Menu>
     
     <Menu>
         <Name>System</Name>
         <Directory>xfce-system.directory</Directory>
         <Include>
-            <Category>System</Category>
+            <Or>
+                <Category>Emulator</Category>
+                <Category>System</Category>
+            </Or>
         </Include>
         <Exclude>
             <Filename>ubuntu-software-center.desktop</Filename>
@@ -139,7 +154,6 @@
         </Include>
         <Exclude>
             <Category>X-XfceSettingsDialog</Category>
-            <Category>Screensaver</Category>
             <Category>X-Xfce-Toplevel</Category>
         </Exclude>
     </Menu>

=== added file 'usr/share/xubuntu/applications/aumix.desktop'
--- usr/share/xubuntu/applications/aumix.desktop	1970-01-01 00:00:00 +0000
+++ usr/share/xubuntu/applications/aumix.desktop	2010-12-17 19:32:34 +0000
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=true
+

=== renamed file 'usr/share/xubuntu/applications/xfce4-logout.desktop' => 'usr/share/xubuntu/applications/xfce4-session-logout.desktop'
=== renamed file 'usr/share/xubuntu/applications/xfce4-help.desktop' => 'usr/share/xubuntu/applications/xfhelp4.desktop'