[X2Go-Commits] [x2gothinclient] 02/02: Make sure that launching x2goclient via a terminal or the run command box in MATE results in the restricted TCE X2Go Client.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gothinclient.

commit f16174a067203ac64d4937dc112e51df0b02e8f4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Aug 27 09:49:04 2014 +0200

    Make sure that launching x2goclient via a terminal or the run command box in MATE results in the restricted TCE X2Go Client.
---
 debian/changelog                                   |    2 ++
 debian/x2gothinclient-minidesktop.dirs             |    3 ++-
 debian/x2gothinclient-minidesktop.links            |    1 +
 debian/x2gothinclient-minidesktop.postrm           |    3 +++
 debian/x2gothinclient-minidesktop.preinst          |    3 +++
 .../share/etc/x2gothinclient-minidesktop_start     |   20 ++++++++++----------
 6 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b88ea3d..0d31067 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,8 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low
         wheezy-backports (i.e. MATE desktop environment).
       . MATE Application menu: Move the default X2Go Client .desktop file out of the
         way (dpkg-divert) and provide the TCE's .desktop file instead.
+      . Make sure that launching x2goclient via a terminal or the run command
+        box in MATE results in the restricted TCE X2Go Client.
     - Adapt management package to TCE flavouring. Add new configuration
       option in x2gothinclient_settings: TC_FLAVOUR (can be: minidesktop or
       displaymanager).
diff --git a/debian/x2gothinclient-minidesktop.dirs b/debian/x2gothinclient-minidesktop.dirs
index c283356..1a040a8 100644
--- a/debian/x2gothinclient-minidesktop.dirs
+++ b/debian/x2gothinclient-minidesktop.dirs
@@ -1,2 +1,3 @@
 usr/share/images/desktop-base
-etc/xdg/autostart
\ No newline at end of file
+etc/xdg/autostart
+usr/lib/x2go
\ No newline at end of file
diff --git a/debian/x2gothinclient-minidesktop.links b/debian/x2gothinclient-minidesktop.links
index 5fe399b..4ea6620 100644
--- a/debian/x2gothinclient-minidesktop.links
+++ b/debian/x2gothinclient-minidesktop.links
@@ -1,2 +1,3 @@
 etc/x2go/x2gothinclient-minidesktop_background.svg usr/share/backgrounds/x2go/x2gothinclient-minidesktop_background.svg
 usr/share/applications/x2gothinclient-minidesktop.desktop etc/xdg/autostart/x2gothinclient-minidesktop.desktop
+usr/bin/x2goclient etc/x2go/x2gothinclient-minidesktop_start
diff --git a/debian/x2gothinclient-minidesktop.postrm b/debian/x2gothinclient-minidesktop.postrm
index ea85f8c..4ad6506 100755
--- a/debian/x2gothinclient-minidesktop.postrm
+++ b/debian/x2gothinclient-minidesktop.postrm
@@ -21,6 +21,9 @@ case "$1" in
 		if dpkg-divert --list | grep x2goclient.desktop.disabled-by-x2gotce 1>/dev/null 2>/dev/null; then
 			dpkg-divert --package x2gothinclient-minidesktop --remove /usr/share/applications/x2goclient.desktop
 		fi
+		if dpkg-divert --list | grep usr/lib/x2go/x2goclient 1>/dev/null 2>/dev/null; then
+			dpkg-divert --package x2gothinclient-minidesktop --remove /usr/bin/x2goclient
+		fi
 		;;
 	upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
 		;;
diff --git a/debian/x2gothinclient-minidesktop.preinst b/debian/x2gothinclient-minidesktop.preinst
index 82cf526..e274e43 100755
--- a/debian/x2gothinclient-minidesktop.preinst
+++ b/debian/x2gothinclient-minidesktop.preinst
@@ -22,6 +22,9 @@ case "$1" in
 		if ! dpkg-divert --list | grep x2goclient.desktop.disabled-by-x2gotce 1>/dev/null 2>/dev/null; then
 			dpkg-divert --add --rename --package x2gothinclient-minidesktop --divert /usr/share/applications/x2goclient.desktop.disabled-by-x2gotce /usr/share/applications/x2goclient.desktop 
 		fi
+		if ! dpkg-divert --list | grep usr/lib/x2go/x2goclient 1>/dev/null 2>/dev/null; then
+			dpkg-divert --add --rename --package x2gothinclient-minidesktop --divert /usr/lib/x2go/x2goclient /usr/bin/x2goclient
+		fi
 		;;
 	abort-upgrade)
 		;;
diff --git a/management/share/etc/x2gothinclient-minidesktop_start b/management/share/etc/x2gothinclient-minidesktop_start
index 4d8b32a..d0fed45 100755
--- a/management/share/etc/x2gothinclient-minidesktop_start
+++ b/management/share/etc/x2gothinclient-minidesktop_start
@@ -20,16 +20,16 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-/usr/bin/x2goclient --no-menu \
-                    --maximize \
-                    --link=lan \
-                    --kbd-type=auto \
-                    --set-kbd=1 \
-                    --geometry=fullscreen \
-                    --read-exports-from=~/export \
-                    --no-session-edit \
-                    --session=X2Go.Example \
-                    --add-to-known-hosts &
+/usr/lib/x2go/x2goclient --no-menu \
+                         --maximize \
+                         --link=lan \
+                         --kbd-type=auto \
+                         --set-kbd=1 \
+                         --geometry=fullscreen \
+                         --read-exports-from=~/export \
+                         --no-session-edit \
+                         --session=X2Go.Example \
+                         --add-to-known-hosts
 
 #/usr/bin/x2goclient --no-menu \
 #                    --maximize \

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git