This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/4.0.1.x in repository x2goserver. from 86a0e42 x2goserver/bin/x2gomountdirs: remove blowfish Cipher spec hardcoded for sshfs mounts. new c3eb995 debian/control: maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. new e49f7c4 x2goserver/bin/x2goruncommand: whitespace only. new 5aa8fd6 x2goserver/bin/x2goruncommand: capture x2goruncommand debug output for x2gofeature X2GO_XSESSION. Fixes: #1035. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 7 ++++ debian/control | 2 +- x2goserver/bin/x2goruncommand | 74 ++++++++++++++++++++--------------------- 3 files changed, 45 insertions(+), 38 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit c3eb995d05ce09c08336cb061b207d9891ca64ea Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 11 23:01:05 2016 +0200 debian/control: maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. Cherry-picked from master branch. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b6f69d3..9b9fa7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -97,6 +97,7 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low * debian/control: - Add new dependency on bash. - Add new dependency on xkb-data to x2goserver. + - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. [ Henning Heinold ] * New upstream version (4.0.1.20): diff --git a/debian/control b/debian/control index 94e8409..aa46787 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: x2goserver Section: x11 Priority: optional -Maintainer: X2Go Developers <x2go-dev@lists.berlios.de> +Maintainer: X2Go Developers <x2go-dev@lists.x2go.org> Uploaders: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit e49f7c4777a852fea94e8cfaec9f99d4fc50a5fc Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Feb 25 15:21:04 2016 +0100 x2goserver/bin/x2goruncommand: whitespace only. --- debian/changelog | 1 + x2goserver/bin/x2goruncommand | 72 ++++++++++++++++++++--------------------- 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9b9fa7c..0341f08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -81,6 +81,7 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low (unless talking about high-bandwidth links) and more importantly recent OpenSSH server versions seem to disable the Blowfish cipher by default, leading to errors like "Connection reset by peer." + - x2goserver/bin/x2goruncommand: whitespace only. * x2goserver.spec: - Add sudo and logcheck as BuildRequires and Requires. Don't own directories that are owned by sudo and logcheck. Logcheck is not diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 43b4064..9136bc7 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -72,8 +72,8 @@ export SSH_AUTH_SOCK="$X2GOSSH_AUTH_SOCK" NX_XINERAMA_LIBS="$(x2gopath xinerama)" NX_LIBS="$(x2gopath nx-x11)" test -n "$LD_LIBRARY_PATH" && \ - LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS:$LD_LIBRARY_PATH" || \ - LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS" + LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS:$LD_LIBRARY_PATH" || \ + LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS" "$X2GO_LIB_PATH/x2gosyslog" "$0" "debug" "exporting LD_LIBRARY_PATH=$LD_LIBRARY_PATH" export LD_LIBRARY_PATH @@ -99,33 +99,33 @@ fi # To make the GNOME variants start up properly on Ubuntu, we have to make the following differentiations # Ubuntu 10.10 and earlier (maverick): -# GNOME -> gnome-session -# (would start GNOME2) +# GNOME -> gnome-session +# (would start GNOME2) # Ubuntu 11.04 (natty): -# GNOME -> gnome-session --session=2d-gnome -# UNITY -> gnome-session --session=2d-ubuntu -# (GNOME3 based desktop shells) +# GNOME -> gnome-session --session=2d-gnome +# UNITY -> gnome-session --session=2d-ubuntu +# (GNOME3 based desktop shells) # Ubuntu 11.10 (oneiric) & 12.04 (precise): -# GNOME -> gnome-session --session=gnome-fallback -# UNITY -> gnome-session --session=ubuntu-2d -# (GNOME3 based desktop shells) +# GNOME -> gnome-session --session=gnome-fallback +# UNITY -> gnome-session --session=ubuntu-2d +# (GNOME3 based desktop shells) # Ubuntu 12.10 (quantal): -# GNOME -> gnome-session --session=gnome-fallback -# UNITY -> gnome-session --session=ubuntu -# (GNOME3 based desktop shells) +# GNOME -> gnome-session --session=gnome-fallback +# UNITY -> gnome-session --session=ubuntu +# (GNOME3 based desktop shells) # Ubuntu 13.10 (raring) and later: -# GNOME -> gnome-session --session=gnome-flashback -# UNITY -> gnome-session --session=ubuntu -# (GNOME3 based desktop shells) -# Additionally, $GTK_MODULES must include "unity-gtk-module". -# $GTK_MODULES does not need tha value for any other distro -# or any earlier release of Ubuntu. +# GNOME -> gnome-session --session=gnome-flashback +# UNITY -> gnome-session --session=ubuntu +# (GNOME3 based desktop shells) +# Additionally, $GTK_MODULES must include "unity-gtk-module". +# $GTK_MODULES does not need tha value for any other distro +# or any earlier release of Ubuntu. # -# The logic for launching GNOME should be generic enough -# to work with every other distro. +# The logic for launching GNOME should be generic enough +# to work with every other distro. # -# Also, it appears that some Linux GNOME2 distros need DESKTOP_SESSION="gnome" -# while others do not. +# Also, it appears that some Linux GNOME2 distros need DESKTOP_SESSION="gnome" +# while others do not. if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then cmd="/usr/bin/gnome-session" @@ -137,20 +137,20 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then export GTK_MODULES="$GTK_MODULES:unity-gtk-module" fi args=" --session=$DESKTOP_SESSION" - elif [ -e /usr/share/gnome-session/sessions/gnome-flashback.session ]; then - export DESKTOP_SESSION="gnome-flashback" - args=" --session=$DESKTOP_SESSION" - elif [ -e /usr/share/gnome-session/sessions/gnome-fallback.session ]; then - export DESKTOP_SESSION="gnome-fallback" - args=" --session=$DESKTOP_SESSION" - elif [ -e /usr/share/gnome-session/sessions/2d-gnome.session ]; then - export DESKTOP_SESSION="2d-gnome" - args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE <= 10.10" | bc)" == "1" ]; then - export DESKTOP_SESSION="gnome" + elif [ -e /usr/share/gnome-session/sessions/gnome-flashback.session ]; then + export DESKTOP_SESSION="gnome-flashback" + args=" --session=$DESKTOP_SESSION" + elif [ -e /usr/share/gnome-session/sessions/gnome-fallback.session ]; then + export DESKTOP_SESSION="gnome-fallback" + args=" --session=$DESKTOP_SESSION" + elif [ -e /usr/share/gnome-session/sessions/2d-gnome.session ]; then + export DESKTOP_SESSION="2d-gnome" + args=" --session=$DESKTOP_SESSION" + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE <= 10.10" | bc)" == "1" ]; then + export DESKTOP_SESSION="gnome" elif cat /etc/debian_version | egrep "^(squeeze|6\.).*" >/dev/null; then - export DESKTOP_SESSION="gnome" - fi + export DESKTOP_SESSION="gnome" + fi elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then cmd="/usr/bin/gnome-session" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit 5aa8fd64c54c5ba8fac2832fcce3b92b92b83433 Author: Tor Perkins <x2go34@noid.net> Date: Mon Jun 20 02:18:58 2016 +0200 x2goserver/bin/x2goruncommand: capture x2goruncommand debug output for x2gofeature X2GO_XSESSION. Fixes: #1035. --- debian/changelog | 5 +++++ x2goserver/bin/x2goruncommand | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0341f08..317fdf0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -121,6 +121,11 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low - x2goserver/bin/x2goruncommand: add the other trinity launcher scripts in order from newest to oldest. Fixes: #985. + [ Tor Perkins ] + * New upstream version (4.0.1.20): + - x2goserver/bin/x2goruncommand: capture x2goruncommand debug output for + x2gofeature X2GO_XSESSION. + -- X2Go Release Manager <git-admin@x2go.org> Tue, 24 Feb 2015 22:11:49 +0100 x2goserver (4.0.1.19-0x2go2) UNRELEASED; urgency=low diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 9136bc7..8c3ee62 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -313,7 +313,7 @@ if [ "$EXEC" != "" ] && [ -x "$EXEC" ]; then if x2gofeature X2GO_XSESSION &>/dev/null && [ "x$X2GO_SESS_TYPE" = "xD" ]; then STARTUP="$cmd$args" "$X2GO_LIB_PATH/x2gosyslog" "$0" "notice" "launching session with Xsession-x2go mechanism, using STARTUP=\"$STARTUP\"" - XSESSION_EXEC="$cmd" STARTUP="/usr/bin/env LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ${STARTUP}" /etc/x2go/Xsession + XSESSION_EXEC="$cmd" STARTUP="/usr/bin/env LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ${STARTUP}" /etc/x2go/Xsession >> "$MESSAGE_FILE" 2>&1 else "$X2GO_LIB_PATH/x2gosyslog" "$0" "debug" "executing command \"$cmd$args\"..." -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org