[X2Go-Commits] x2goserver.git - build-main (branch) updated: 4.0.0.0-8-g6a78a84

X2Go dev team git-admin at x2go.org
Fri Mar 22 13:57:24 CET 2013


The branch, build-main has been updated
       via  6a78a843e29b9169ed7e64735908f308eacd4951 (commit)
       via  cbf163e5cc48f8b02caccf6cdc1b5e0c41aa6f01 (commit)
       via  c12aa8e82a53f041c64a8f8de68abba2e1108d35 (commit)
       via  df45ea1b2327e0ec7672234a7370002fc8347529 (commit)
       via  5a29dae3550069dc53ffb2d12b25bac51e02596d (commit)
       via  a147c0c3885d856a22f0fbba1191223b05564f64 (commit)
       via  397b7e0a06353a42189269334f0c889212218b9f (commit)
       via  c1be0db4c047e623650f3888ab9d9c767da38038 (commit)
      from  3bb58b5faea060b778de8a35d6f509f42a8a7e0d (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |   19 ++++++++++++++++++-
 x2goserver-compat/VERSION.x2goserver-compat        |    2 +-
 x2goserver-compat/man/man8/x2gosuspend-agent.8     |    2 +-
 x2goserver-compat/man/man8/x2gosuspend.8           |    2 +-
 x2goserver-compat/man/man8/x2goterminate.8         |    2 +-
 .../VERSION.x2goserver-extensions                  |    2 +-
 .../man/man8/x2goserver-run-extensions.8           |    2 +-
 .../VERSION.x2goserver-fmbindings                  |    2 +-
 x2goserver-fmbindings/man/man8/x2gofm.8            |    2 +-
 x2goserver-printing/VERSION.x2goserver-printing    |    2 +-
 x2goserver-printing/man/man8/x2goprint.8           |    2 +-
 x2goserver-pyhoca/VERSION.x2goserver-pyhoca        |    2 +-
 x2goserver-xsession/VERSION.x2goserver-xsession    |    2 +-
 x2goserver/Makefile                                |    6 +++++-
 x2goserver/VERSION.x2goserver                      |    2 +-
 x2goserver/bin/x2gogetapps                         |    3 ++-
 x2goserver/bin/x2goruncommand                      |   12 ++++++------
 x2goserver/man/man8/x2gobasepath.8                 |    2 +-
 x2goserver/man/man8/x2gocleansessions.8            |    2 +-
 x2goserver/man/man8/x2gocmdexitmessage.8           |    2 +-
 x2goserver/man/man8/x2godbadmin.8                  |    2 +-
 x2goserver/man/man8/x2gofeature.8                  |    2 +-
 x2goserver/man/man8/x2gofeaturelist.8              |    2 +-
 x2goserver/man/man8/x2gogetservers.8               |    2 +-
 x2goserver/man/man8/x2golistdesktops.8             |    2 +-
 x2goserver/man/man8/x2golistmounts.8               |    2 +-
 x2goserver/man/man8/x2golistsessions.8             |    4 ++--
 x2goserver/man/man8/x2golistsessions_root.8        |    2 +-
 x2goserver/man/man8/x2gomountdirs.8                |    2 +-
 x2goserver/man/man8/x2goresume-session.8           |    2 +-
 x2goserver/man/man8/x2goruncommand.8               |    2 +-
 x2goserver/man/man8/x2gosessionlimit.8             |    2 +-
 x2goserver/man/man8/x2gosetkeyboard.8              |    2 +-
 x2goserver/man/man8/x2goshowblocks.8               |    2 +-
 x2goserver/man/man8/x2gostartagent.8               |    2 +-
 x2goserver/man/man8/x2gosuspend-session.8          |    2 +-
 x2goserver/man/man8/x2goterminate-session.8        |    2 +-
 x2goserver/man/man8/x2goumount-session.8           |    2 +-
 x2goserver/man/man8/x2goversion.8                  |    2 +-
 39 files changed, 67 insertions(+), 45 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 263eb22..1ce3e5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+x2goserver (4.0.0.1-0~x2go1) unstable; urgency=low
+
+  [ Bernard Cafarelli ]
+  * New upstream version (4.0.0.1):
+    - Make CFLAGS usable in x2goserver. (Fixes: #83).
+
+  [ Matthew L. Dailey ]
+  * New upstream version (4.0.0.1):
+    - Fix command/version detection for GNOME/Unity on Ubuntu. (Fixes: #105).
+
+  [ Mike Gabriel ]
+  * New upstream version (4.0.0.1):
+    - Allow for deploying X2Go Published Applications system-wide on a
+      per-user basis (in /etc/x2go/applications-per-user/<username>).
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 22 Mar 2013 13:52:43 +0100
+
 x2goserver (4.0.0.0-0~x2go1) unstable; urgency=low
 
   [ Jan Engelhardt ]
@@ -20,7 +37,7 @@ x2goserver (4.0.0.0-0~x2go1) unstable; urgency=low
   [ Oleksandr Shneyder ]
   * New upstream version (4.0.0.0):
     - Fix SSHFS mounting from Ubuntu clients.
-    - Create /tmp/.X11-unix if not exists.
+    - Create /tmp/.X11-unix if not exists. (Fixes: #93).
 
   [ Reinhard Tartler ]
   * New upstream version (4.0.0.0):
diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat
index f69d489..4b0a782 100644
--- a/x2goserver-compat/VERSION.x2goserver-compat
+++ b/x2goserver-compat/VERSION.x2goserver-compat
@@ -1 +1 @@
-4.0.0.0
\ No newline at end of file
+4.0.0.1
\ No newline at end of file
diff --git a/x2goserver-compat/man/man8/x2gosuspend-agent.8 b/x2goserver-compat/man/man8/x2gosuspend-agent.8
index bb91061..01b73fe 100644
--- a/x2goserver-compat/man/man8/x2gosuspend-agent.8
+++ b/x2goserver-compat/man/man8/x2gosuspend-agent.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gosuspend-agent 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool (compat)"
+.TH x2gosuspend-agent 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool (compat)"
 .SH NAME
 x2gosuspend-agent \- X2Go Server Script (deprecated, shipped for compatibility with old clients)
 .SH SYNOPSIS
diff --git a/x2goserver-compat/man/man8/x2gosuspend.8 b/x2goserver-compat/man/man8/x2gosuspend.8
index a0c59ac..adcea7b 100644
--- a/x2goserver-compat/man/man8/x2gosuspend.8
+++ b/x2goserver-compat/man/man8/x2gosuspend.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gosuspend 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool (compat)"
+.TH x2gosuspend 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool (compat)"
 .SH NAME
 x2gosuspend \- X2Go Server Script (deprecated, shipped for compatibility with old clients)
 .SH SYNOPSIS
diff --git a/x2goserver-compat/man/man8/x2goterminate.8 b/x2goserver-compat/man/man8/x2goterminate.8
index f91d6b8..6b3b3ef 100644
--- a/x2goserver-compat/man/man8/x2goterminate.8
+++ b/x2goserver-compat/man/man8/x2goterminate.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goterminate 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool (compat)"
+.TH x2goterminate 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool (compat)"
 .SH NAME
 x2goterminate \- X2Go Server Script (deprecated, shipped for compatibility with old clients)
 .SH SYNOPSIS
diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions
index f69d489..4b0a782 100644
--- a/x2goserver-extensions/VERSION.x2goserver-extensions
+++ b/x2goserver-extensions/VERSION.x2goserver-extensions
@@ -1 +1 @@
-4.0.0.0
\ No newline at end of file
+4.0.0.1
\ No newline at end of file
diff --git a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8
index b8ae127..90abcc4 100644
--- a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8
+++ b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goserver-run-extensions 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2goserver-run-extensions 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2goserver-run-extensions \- Run X2Go Server Extensions
 .SH SYNOPSIS
diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings
index f69d489..4b0a782 100644
--- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings
+++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings
@@ -1 +1 @@
-4.0.0.0
\ No newline at end of file
+4.0.0.1
\ No newline at end of file
diff --git a/x2goserver-fmbindings/man/man8/x2gofm.8 b/x2goserver-fmbindings/man/man8/x2gofm.8
index 576d5e4..37bac63 100644
--- a/x2goserver-fmbindings/man/man8/x2gofm.8
+++ b/x2goserver-fmbindings/man/man8/x2gofm.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gofm 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server"
+.TH x2gofm 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server"
 .SH NAME
 x2gofm \- X2Go wrapper for Browsing X2Go Shared Folders
 .SH SYNOPSIS
diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing
index f69d489..4b0a782 100644
--- a/x2goserver-printing/VERSION.x2goserver-printing
+++ b/x2goserver-printing/VERSION.x2goserver-printing
@@ -1 +1 @@
-4.0.0.0
\ No newline at end of file
+4.0.0.1
\ No newline at end of file
diff --git a/x2goserver-printing/man/man8/x2goprint.8 b/x2goserver-printing/man/man8/x2goprint.8
index c22276a..93942b0 100644
--- a/x2goserver-printing/man/man8/x2goprint.8
+++ b/x2goserver-printing/man/man8/x2goprint.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goprint 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2goprint 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2goprint \- Process X2Go Print Job
 .SH SYNOPSIS
diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
index f69d489..4b0a782 100644
--- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
+++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
@@ -1 +1 @@
-4.0.0.0
\ No newline at end of file
+4.0.0.1
\ No newline at end of file
diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession
index f69d489..4b0a782 100644
--- a/x2goserver-xsession/VERSION.x2goserver-xsession
+++ b/x2goserver-xsession/VERSION.x2goserver-xsession
@@ -1 +1 @@
-4.0.0.0
\ No newline at end of file
+4.0.0.1
\ No newline at end of file
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index 43fdccf..4287478 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -3,6 +3,10 @@
 SRC_DIR=$(CURDIR)
 SHELL=/bin/bash
 
+CC      ?= gcc
+CFLAGS  += -fPIE
+LDFLAGS += -pie
+
 INSTALL_DIR=install -d -o root -g root -m 755
 INSTALL_FILE=install -o root -g root -m 644
 INSTALL_PROGRAM=install -o root -g root -m 755
@@ -37,7 +41,7 @@ build: build-arch build-indep
 build-arch: build_setgidwrappers
 
 build_setgidwrappers:
-	gcc -fPIE -pie $(CFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c
 
 build-indep: build_man2html
 
diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver
index f69d489..4b0a782 100644
--- a/x2goserver/VERSION.x2goserver
+++ b/x2goserver/VERSION.x2goserver
@@ -1 +1 @@
-4.0.0.0
\ No newline at end of file
+4.0.0.1
\ No newline at end of file
diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps
index dbcd8c1..8414daa 100755
--- a/x2goserver/bin/x2gogetapps
+++ b/x2goserver/bin/x2gogetapps
@@ -180,7 +180,8 @@ my $file;
 my @dirs;
 @dirs[0]="/etc/x2go/applications";
 my ($name, $pass, $uid, $gid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwnam(getlogin || getpwuid($<));
- at dirs[1]="$homedir/.x2go/applications";
+ at dirs[1]="/etc/x2go/applications-per-user/$name";
+ at dirs[2]="$homedir/.x2go/applications";
 foreach(@dirs)
 {
 	my $dirname=$_;
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 2414b2c..2f95341 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -91,13 +91,13 @@ fi
 if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then
 
 	cmd="/usr/bin/gnome-session"
-	if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE >= 11.10" | bc); then
+	if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE >= 11.10" | bc)" == "1" ]; then
 		export DESKTOP_SESSION="gnome-fallback"
 		args=" --session=$DESKTOP_SESSION"
-	elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE == 11.04" | bc); then
+	elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE == 11.04" | bc)" == "1" ]; then
 		export DESKTOP_SESSION="2d-gnome"
 		args=" --session=$DESKTOP_SESSION"
-	elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE <= 10.10" | bc); then
+	elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE <= 10.10" | bc)" == "1" ]; then
 		export DESKTOP_SESSION="gnome"
 	elif cat /etc/debian_version | egrep "^(squeeze|6\.).*" >/dev/null; then
 		export DESKTOP_SESSION="gnome"
@@ -108,13 +108,13 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then
 
 elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then
 	cmd="/usr/bin/gnome-session"
-	if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE" >= 12.10 | bc); then
+	if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" >= 12.10 | bc)" == "1" ]; then
 		export DESKTOP_SESSION="ubuntu"
 		args=" --session=$DESKTOP_SESSION"
-	elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ $(echo "$DISTRIB_RELEASE" == 11.10 | bc) || $(echo $DISTRIB_RELEASE == 12.04 | bc) ]; then
+	elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" == 11.10 | bc)" == "1" -o "$(echo $DISTRIB_RELEASE == 12.04 | bc)" == "1" ]; then
 		export DESKTOP_SESSION="ubuntu-2d"
 		args=" --session=$DESKTOP_SESSION"
-	elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE" == 11.04 | bc); then
+	elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" == 11.04 | bc)" == "1" ]; then
 		export DESKTOP_SESSION="2d-ubuntu"
 		args=" --session=$DESKTOP_SESSION"
 	fi
diff --git a/x2goserver/man/man8/x2gobasepath.8 b/x2goserver/man/man8/x2gobasepath.8
index 3388820..509768a 100644
--- a/x2goserver/man/man8/x2gobasepath.8
+++ b/x2goserver/man/man8/x2gobasepath.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gobasepath 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2gobasepath 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2gobasepath \- Detect Base Path of X2Go Server Installation
 .SH SYNOPSIS
diff --git a/x2goserver/man/man8/x2gocleansessions.8 b/x2goserver/man/man8/x2gocleansessions.8
index 0fc587b..a135867 100644
--- a/x2goserver/man/man8/x2gocleansessions.8
+++ b/x2goserver/man/man8/x2gocleansessions.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gocleansessions 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2gocleansessions 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2gocleansessions \- X2Go Server Cleanup Daemon
 .SH SYNOPSIS
diff --git a/x2goserver/man/man8/x2gocmdexitmessage.8 b/x2goserver/man/man8/x2gocmdexitmessage.8
index 7752080..db6afee 100644
--- a/x2goserver/man/man8/x2gocmdexitmessage.8
+++ b/x2goserver/man/man8/x2gocmdexitmessage.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gocmdexitmessage 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2gocmdexitmessage 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2gocmdexitmessage \- Exit Message of X2Go Command
 .SH SYNOPSIS
diff --git a/x2goserver/man/man8/x2godbadmin.8 b/x2goserver/man/man8/x2godbadmin.8
index 314e68b..d58e160 100644
--- a/x2goserver/man/man8/x2godbadmin.8
+++ b/x2goserver/man/man8/x2godbadmin.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2godbadmin 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Admin Tool"
+.TH x2godbadmin 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Admin Tool"
 .SH NAME
 x2godbadmin \- X2Go Server Database Administrator
 .SH SYNOPSIS
diff --git a/x2goserver/man/man8/x2gofeature.8 b/x2goserver/man/man8/x2gofeature.8
index facc29f..32f489b 100644
--- a/x2goserver/man/man8/x2gofeature.8
+++ b/x2goserver/man/man8/x2gofeature.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gofeature 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2gofeature 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2gofeature \- Query X2Go Feature Availability on X2Go Server
 .SH SYNOPSIS
diff --git a/x2goserver/man/man8/x2gofeaturelist.8 b/x2goserver/man/man8/x2gofeaturelist.8
index e3ec8e6..454869e 100644
--- a/x2goserver/man/man8/x2gofeaturelist.8
+++ b/x2goserver/man/man8/x2gofeaturelist.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gofeaturelist 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2gofeaturelist 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2gofeaturelist \- Query X2Go Feature List for X2Go Server
 .SH SYNOPSIS
diff --git a/x2goserver/man/man8/x2gogetservers.8 b/x2goserver/man/man8/x2gogetservers.8
index a0b03df..e0d9641 100644
--- a/x2goserver/man/man8/x2gogetservers.8
+++ b/x2goserver/man/man8/x2gogetservers.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gogetservers 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2gogetservers 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2gogetservers \- Retrieve list of available X2Go servers
 .SH SYNOPSIS
diff --git a/x2goserver/man/man8/x2golistdesktops.8 b/x2goserver/man/man8/x2golistdesktops.8
index 6dc25cf..6ea19c2 100644
--- a/x2goserver/man/man8/x2golistdesktops.8
+++ b/x2goserver/man/man8/x2golistdesktops.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2golistdesktops 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2golistdesktops 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2golistdesktops \- List Available X Desktops
 .SH SYNOPSIS
diff --git a/x2goserver/man/man8/x2golistmounts.8 b/x2goserver/man/man8/x2golistmounts.8
index d876851..2589389 100644
--- a/x2goserver/man/man8/x2golistmounts.8
+++ b/x2goserver/man/man8/x2golistmounts.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2golistmounts 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2golistmounts 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2golistmounts \- List Mounted Shares for an X2Go Session
 .SH SYNOPSIS
diff --git a/x2goserver/man/man8/x2golistsessions.8 b/x2goserver/man/man8/x2golistsessions.8
index c872745..0ee151c 100644
--- a/x2goserver/man/man8/x2golistsessions.8
+++ b/x2goserver/man/man8/x2golistsessions.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2golistsessions 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2golistsessions 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2golistsessions \- List Available X2Go Sessions for User
 .SH SYNOPSIS
@@ -23,7 +23,7 @@ a list of available X2Go sessions.
 .SH X2GO CLUSTER MODE
 If \fBx2golistsessions\fR is executed with the \fI--all-servers\fR option then the central database
 of your X2Go cluster is queried for running/suspended sessions belonging to the user executing this command.
-These sessions may be active on any of the X2Go servers within you cluster.
+These sessions may be active on any of the X2Go servers within your cluster.
 .SH RETURN VALUES
 A line-by-line list of available X2Go sessions. Each line consists of several session attribute fields separated by the pipe
 symbol (,,|'').
diff --git a/x2goserver/man/man8/x2golistsessions_root.8 b/x2goserver/man/man8/x2golistsessions_root.8
index 41e89e6..67db266 100644
--- a/x2goserver/man/man8/x2golistsessions_root.8
+++ b/x2goserver/man/man8/x2golistsessions_root.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2golistsessions_root 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Admin Tool"
+.TH x2golistsessions_root 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Admin Tool"
 .SH NAME
 x2golistsessions_root \- List X2Go Sessions for System
 .SH SYNOPSIS
diff --git a/x2goserver/man/man8/x2gomountdirs.8 b/x2goserver/man/man8/x2gomountdirs.8
index b58544a..3856b59 100644
--- a/x2goserver/man/man8/x2gomountdirs.8
+++ b/x2goserver/man/man8/x2gomountdirs.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gomountdirs 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2gomountdirs 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2gomountdirs \- Share Client-Side Folder with X2Go Session
 .SH SYNOPSIS
diff --git a/x2goserver/man/man8/x2goresume-session.8 b/x2goserver/man/man8/x2goresume-session.8
index 6a8c2a1..b31ca7e 100644
--- a/x2goserver/man/man8/x2goresume-session.8
+++ b/x2goserver/man/man8/x2goresume-session.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goresume-session 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2goresume-session 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2goresume-session \- Resume X2Go Session
 .SH SYNOPSIS
diff --git a/x2goserver/man/man8/x2goruncommand.8 b/x2goserver/man/man8/x2goruncommand.8
index 0952072..f37b828 100644
--- a/x2goserver/man/man8/x2goruncommand.8
+++ b/x2goserver/man/man8/x2goruncommand.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goruncommand 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2goruncommand 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2goruncommand \- Launch Command inside an X2Go Session
 .SH SYNOPSIS
diff --git a/x2goserver/man/man8/x2gosessionlimit.8 b/x2goserver/man/man8/x2gosessionlimit.8
index 5f35c98..68bf2fb 100644
--- a/x2goserver/man/man8/x2gosessionlimit.8
+++ b/x2goserver/man/man8/x2gosessionlimit.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gosessionlimit 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2gosessionlimit 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2gosessionlimit \- Detect Session Limit for User or Group
 .SH SYNOPSIS
diff --git a/x2goserver/man/man8/x2gosetkeyboard.8 b/x2goserver/man/man8/x2gosetkeyboard.8
index 3e9baaf..095386b 100644
--- a/x2goserver/man/man8/x2gosetkeyboard.8
+++ b/x2goserver/man/man8/x2gosetkeyboard.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gosetkeyboard 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool (PyHoca)"
+.TH x2gosetkeyboard 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool (PyHoca)"
 .SH NAME
 x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2Go Client
 .SH SYNOPSIS
diff --git a/x2goserver/man/man8/x2goshowblocks.8 b/x2goserver/man/man8/x2goshowblocks.8
index 282ebde..c8f68a6 100644
--- a/x2goserver/man/man8/x2goshowblocks.8
+++ b/x2goserver/man/man8/x2goshowblocks.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goshowblocks 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2goshowblocks 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2goshowblocks \- Show X2Go-Mounted Block Devices
 .SH SYNOPSIS
diff --git a/x2goserver/man/man8/x2gostartagent.8 b/x2goserver/man/man8/x2gostartagent.8
index 7c86d2e..b87b7e8 100644
--- a/x2goserver/man/man8/x2gostartagent.8
+++ b/x2goserver/man/man8/x2gostartagent.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gostartagent 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2gostartagent 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2gostartagent \- Start a New X2Go Session
 .SH SYNOPSIS
diff --git a/x2goserver/man/man8/x2gosuspend-session.8 b/x2goserver/man/man8/x2gosuspend-session.8
index 4646a9c..9758928 100644
--- a/x2goserver/man/man8/x2gosuspend-session.8
+++ b/x2goserver/man/man8/x2gosuspend-session.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gosuspend-session 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2gosuspend-session 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2gosuspend-session \- Suspend an X2Go Session
 .SH SYNOPSIS
diff --git a/x2goserver/man/man8/x2goterminate-session.8 b/x2goserver/man/man8/x2goterminate-session.8
index 2c72b9c..935394d 100644
--- a/x2goserver/man/man8/x2goterminate-session.8
+++ b/x2goserver/man/man8/x2goterminate-session.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goterminate-session 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2goterminate-session 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2goterminate-session \- Terminate an X2Go Session
 .SH SYNOPSIS
diff --git a/x2goserver/man/man8/x2goumount-session.8 b/x2goserver/man/man8/x2goumount-session.8
index f256d5a..2681aba 100644
--- a/x2goserver/man/man8/x2goumount-session.8
+++ b/x2goserver/man/man8/x2goumount-session.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goumount-session 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2goumount-session 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2goumount-session \- Unshare mounted Folders from X2Go Session
 .SH SYNOPSIS
diff --git a/x2goserver/man/man8/x2goversion.8 b/x2goserver/man/man8/x2goversion.8
index a7675a7..a12e2ac 100644
--- a/x2goserver/man/man8/x2goversion.8
+++ b/x2goserver/man/man8/x2goversion.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goversion 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool"
+.TH x2goversion 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool"
 .SH NAME
 x2goversion \- Retrieve Code Versions of X2Go Server Components
 .SH SYNOPSIS


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).




More information about the x2go-commits mailing list