[X2Go-Commits] [x2goserver] 01/01: x2goserver/bin/x2gopath.in: make xinerama path optional, newer releases don't use it any longer, so failures to find it should not result in a warning message.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit b3ec11982205ff6f3f4dda5baff6ad453c9229d7
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Jun 25 15:50:56 2019 +0200

    x2goserver/bin/x2gopath.in: make xinerama path optional, newer releases don't use it any longer, so failures to find it should not result in a warning message.
---
 debian/changelog           | 3 +++
 x2goserver/bin/x2gopath.in | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 785c9c8..2004626 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -147,6 +147,9 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium
       canonicalizing installed path values.
     - x2goserver/bin/x2gopath.in: avoid double slashes since we now know that
       paths will be canonical.
+    - x2goserver/bin/x2gopath.in: make xinerama path optional, newer releases
+      don't use it any longer, so failures to find it should not result in a
+      warning message.
   * debian/control:
     + Build-depend upon lsb-release for distro version detection.
   * debian/x2goserver.manpages:
diff --git a/x2goserver/bin/x2gopath.in b/x2goserver/bin/x2gopath.in
index 388cef3..ebc461a 100755
--- a/x2goserver/bin/x2gopath.in
+++ b/x2goserver/bin/x2gopath.in
@@ -71,9 +71,9 @@ fi
 typeset x2go_libpath="${base}${x2go_lib_subdir}"
 typeset x2go_sharepath="${base}${x2go_share_subdir}"
 typeset x2go_nxx11path="${base}${x2go_nxlib_subdir}/X11"
-typeset x2go_xineramapath="${base}${x2go_nxlib_subdir}/X11/Xinerama"
-desc_arr=( 'library path' 'share path' 'nx-X11 path' 'xinerama path' )
-val_arr=( 'x2go_libpath' 'x2go_sharepath' 'x2go_nxx11path' 'x2go_xineramapath' )
+typeset x2go_xineramapath="${x2go_nxx11path}/Xinerama"
+desc_arr=( 'library path' 'share path' 'nx-X11 path' )
+val_arr=( 'x2go_libpath' 'x2go_sharepath' 'x2go_nxx11path' )
 
 typeset -i i='0'
 for i in "${!desc_arr[@]}"; do

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git