This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 95e7330fee264b66af89258430c4b3899c6f7efb Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Fri May 18 11:10:01 2018 +0200 fix Xorg checking in x2gothinclientd. --- debian/changelog | 1 + displaymanager/sbin/x2gothinclientd | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4f495e6..7f91bd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -149,6 +149,7 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low * modify x2gothinclientd to start scripts needed by gpg agent. * install meta-package for linux-image to get most recent version. Thanks to Mike for the hint. * start openbox to make xinerama work. Thanks to Walid Moghrabi for the hint. + * fix Xorg checking in x2gothinclientd. [ Martti Pitkänen ] * debian/po: diff --git a/displaymanager/sbin/x2gothinclientd b/displaymanager/sbin/x2gothinclientd index c4d059a..c2806ef 100755 --- a/displaymanager/sbin/x2gothinclientd +++ b/displaymanager/sbin/x2gothinclientd @@ -37,7 +37,7 @@ sub catch_term sub check_x { my $x=`ps ax | grep X`; - if ( $x=~m/usr.bin.(Xorg|X)/ ) + if ( $x=~m/Xorg/ ) { return 1; } @@ -173,13 +173,13 @@ elsif ($pid == 0 ) # above where (defined($this_display)) is the conditional $this_display = $next_display; } - } + # set screen background to X2Go default blue on all detected screens + `DISPLAY=:0 xsetroot -solid "#246ed8"`; - # set screen background to X2Go default blue on all detected screens - `DISPLAY=:0 xsetroot -solid "#246ed8"`; + #start openbox + qx(su - x2gothinclient -c \"export DISPLAY=:0; /usr/bin/openbox --config-file /etc/x2go/openbox2go.xml 1>/dev/null 2>/dev/null&\"); - #start openbox - qx(su - x2gothinclient -c \"export DISPLAY=:0; /usr/bin/openbox --config-file /etc/x2go/openbox2go.xml 1>/dev/null 2>/dev/null\"); + } # test if pulseaudio is running, if not launch it... if ( !check_pulse() ) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 5bbc658d24e26f822bb5b2400878508b80a045af Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Fri May 18 11:15:48 2018 +0200 add openbox dependency. --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 47a736b..1ddf63a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -151,6 +151,7 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low * start openbox to make xinerama work. Thanks to Walid Moghrabi for the hint. * fix Xorg checking in x2gothinclientd. * remove nomedeset option from x2go-tce.cfg. This option prevent loading of drm and disabling advanced graphic functions. + * add openbox dependency. [ Martti Pitkänen ] * debian/po: diff --git a/debian/control b/debian/control index c60298c..3f96655 100644 --- a/debian/control +++ b/debian/control @@ -80,6 +80,7 @@ Depends: plymouth-themes-all, pulseaudio-x11 | pulseaudio, dbus-x11, + openbox, dbus-user-session, syslinux, x2gothinclient-displaymanager | x2gothinclient-minidesktop, -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git