xubuntu-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Len Ovens len@xxxxxxxxxxxxx
Related merge proposals:
  https://code.launchpad.net/~len-ovenwerks/xubuntu-default-settings/xubuntu-default-settings/+merge/167445
  proposed by: Len Ovens (len-ovenwerks)
  review: Approve - Lionel Le Folgoc (mrpouit)
------------------------------------------------------------
revno: 427 [merge]
committer: Lionel Le Folgoc <mrpouit@xxxxxxxxxx>
branch nick: xubuntu-default-settings
timestamp: Thu 2013-07-04 19:53:42 +0200
message:
  Fix applications menu to allow menu merging (LP: #1187619).
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	2013-05-19 21:34:34 +0000
+++ debian/changelog	2013-06-05 03:40:59 +0000
@@ -1,3 +1,9 @@
+xubuntu-default-settings (13.10.1) UNRELEASED; urgency=low
+
+  * Fix applications menu to allow menu merging (LP: #1187619).
+
+ -- Len Ovens <len@xxxxxxxxxxxxx>  Tue, 04 Jun 2013 20:33:00 -0700
+
 xubuntu-default-settings (13.10.0) saucy; urgency=low
 
   * Depend on fonts-droid rather than transitional ttf-droid (LP: #1181762).

=== modified file 'etc/xdg/xdg-xubuntu/menus/xfce-applications.menu'
--- etc/xdg/xdg-xubuntu/menus/xfce-applications.menu	2013-03-03 22:34:54 +0000
+++ etc/xdg/xdg-xubuntu/menus/xfce-applications.menu	2013-06-05 03:40:59 +0000
@@ -6,7 +6,6 @@
 
     <DefaultAppDirs/>
     <DefaultDirectoryDirs/>
-    <DefaultMergeDirs/>
 
     <Include>
         <Filename>exo-web-browser.desktop</Filename>
@@ -162,5 +161,6 @@
             <Category>X-Xfce-Toplevel</Category>
         </Exclude>
     </Menu>
+    <DefaultMergeDirs/>
 
 </Menu>