The branch, backport-lenny has been updated via 9e953070b370529ff92a5304c890619d9d9a5f80 (commit) via 0009a2cb4ab598db4810f92e43f92c7eaf1c77e4 (commit) from 79a532204cb599ed05fc8aeb1534a277c99bbe62 (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 9e953070b370529ff92a5304c890619d9d9a5f80 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 16 14:52:21 2012 +0200 Allow .desktop file parameter Terminal=... to pass through to X2Go client-side. commit 0009a2cb4ab598db4810f92e43f92c7eaf1c77e4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 16 14:48:10 2012 +0200 Allow .desktop file parameters Terminal=... and GenericName=... to pass through to X2Go client-side. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gogetapps | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index da6b1ad..2befc49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.1.1.1): - Add/fix Python X2Go folder sharing/unsharing support from Windows. - Handle whitespace in folder names appropriately. + - Allow .desktop file parameter Terminal=... to pass through to X2Go + client-side. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 04 Apr 2012 11:44:14 +0200 diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps index f95a1ee..9460cd3 100755 --- a/x2goserver/bin/x2gogetapps +++ b/x2goserver/bin/x2gogetapps @@ -120,7 +120,7 @@ sub proc_desktop_file while(!eof(F)) { my $line=<F>; - if( $line=~m/^Categories/i || $line=~m/^Name/i || $line=~m/^Comment/i || $line=~m/^Exec/i) + if( $line=~m/^Categories/i || $line=~m/^Name/i || $line=~m/^Terminal/i || $line=~m/^Comment/i || $line=~m/^Exec/i) { print $line; } 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).