[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 4.0.0.1-2-ge8b78ed

[X2Go dev team]

The branch, build-baikal has been updated
       via  e8b78edd63056c33fd0053ab00fe9f2624f727da (commit)
      from  7f482404a7a6966a4b2a2687c445b853376e310a (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                 |    6 ++++++
 x2goserver-xsession/etc/Xsession |    8 ++++++++
 x2goserver/VERSION.x2goserver    |    2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 1ce3e5b..1e277a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low
+
+  * Continue development...
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 25 Mar 2013 22:26:09 +0100
+
 x2goserver (4.0.0.1-0~x2go1) unstable; urgency=low
 
   [ Bernard Cafarelli ]
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 at 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
diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver
index 4b0a782..33d19b9 100644
--- a/x2goserver/VERSION.x2goserver
+++ b/x2goserver/VERSION.x2goserver
@@ -1 +1 @@
-4.0.0.1
\ No newline at end of file
+4.0.0.2
\ No newline at end of file


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).