[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99.8-17-g39d5ce8

[X2Go dev team]

The branch, build-baikal has been updated
       via  39d5ce818f845fe1f613a5efef1311bd33eee520 (commit)
      from  e313dbe0d454ac23db65c8955bc85dc97fd9d960 (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            |    1 +
 x2goserver/bin/x2gobasepath |    7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a99f1be..0131d53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ x2goserver (3.0.99.9-0~x2go1) UNRELEASED; urgency=low
     - Give X2Go session windows a human readable title.
     - Desktop sharing: fix username of user who requests desktop sharing.
     - Allow client-side setting of session window title.
+    - Fix x2gobasepath for Perl versions < 5.10.x.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 25 Nov 2011 11:38:46 +0100
 
diff --git a/x2goserver/bin/x2gobasepath b/x2goserver/bin/x2gobasepath
index 4f9198b..1716538 100755
--- a/x2goserver/bin/x2gobasepath
+++ b/x2goserver/bin/x2gobasepath
@@ -21,9 +21,10 @@
 
 use strict;
 use Cwd;
-use Cwd 'abs_path';
+use Cwd q{abs_path};
+use File::Basename;
 
-my $dir = getcwd;
-my $base_path = abs_path("$0/../.."); 
+my $dir = dirname($0);
+my $base_path = abs_path("$dir/.."); 
 
 print "$base_path";


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