[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-101-g03afe80

[X2Go dev team]

The branch, master has been updated
       via  03afe809d558b5aa87205e09b28b85ca3ff1dc26 (commit)
       via  41680130f90c81d8fb2ed8d804eb4be7e43bd4d7 (commit)
      from  9ec490f2bac6bec5b7ca46195a9367f0b4dbb58d (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 03afe809d558b5aa87205e09b28b85ca3ff1dc26
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Nov 26 14:38:38 2012 +0100

    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.

commit 41680130f90c81d8fb2ed8d804eb4be7e43bd4d7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Nov 26 14:36:48 2012 +0100

    fine-tune layout of x2gopath

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

Summary of changes:
 debian/changelog        |    5 +++++
 x2goserver/bin/x2gopath |   38 ++++++++++++++++++++++++++++++++------
 2 files changed, 37 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 452d970..6a2246e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,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 6d43616..1001a71 100755
--- a/x2goserver/bin/x2gopath
+++ b/x2goserver/bin/x2gopath
@@ -1,19 +1,45 @@
 #!/bin/sh
 
+# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Copyright (C) 2012  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
+# Copyright (C) 2012  Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
+# Copyright (C) 2012  Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2012  Jan Engelhard <jengelh at inai.de>
+
+
 base="${0%/*}";
 if test "$base" = "$0"; then
 	base=".";
 fi;
+
 base=$(readlink -f "$base/..");
+
 # The following section is subject to substitution by distro packaging tools.
 case "$1" in
-base) echo -n "$base";;
-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";;
-*) exit 1;;
+    base) echo -n "$base";;
+    lib) echo -n "$base/lib/x2go";;
+    libexec) echo -n "$base/lib/x2go";;
+    share) echo -n "$base/share/x2go";;
+    xinerama) echo -n "$base/lib/nx/X11/Xinerama";;
+    *) exit 1;;
 esac;
+
 if test -t 1; then
 	echo "";
 fi;


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