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 4dfc9c8e8e123cc7a0e9a1b2d054c02257685d87 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 21 14:26:33 2014 +0100 import changelog entry from LTS branch Conflicts (resolved by Mike Gabriel) debian/changelog --- debian/changelog | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 91053e4..0076aef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -223,7 +223,14 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low x2goserver (4.0.0.12-0x2go1) UNRELEASED; urgency=low - * Continue development on LTS release branch... + * Adopt this patch from stable release branch and apply to LTS branch: + - 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). + - Fix x2goresume-session. The several parameters placed into the NX options + file are expected by x2goresume-session at very specific positions. This + we broke by trying to fix the fullscreen/geometry issue in x2gostartagent. + Thanks to Harvey Eneman for tracking this down!!! -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 21 Feb 2014 14:25:43 +0100 @@ -232,7 +239,6 @@ x2goserver (4.0.0.11-0x2go1) unstable; urgency=low * New upstream version (4.0.0.11): - Use perl instead of sed for search+replace in session names sanitizing. (Fixes: #404). - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 20 Jan 2014 14:00:42 +0100 x2goserver (4.0.0.10-0x2go1) unstable; urgency=low -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git