The branch, master has been updated via 592a66ce229942afce5fe64fc8690f5e5f48848c (commit) from 632189ab291215e9ed5b91509e6142eb1aa030be (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 592a66ce229942afce5fe64fc8690f5e5f48848c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 25 22:36:11 2013 +0100 Do parse profile/xprofile files in X2Go's Xsession file. (Fixes: #149). Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 10 +++++++++- x2goserver-xsession/etc/Xsession | 8 ++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 543f7e1..7ebd5c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,7 +41,15 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low -- Reinhard Tartler <siretart@tauware.de> Thu, 20 Dec 2012 10:15:26 +0100 -x2goserver (4.0.0.1-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low + + [ Matthew L. Dailey ] + * New upstream version (4.0.0.2): + - Do parse profile/xprofile files in X2Go's Xsession file. (Fixes: #149). + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 25 Mar 2013 22:34:11 +0100 + +x2goserver (4.0.0.1-0~x2go1) unstable; urgency=low [ Bernard Cafarelli ] * New upstream version (4.0.0.1): diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index 9fd5104..94c841e 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -49,6 +49,14 @@ internal_errormsg () { "<x2go-dev@lists.x2go.org>." } +# Load profile +for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do + if [ -f "$file" ]; then + echo "Loading profile from $file"; + . "$file" + fi +done + # initialize variables for use by all session scripts OPTIONFILE=/etc/x2go/Xsession.options hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).