The branch, master has been updated via 7f78bd30196a25001cb6b1b15fd28c861f8709fb (commit) from 34aec1aa8d42de359fa71a4646886714b95c91a2 (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 7f78bd30196a25001cb6b1b15fd28c861f8709fb Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Nov 22 20:55:54 2013 +0100 Typo fix in x2goruncommand (for MATE session startup). Conflicts (cherry-picked + resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++-- x2goserver/bin/x2goruncommand | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8e387b0..50f6066 100644 --- a/debian/changelog +++ b/debian/changelog @@ -88,13 +88,14 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low - Start/resume rootless sessions without geometry parameter. Esp. using X2GO_GEOMETRY=fullscreen for rootless sessions lead to an extra 1x1 px session window (nxagentCreateIconWindow in nxagent's Window.c). - * /debian/control: + - Typo fix in x2goruncommand (for MATE session startup). + * debian/control: + Update LONG_DESCRIPTIONS. + Move xfonts-base from Recommends: field to Depends: field (bin:package x2goserver). + Raise Standards: to 3.9.4 (no changes needed). + Move xfonts-base to Recommends: field of bin:package x2goserver. - * /debian/x2goserver.init: + * debian/x2goserver.init: + Make init script LSB compliant. [ Helmer Teles ] diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 7cc8f84..d5f39d2 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -126,7 +126,7 @@ elif ([ "$cmd" == "CINNAMON" ] || [ "$cmd" == "cinnamon" ]); then args=" --session=$DESKTOP_SESSION" elif [ "$cmd" == "MATE" ]; then - cmd=="/usr/bin/mate-session" + cmd="/usr/bin/mate-session" elif [ "$cmd" == "KDE" ]; then cmd="/usr/bin/startkde" elif [ "$cmd" == "XFCE4" ] || [ "$cmd" == "XFCE" ]; then 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).