[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.1.1.9-4-g8292c49

[X2Go dev team]

The branch, build-main has been updated
       via  8292c49e91d6ab71826715e89ee09261e4acf670 (commit)
      from  1fe04071bb1b318dfe43fcbe48e985f554b2fb79 (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        |    5 +++++
 x2goserver/bin/x2gopath |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 1ed5f76..6180211 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,11 @@ x2goserver (3.1.1.10-0~x2go1) UNRELEASED; urgency=low
       for distro packagers to tweak the installation paths of X2Go Server
       components.
 
+  [ Mike Gabriel ]
+  * New upstream version (3.1.1.10):
+    - Adapt Xinerama path in x2gopath: use $base for detecting the path to the
+      Xinerama libs, as well, as is done with all the other paths.
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 23 Nov 2012 15:35:48 +0100
 
 x2goserver (3.1.1.9-0~x2go1) unstable; urgency=low
diff --git a/x2goserver/bin/x2gopath b/x2goserver/bin/x2gopath
index 597c5c9..1001a71 100755
--- a/x2goserver/bin/x2gopath
+++ b/x2goserver/bin/x2gopath
@@ -36,7 +36,7 @@ case "$1" in
     lib) echo -n "$base/lib/x2go";;
     libexec) echo -n "$base/lib/x2go";;
     share) echo -n "$base/share/x2go";;
-    xinerama) echo -n "/usr/lib/nx/X11/Xinerama";;
+    xinerama) echo -n "$base/lib/nx/X11/Xinerama";;
     *) exit 1;;
 esac;
 


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