The branch, master has been updated via 90878489a1334d9d840556e0b2e69a47425c1658 (commit) from 5fc6add53c7495f331f9e381324c34b1ffd21d75 (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 90878489a1334d9d840556e0b2e69a47425c1658 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. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- x2goserver/bin/x2gogetapps | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2f86d0e..72ad6f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,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 parameters Terminal=... and GenericName=... to pass - through to X2Go client-side. + - 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 5f5a7a6..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/^GenericName/i || $line=~m/^Terminal/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).