[X2go-Commits] x2goserver.git - backport-lenny (branch) updated: 3.0.99-2-375-gae29f48

[X2go dev team]

The branch, backport-lenny has been updated
       via  ae29f4874f078a72455418aff1db6db82693ab59 (commit)
      from  af7cfb790ab5c105b0ac5f463905741b26fa58a9 (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 ae29f4874f078a72455418aff1db6db82693ab59
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Nov 28 08:33:09 2011 +0100

    Fix x2gobasepath for Perl versions < 5.10.x.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog            |    3 +++
 x2goserver/bin/x2gobasepath |    7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2af3cf0..2da8af7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 x2goserver (3.0.99.8-0~x2go-bpo1) unstable; urgency=low
 
   * Debian lenny backport.
+  * Cherry-picked from upcoming version (3.0.99.9):
+    - Fix for install stanzas in several Makefiles.
+    - Fix x2gobasepath for Perl versions < 5.10.x.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 20 Nov 2011 18:54:26 +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).