This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit de57e3315f97098083325f16fd39341c322c2f7c Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jan 12 10:33:03 2018 +0100 x2goserver/bin/x2go{resume-session,runcommand}: drop obsolete and now-unused NX_XINERAMA_CONF variable. --- debian/changelog | 2 ++ x2goserver/bin/x2goresume-session | 6 ------ x2goserver/bin/x2goruncommand | 3 --- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 81469ab..20b9474 100644 --- a/debian/changelog +++ b/debian/changelog @@ -224,6 +224,8 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low is added. - x2goserver/bin/x2gostartagent: disable Xinerama support by default, more compatible with the old behavior (and python-x2go/PyHoca). + - x2goserver/bin/x2go{resume-session,runcommand}: drop obsolete and + now-unused NX_XINERAMA_CONF variable. * x2goserver.spec: - Only create session DB in x2goserver's post install script. Do use proper Requires(post) statements to make sure perl-X2Go-Server-DB and diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index f3aec12..9adbc11 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -123,12 +123,6 @@ done "${X2GO_LIB_PATH}/x2gormforward" "${SESSION_NAME}" - -NX_XINERAMA_CONF="${X2GO_ROOT}/C-${SESSION_NAME}/xinerama.conf" -if [[ -e "${NX_XINERAMA_CONF}" ]]; then - rm -- "${NX_XINERAMA_CONF}" -fi - "${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'info' "$(basename "${0}") called with options: ${*}" X2GO_TELEKINESIS_ENABLED="$(perl -e 'use X2Go::Config qw( get_config ); use X2Go::Utils qw( is_true ); my $Config= get_config(); print is_true($Config->param("telekinesis.enable"));')" diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 676b0cf..1e78808 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -49,9 +49,6 @@ X2GO_ROOT="${HOME}/.x2go" MESSAGE_FILE="$X2GO_ROOT/C-$X2GO_SESSION/cmdoutput" echo "exec $cmd" >> "$MESSAGE_FILE" -NX_XINERAMA_CONF="$X2GO_ROOT/C-$X2GO_SESSION/xinerama.conf" -export NX_XINERAMA_CONF - # make Kerberos's ticket cache known inside the X2Go session test -n $KRB5CCNAME && export KRB5CCNAME -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git