[X2Go-Commits] [x2godesktopsharing] 13/13: Split out x2goserver-desktopsharing integration code into X2Go Server, only the actually Qt desktop sharing applet in this project.

git-admin at x2go.org git-admin at x2go.org
Wed Nov 14 10:08:53 CET 2018


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

x2go pushed a commit to branch master
in repository x2godesktopsharing.

commit ea19e0f83f4a4a162edd2569d8ee8c0a84aed2a4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Nov 14 09:49:12 2018 +0100

    Split out x2goserver-desktopsharing integration code into X2Go Server, only the actually Qt desktop sharing applet in this project.
---
 VERSION.x2godesktopsharing          |   2 +-
 bin/x2goresume-desktopsharing       |  39 --------------
 bin/x2gosuspend-desktopsharing      |  34 ------------
 bin/x2goterminate-desktopsharing    |  60 ---------------------
 debian/changelog                    |   6 +--
 debian/control                      |   2 +
 debian/settings                     |   2 -
 debian/x2godesktopsharing.config    |  75 --------------------------
 debian/x2godesktopsharing.dirs      |   2 -
 debian/x2godesktopsharing.docs      |   0
 debian/x2godesktopsharing.install   |   5 +-
 debian/x2godesktopsharing.manpages  |   1 -
 debian/x2godesktopsharing.postinst  | 101 ------------------------------------
 debian/x2godesktopsharing.postrm    |  40 --------------
 debian/x2godesktopsharing.templates |  92 --------------------------------
 x2godesktopsharing.spec             |  13 ++---
 16 files changed, 10 insertions(+), 464 deletions(-)

diff --git a/VERSION.x2godesktopsharing b/VERSION.x2godesktopsharing
index 82e63a5..6744a5d 100644
--- a/VERSION.x2godesktopsharing
+++ b/VERSION.x2godesktopsharing
@@ -1 +1 @@
-3.1.1.5
+3.2.0.0
\ No newline at end of file
diff --git a/bin/x2goresume-desktopsharing b/bin/x2goresume-desktopsharing
deleted file mode 100755
index c07087e..0000000
--- a/bin/x2goresume-desktopsharing
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2007-2015 X2Go Project - http://wiki.x2go.org
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Copyright (C) 2011-2015 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
-# Copyright (C) 2011-2015 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
-# Copyright (C) 2011-2015 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-
-if [ $# -eq 1   ]; then
-	SESSION_NAME=$1
-else
-	SESSION_NAME=$X2GO_SESSION
-fi
-
-X2GO_LIB_PATH=`x2gopath libexec`
-
-$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
-
-X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2)
-
-test -e $HOME/.x2go/C-$SESSION_NAME/resume-desktopsharing && {
-	rm -f $HOME/.x2go/C-$SESSION_NAME/resume-desktopsharing
-	DISPLAY=:$X2GO_DISPLAY.0 x2godesktopsharing &>/dev/null &
-}
diff --git a/bin/x2gosuspend-desktopsharing b/bin/x2gosuspend-desktopsharing
deleted file mode 100755
index 81639de..0000000
--- a/bin/x2gosuspend-desktopsharing
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2007-2015 X2Go Project - http://wiki.x2go.org
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Copyright (C) 2011-2015 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
-# Copyright (C) 2011-2015 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
-# Copyright (C) 2011-2015 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-
-if [ $# -eq 1   ]; then
-	SESSION_NAME=$1
-else
-	SESSION_NAME=$X2GO_SESSION
-fi
-
-X2GO_LIB_PATH=`x2gopath libexec`
-
-$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
-
-x2goterminate-desktopsharing $SESSION_NAME && touch $HOME/.x2go/C-$SESSION_NAME/resume-desktopsharing
diff --git a/bin/x2goterminate-desktopsharing b/bin/x2goterminate-desktopsharing
deleted file mode 100755
index 59735a0..0000000
--- a/bin/x2goterminate-desktopsharing
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2007-2015 X2Go Project - http://wiki.x2go.org
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Copyright (C) 2011-2015 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
-# Copyright (C) 2011-2015 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
-# Copyright (C) 2011-2015 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-
-if [ $# -eq 1   ]; then
-	SESSION_NAME=$1
-else
-	SESSION_NAME=$X2GO_SESSION
-fi
-
-X2GO_LIB_PATH=`x2gopath libexec`
-
-if type -p pidof 1>/dev/null 2>/dev/null; then
-    PIDOF=pidof
-elif [ -x /usr/local/sbin/pidof ]; then
-    PIDOF=/usr/local/sbin/pidof
-elif [ -x /usr/sbin/pidof ]; then
-    PIDOF=/usr/sbin/pidof
-elif [ -x /sbin/pidof ]; then
-    PIDOF=/sbin/pidof
-else
-	# no pidof utility found, get out the big hammer!!!
-	killall x2godesktopsharing
-	exit 0
-fi
-
-$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
-
-
-X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2)
-for process_id in `$PIDOF x2godesktopsharing`; do
-	env_of_process=$(cat -A /proc/$process_id/environ)
-	env_of_process=${env_of_process//^@/\\n}
-	display=$(echo -e $env_of_process | egrep "^DISPLAY=.*$" | cut -d"=" -f2)
-	if echo $display | grep ":$X2GO_DISPLAY" &>/dev/null; then
-		kill -SIGTERM $process_id
-		exit 0
-	fi
-done
-
-exit -1
diff --git a/debian/changelog b/debian/changelog
index c49bc1d..fcf49d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium
+x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium
 
   [ Mihai Moldovan ]
-  * New upstream version (3.1.1.5):
+  * New upstream version (3.2.0.0):
     - sharetray.cpp: fix misleading if indentation warning.
     - sharetray.cpp: fix another misleading if indentation warning.
   * x2godesktopsharing.spec:
@@ -19,7 +19,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium
     + Use Qt4 for SLES 11.x builds.
 
   [ Mike Gabriel ]
-  * New upstream version (3.1.1.5):
+  * New upstream version (3.2.0.0):
     - Drop KDevelop configuration files.
     - x2godesktopsharing.pro: Define TARGET as x2godesktopsharing.
     - simplelocalsocket.cpp: Stop using deprecated QString::toAscii() function
diff --git a/debian/control b/debian/control
index 18f5789..70e0c0d 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,8 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
  x2goserver (>= 4.0.0.0-0~),
+Recommends:
+ x2goserver-desktopsharing (>= 4.1.0.3~),
 Description: Share X11 desktops with other users via X2Go
  X2Go is a server based computing environment with
     - session resuming
diff --git a/debian/settings b/debian/settings
deleted file mode 100644
index fc4f7d0..0000000
--- a/debian/settings
+++ /dev/null
@@ -1,2 +0,0 @@
-[General]
-group=x2godesktopsharing
diff --git a/debian/x2godesktopsharing.config b/debian/x2godesktopsharing.config
deleted file mode 100755
index a847666..0000000
--- a/debian/x2godesktopsharing.config
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-# remember the formerly used (or default) group names, if any
-db_get x2godesktopsharing/group-sharing && db_set x2godesktopsharing/last-group-sharing $RET || true
-
-# set the confirmation questions for group deletions always to false before we begin...
-db_set x2godesktopsharing/del-last-group-sharing false
-
-db_input high x2godesktopsharing/create-group-for-sharing || true
-db_go
-db_get x2godesktopsharing/create-group-for-sharing
-create_group=$RET
-
-# always allow usage of existing group (also when $create_group is set)
-db_set x2godesktopsharing/use-existing-group-for-sharing true
-if [ "$create_group" = "false" ]; then
-
-	db_get x2godesktopsharing/group-sharing
-	if [ -z "$RET" ] || ! getent group $RET 1>/dev/null; then
-		db_set x2godesktopsharing/group-sharing "root"
-	fi
-
-	db_input high x2godesktopsharing/use-existing-group-for-sharing || true
-	db_go
-fi
-
-db_get x2godesktopsharing/use-existing-group-for-sharing
-use_existing_group=$RET
-
-if [ "$create_group" = "true" ] || [ "$use_existing_group" = "true" ]; then
-
-	loop=1
-	while [ $loop -eq 1 ]; do
-		db_input high x2godesktopsharing/group-sharing || true
-		db_go
-
-		db_get x2godesktopsharing/group-sharing
-		group_sharing=$RET
-		if getent group $group_sharing 1>/dev/null; then
-			loop=0
-		else
-			if [ "$create_group" = "true" ]; then
-				loop=0
-			else
-				db_input critical x2godesktopsharing/no-such-group || true
-				db_go
-				continue
-			fi
-		fi
-
-		db_get x2godesktopsharing/last-group-sharing
-		if [ -z "$RET" ] || ! getent group $RET 1>/dev/null; then
-			RET="root"
-		fi
-		if [ "$RET" != "$group_sharing" ] && [ $(getent group $RET | cut -d ":" -f 3) -ge 100 ]; then
-			db_input critical x2godesktopsharing/del-last-group-sharing || true
-			db_go
-		fi
-	done
-fi
-
-db_input high x2godesktopsharing/auto-start-on-logon || true
-db_go
-db_get x2godesktopsharing/auto-start-on-logon
-auto_start=$RET
-
-if [ "$auto_start" = "true" ]; then
-	db_input high x2godesktopsharing/auto-activate-on-logon || true
-	db_go
-fi
diff --git a/debian/x2godesktopsharing.dirs b/debian/x2godesktopsharing.dirs
index 64b1d6c..7509052 100644
--- a/debian/x2godesktopsharing.dirs
+++ b/debian/x2godesktopsharing.dirs
@@ -1,4 +1,3 @@
-etc/x2godesktopsharing
 usr/bin
 usr/share/applications
 usr/share/x2godesktopsharing
@@ -7,5 +6,4 @@ usr/share/icons/hicolor/128x128/apps
 usr/share/icons/hicolor/16x16/apps
 usr/share/icons/hicolor/64x64/apps
 usr/share/icons/hicolor/32x32/apps
-usr/share/x2go
 usr/share/x2go/versions
diff --git a/debian/x2godesktopsharing.docs b/debian/x2godesktopsharing.docs
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/x2godesktopsharing.install b/debian/x2godesktopsharing.install
index 741eefa..c6b2e30 100644
--- a/debian/x2godesktopsharing.install
+++ b/debian/x2godesktopsharing.install
@@ -1,4 +1 @@
-VERSION.x2godesktopsharing      usr/share/x2go/versions
-bin/*                           usr/bin/
-share/*                         usr/share/x2go/
-debian/settings	                etc/x2godesktopsharing/
+VERSION.x2godesktopsharing usr/share/x2go/versions/
\ No newline at end of file
diff --git a/debian/x2godesktopsharing.manpages b/debian/x2godesktopsharing.manpages
index ad46900..ea6a14e 100644
--- a/debian/x2godesktopsharing.manpages
+++ b/debian/x2godesktopsharing.manpages
@@ -1,2 +1 @@
 man/man1/x2godesktopsharing.1
-man/man8/x2go*-desktopsharing.8
diff --git a/debian/x2godesktopsharing.postinst b/debian/x2godesktopsharing.postinst
deleted file mode 100755
index 438cc21..0000000
--- a/debian/x2godesktopsharing.postinst
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# postinst script for x2godesktopsharing
-#
-# see: dh_installdeb(1)
-
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-case "$1" in
-	configure)
-
-	# fetch debconf-variables for x2godesktopsharing
-	db_get x2godesktopsharing/create-group-for-sharing && x2godesktopsharing_create_group_for_sharing=$RET
-	db_get x2godesktopsharing/use-existing-group-for-sharing && x2godesktopsharing_use_existing_group_for_sharing=$RET
-
-	# remove previously used sharing group
-
-	db_get x2godesktopsharing/del-last-group-sharing
-	del_last_group="$RET"
-
-	if [ "$del_last_group" = "true" ]; then
-		db_get x2godesktopsharing/last-group-sharing
-		last_group=$(echo $RET | cut -d" " -f1)
-
-		# try to remove the formerly used sharing group; on failure, ignore it
-		getent group $last_group 1>/dev/null && delgroup "$last_group" || \
-			echo "Removing Posix previous X2Go Desktop Sharing group »$last_group« failed."
-	fi
-
-	# create debconf-configured sharing group
-
-	db_get x2godesktopsharing/group-sharing
-	# for sanity: we take everything as a group name until we find a blank...
-	group=$(echo $RET | cut -d" " -f1)
-
-	if [ "$x2godesktopsharing_create_group_for_sharing" = "true" ] && [ "x$group" != "x" ]; then
-		if echo "$group" | egrep '^[[:digit:]]{1,5}$' 1>/dev/null; then
-			echo "Specified sharing group is a gidNumber, not creating any group." 1>&2
-		elif ! getent group $group >/dev/null; then
-			echo "Creating $group group." 1>&2
-			addgroup --system $group
-		else
-			echo "Group »$group« already exists." 1>&2
-		fi
-	fi
-
-	# finally tweak X2Go Desktop Sharing's configuration file and adapt the group parameter
-	if [ -n "$group" ]; then
-		sed -i /etc/x2godesktopsharing/settings -e "s/group=.*/group=$group/"
-	fi
-
-	db_get x2godesktopsharing/auto-start-on-logon
-	if [ "$RET" = "true" ] && [ ! -e /etc/xdg/autostart/x2godesktopsharing.desktop ]; then
-		echo "Setting up system-wide XDG autostart for X2Go Desktop Sharing."
-		cp /usr/share/applications/x2godesktopsharing.desktop /etc/xdg/autostart/x2godesktopsharing.desktop
-	elif [ "$RET" = "false" ] && [ -f /etc/xdg/autostart/x2godesktopsharing.desktop ]; then
-		echo "Disabling system-wide XDG autostart for X2Go Desktop Sharing."
-		rm -f /etc/xdg/autostart/x2godesktopsharing.desktop
-	fi
-
-	db_get x2godesktopsharing/auto-activate-on-logon
-	if [ "$RET" = "true" ] && [ -e /etc/xdg/autostart/x2godesktopsharing.desktop ]; then
-		echo "Setting up system-wide auto-activation of X2Go Desktop Sharing."
-		sed -i /etc/xdg/autostart/x2godesktopsharing.desktop -e 's@^Exec=.*@Exec=/usr/bin/x2godesktopsharing --activate-desktop-sharing@'
-	elif [ "$RET" = "false" ] && [ -e /etc/xdg/autostart/x2godesktopsharing.desktop ]; then
-		echo "Disabling system-wide auto-activation of X2Go Desktop Sharing."
-		sed -i /etc/xdg/autostart/x2godesktopsharing.desktop -e 's@^Exec=.*@Exec=/usr/bin/x2godesktopsharing@'
-	fi
-	;;
-
-	abort-upgrade|abort-remove|abort-deconfigure)
-	;;
-
-	*)
-		echo "postinst called with unknown argument \`$1'" >&2
-		exit 1
-	;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/x2godesktopsharing.postrm b/debian/x2godesktopsharing.postrm
deleted file mode 100755
index 60c06b6..0000000
--- a/debian/x2godesktopsharing.postrm
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-# postrm script for x2godesktopsharing
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-set -e
-
-case "${1}" in
-	'purge')
-		getent 'group' 'x2godesktopsharing' >'/dev/null' && delgroup 'x2godesktopsharing'
-		;;
-
-	'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear')
-		;;
-
-	*)
-		echo "postrm called with unknown argument '${1}'" >&2
-		exit '1'
-		;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit '0'
diff --git a/debian/x2godesktopsharing.templates b/debian/x2godesktopsharing.templates
deleted file mode 100644
index 79241a9..0000000
--- a/debian/x2godesktopsharing.templates
+++ /dev/null
@@ -1,92 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: x2godesktopsharing/last-group-sharing
-Type: string
-Default:
-Description: for internal use
-
-Template: x2godesktopsharing/create-group-for-sharing
-Type: boolean
-Default: true
-_Description: Create group for X2Go Desktop Sharing now?
- In X2Go Desktop Sharing users gain the privilege to share one another's
- X2Go/X11 desktop session by being members of a common POSIX group. The
- POSIX group being used for this can be configured system-wide and on a
- per user basis.
- .
- In X2Go Desktop Sharing's user configuration you can adjust what group
- to use for this later on. Here, you are asked for the system-wide default.
- .
- If this group is not created now, you should assign this desktop sharing
- privilege to an already existing group on the next screen.
- .
- If this group is not created / not assigned, users will not be able to share
- X2Go/X11 desktop sessions with each other.
-
-Template: x2godesktopsharing/use-existing-group-for-sharing
-Type: boolean
-Default: false
-_Description: Use already existing groups for X2Go Desktop Sharing?
- If a group appropriate for being assigned the desktop sharing privilege has
- already been created (e.g. in an LDAP user/group database) then you can
- specify this group name on the next screen.
-
-Template: x2godesktopsharing/group-sharing
-Type: string
-Default: x2godesktopsharing
-_Description: Assign X2Go Desktop Sharing privilege to POSIX group:
- Please specify the name of the POSIX group that you want to assign the
- X2Go Desktop Sharing privilege to.
- .
- If you leave this empty, the "root" group will be used.
-
-Template: x2godesktopsharing/del-last-group-sharing
-Type: boolean
-Default: false
-_Description: Delete the group that was formerly used for this?
- The group for the X2Go Desktop Sharing privilege has been modified.
- .
- Please specify whether the old group should be deleted. If unsure,
- keep the formerly used group and manually investigate later.
-
-Template: x2godesktopsharing/no-such-group
-Type: error
-_Description: Non-existing group
- The given group does not exist on this system. You should specify an
- already existing group.
-
-Template: x2godesktopsharing/auto-start-on-logon
-Type: boolean
-Default: false
-_Description: Auto-start X2Go Desktop Sharing applet on desktop session startup?
- For an X2Go/X11 desktop session to be accessible via X2Go Desktop
- Sharing, the X2Go Desktop Sharing applet needs to be running. It
- advertises the users X2Go/X11 session through an access controlled
- socket to X2Go client applications.
- .
- The applet can be configured to start automatically on desktop session
- startup, but for security reasons this is not the default.
-
-Template: x2godesktopsharing/auto-activate-on-logon
-Type: boolean
-Default: false
-_Description: Auto-activate X2Go Desktop Sharing on desktop session startup?
- The X2Go Desktop Sharing applet normally starts in non-sharing mode
- (users that request to share the running desktop session get
- auto-rejected). The user normally has to actively activate the sharing
- mode in the applet's GUI.
- .
- If you enabled the auto-start option in the previous screen, you can
- additionally choose here, if desktop sharing shall be activated when the
- X2Go Desktop Sharing applet is auto-started at session logon.
- .
- For security and data protection reasons, this is not the default. Use
- this auto-activation feature only in appropriate environments (e.g.
- on class room computers).
diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec
index 51c676b..4ff224e 100644
--- a/x2godesktopsharing.spec
+++ b/x2godesktopsharing.spec
@@ -107,7 +107,7 @@ make %{?_smp_mflags}
 
 
 %install
-mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_datadir}/{applications,x2go}
+mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_datadir}/x2go/versions
 cp -p %{name} %{buildroot}%{_bindir}/
 desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop
 mkdir -p %{buildroot}%{_datadir}/%{name}/icons
@@ -118,7 +118,7 @@ install -p -m 644 icons/16x16/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/
 install -p -m 644 icons/64x64/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 install -p -m 644 icons/32x32/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 install -p -m 755 bin/* %{buildroot}%{_bindir}/
-cp -rp share/* %{buildroot}%{_datadir}/x2go/
+install -p -m 644 VERSION.x2godesktopsharing %{buildroot}%{_datadir}/x2go/versions/VERSION.x2godesktopsharing
 cp -rp man %{buildroot}%{_datadir}/
 %if 0%{?suse_version} && 0%{?suse_version} <= 1130
 %suse_update_desktop_file -n %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -147,9 +147,6 @@ fi
 %doc debian/changelog
 %doc debian/copyright
 %{_bindir}/%{name}
-%{_bindir}/x2goresume-desktopsharing
-%{_bindir}/x2gosuspend-desktopsharing
-%{_bindir}/x2goterminate-desktopsharing
 %{_datadir}/applications/%{name}.desktop
 %dir %{_datadir}/%{name}/
 %{_datadir}/%{name}/
@@ -163,16 +160,12 @@ fi
 %dir %{_datadir}/icons/hicolor/64x64
 %dir %{_datadir}/icons/hicolor/64x64/apps
 %dir %{_datadir}/x2go
-%dir %{_datadir}/x2go/x2gofeature.d
+%{_datadir}/x2go/versions/VERSION.x2godesktopsharing
 %{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 %{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_datadir}/icons/hicolor/64x64/apps/%{name}.png
-%{_datadir}/x2go/x2gofeature.d/%{name}.features
 %{_mandir}/man1/%{name}.1.gz
-%{_mandir}/man8/x2goresume-desktopsharing.8.gz
-%{_mandir}/man8/x2gosuspend-desktopsharing.8.gz
-%{_mandir}/man8/x2goterminate-desktopsharing.8.gz
 
 
 %changelog

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git


More information about the x2go-commits mailing list