The branch, master has been updated via 97378841e2201ccc3dd2eec5736e607d2d2da45e (commit) from cd23b80ca2f1056500e8b78cedebf60089086bda (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 97378841e2201ccc3dd2eec5736e607d2d2da45e Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 15 11:08:07 2013 +0100 Allow for deploying X2Go Published Applications system-wide on a per-user basis (in /etc/x2go/applications-per-user/<username>). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gogetapps | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8d32658..b6dd930 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,8 @@ x2goserver (4.0.0.1-0~x2go1) UNRELEASED; urgency=low [ Matthew L. Dailey ] * New upstream version (4.0.0.1): - Fix command/version detection for GNOME/Unity on Ubuntu. (Fixes: #105). + - Allow for deploying X2Go Published Applications system-wide on a + per-user basis (in /etc/x2go/applications-per-user/<username>). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 11 Feb 2013 11:42:32 +0100 diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps index 28842c0..39cafa2 100755 --- a/x2goserver/bin/x2gogetapps +++ b/x2goserver/bin/x2gogetapps @@ -182,7 +182,8 @@ my $file; my @dirs; @dirs[0]="/etc/x2go/applications"; my ($name, $pass, $uid, $gid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwnam(getlogin || getpwuid($<)); -@dirs[1]="$homedir/.x2go/applications"; +@dirs[1]="/etc/x2go/applications-per-user/$name"; +@dirs[2]="$homedir/.x2go/applications"; foreach(@dirs) { my $dirname=$_; 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).