xubuntu-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 225
fixes bug(s): https://launchpad.net/bugs/644969
committer: Lionel Le Folgoc <mrpouit@xxxxxxxxxx>
branch nick: xubuntu-default-settings
timestamp: Sat 2010-09-25 18:22:18 +0200
message:
  Use the same names as upstream for our help & logout desktop files, so
  the upstream ones will be overridden in an xubuntu session, and the xubuntu
  ones not visible in an xfce session, thanks to the xdg dirs' magic.
  lp: #644969
removed:
  usr/share/applications/
renamed:
  usr/share/applications/xubuntu-help.desktop => usr/share/xubuntu/applications/xfce4-help.desktop
  usr/share/applications/xubuntu-logout.desktop => usr/share/xubuntu/applications/xfce4-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-09-25 16:15:54 +0000
+++ debian/changelog	2010-09-25 16:22:18 +0000
@@ -2,6 +2,10 @@
 
   * Rename etc/xdg/xdg-xubuntu/applications to usr/share/xubuntu/applications:
     - usr/share/xubuntu/session.sh: update XDG_DATA_DIRS consequently.
+  * Use the same names as upstream for our help & logout desktop files, so
+    the upstream ones will be overridden in an xubuntu session, and the xubuntu
+    ones not visible in an xfce session, thanks to the xdg dirs' magic.
+    lp: #644969
 
  -- 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-15 19:42:00 +0000
+++ etc/xdg/xdg-xubuntu/menus/xfce-applications.menu	2010-09-25 16:22:18 +0000
@@ -9,9 +9,9 @@
     
     <Include>
         <Filename>ubuntu-software-center.desktop</Filename>
-        <Filename>xubuntu-help.desktop</Filename>
+        <Filename>xfce4-help.desktop</Filename>
         <Filename>xfce4-about-xfce.desktop</Filename>
-        <Filename>xubuntu-logout.desktop</Filename>
+        <Filename>xfce4-logout.desktop</Filename>
     </Include>
 
     <Layout>
@@ -21,9 +21,9 @@
         <Separator/>
         <Filename>ubuntu-software-center.desktop</Filename>
         <Separator/>
-        <Filename>xubuntu-help.desktop</Filename>
+        <Filename>xfce4-help.desktop</Filename>
         <Filename>xfce4-about-xfce.desktop</Filename>
-        <Filename>xubuntu-logout.desktop</Filename>
+        <Filename>xfce4-logout.desktop</Filename>
     </Layout>
     
     <Menu>

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