Merge authors: Lionel Le Folgoc (mrpouit) ------------------------------------------------------------ revno: 205 [merge] committer: Lionel Le Folgoc <[email protected]> branch nick: xubuntu-default-settings timestamp: Thu 2010-05-13 10:00:59 +0200 message: releasing version 10.04.8 modified: debian/changelog usr/share/xubuntu/session.sh
-- 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-04-13 19:23:32 +0000 +++ debian/changelog 2010-05-04 17:19:50 +0000 @@ -1,3 +1,13 @@ +xubuntu-default-settings (10.04.8) lucid-proposed; urgency=low + + * usr/share/xubuntu/session.sh: + - Do not forcefully set $XDG_CONFIG_DIRS, it creates issue with non-Xfce + applications, and 60xdg_path-on-session from gdm already takes care of + that. lp: #571133 + - Ensure that /usr/local/share is present in $XDG_DATA_DIRS. lp: #574264 + + -- Lionel Le Folgoc <[email protected]> Mon, 03 May 2010 20:15:27 +0200 + xubuntu-default-settings (10.04.7) lucid; urgency=low * Refreshed translations. === modified file 'usr/share/xubuntu/session.sh' --- usr/share/xubuntu/session.sh 2010-01-27 19:26:26 +0000 +++ usr/share/xubuntu/session.sh 2010-05-03 18:21:16 +0000 @@ -1,7 +1,10 @@ #!/bin/sh # Copyright © 2010 Lionel Le Folgoc <[email protected]> -# Simple wrapper to set XDG base dirs to some values -export XDG_CONFIG_DIRS=/etc/xdg/xdg-xubuntu -export XDG_DATA_DIRS=/etc/xdg/xdg-xubuntu +# Readd /usr/local/share, as startxfce4 adds it only if $XDG_DATA_DIRS is empty +if [ -z "$XDG_DATA_DIRS" ]; then + XDG_DATA_DIRS="/usr/local/share" +fi +export XDG_DATA_DIRS="/etc/xdg/xdg-xubuntu:$XDG_DATA_DIRS" + exec startxfce4
_______________________________________________ Mailing list: https://launchpad.net/~xubuntu-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~xubuntu-dev More help : https://help.launchpad.net/ListHelp
