This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 1b65bd121e031c5d0464e2b2b545cf9d19474b85 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 14 00:24:55 2018 +0100 debian/*: Namespace change. Rename bin:pkg to x2goserver-desktopsharing. Expect system-wide config in /etc/x2go/desktopsharing. --- VERSION.x2godesktopsharing | 2 +- debian/changelog | 2 +- debian/control | 21 +++++- debian/po/POTFILES.in | 2 +- debian/po/templates.pot | 46 ++++++------- debian/rules | 14 ++-- debian/x2godesktopsharing.config | 75 ---------------------- debian/x2goserver-desktopsharing.config | 75 ++++++++++++++++++++++ ...sharing.dirs => x2goserver-desktopsharing.dirs} | 2 +- ...sharing.docs => x2goserver-desktopsharing.docs} | 0 ...g.install => x2goserver-desktopsharing.install} | 2 +- ...manpages => x2goserver-desktopsharing.manpages} | 0 ...postinst => x2goserver-desktopsharing.postinst} | 16 ++--- ...ing.postrm => x2goserver-desktopsharing.postrm} | 0 ...mplates => x2goserver-desktopsharing.templates} | 16 ++--- sharetray.cpp | 2 +- x2godesktopsharing.spec | 5 +- 17 files changed, 151 insertions(+), 129 deletions(-) diff --git a/VERSION.x2godesktopsharing b/VERSION.x2godesktopsharing index 82e63a5..69a1172 100644 --- a/VERSION.x2godesktopsharing +++ b/VERSION.x2godesktopsharing @@ -1 +1 @@ -3.1.1.5 +3.2.0.0 diff --git a/debian/changelog b/debian/changelog index c9abbca..fe97cc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -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): diff --git a/debian/control b/debian/control index 18f5789..96740dd 100644 --- a/debian/control +++ b/debian/control @@ -16,12 +16,14 @@ Homepage: https://code.x2go.org/releases/source/x2godesktopsharing Vcs-Git: git://code.x2go.org/x2godesktopsharing.git Vcs-Browser: https://code.x2go.org/gitweb?p=x2godesktopsharing.git;a=summary -Package: x2godesktopsharing +Package: x2goserver-desktopsharing Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, x2goserver (>= 4.0.0.0-0~), +Breaks: x2godesktopsharing (<< 3.2.0.0~), +Replaces: x2godesktopsharing (<< 3.2.0.0~), Description: Share X11 desktops with other users via X2Go X2Go is a server based computing environment with - session resuming @@ -35,3 +37,20 @@ Description: Share X11 desktops with other users via X2Go grant other X2Go users access to the current session (shadow session support). The current session may be an X2Go session itself or simply a local X11 session. + +Package: x2godesktopsharing +Section: oldlibs +Architecture: any +Depends: + ${misc:Depends}, + x2goserver-desktopsharing (= ${binary:Version}), +Description: Share X11 desktops with other users via X2Go (transitional package) + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + . + This package is a transitional package, it can be safely removed. diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in index 94e567d..68a5797 100644 --- a/debian/po/POTFILES.in +++ b/debian/po/POTFILES.in @@ -1 +1 @@ -[type: gettext/rfc822deb] x2godesktopsharing.templates +[type: gettext/rfc822deb] x2goserver-desktopsharing.templates diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 656070a..53db274 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: x2godesktopsharing\n" "Report-Msgid-Bugs-To: x2godesktopsharing@packages.debian.org\n" -"POT-Creation-Date: 2018-11-13 23:41+0100\n" +"POT-Creation-Date: 2018-11-14 00:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -19,13 +19,13 @@ msgstr "" #. Type: boolean #. Description -#: ../x2godesktopsharing.templates:3001 +#: ../x2goserver-desktopsharing.templates:3001 msgid "Create group for X2Go Desktop Sharing now?" msgstr "" #. Type: boolean #. Description -#: ../x2godesktopsharing.templates:3001 +#: ../x2goserver-desktopsharing.templates:3001 msgid "" "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 " @@ -35,7 +35,7 @@ msgstr "" #. Type: boolean #. Description -#: ../x2godesktopsharing.templates:3001 +#: ../x2goserver-desktopsharing.templates:3001 msgid "" "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." @@ -43,7 +43,7 @@ msgstr "" #. Type: boolean #. Description -#: ../x2godesktopsharing.templates:3001 +#: ../x2goserver-desktopsharing.templates:3001 msgid "" "If this group is not created now, you should assign this desktop sharing " "privilege to an already existing group on the next screen." @@ -51,7 +51,7 @@ msgstr "" #. Type: boolean #. Description -#: ../x2godesktopsharing.templates:3001 +#: ../x2goserver-desktopsharing.templates:3001 msgid "" "If this group is not created / not assigned, users will not be able to share " "X2Go/X11 desktop sessions with each other." @@ -59,13 +59,13 @@ msgstr "" #. Type: boolean #. Description -#: ../x2godesktopsharing.templates:4001 +#: ../x2goserver-desktopsharing.templates:4001 msgid "Use already existing groups for X2Go Desktop Sharing?" msgstr "" #. Type: boolean #. Description -#: ../x2godesktopsharing.templates:4001 +#: ../x2goserver-desktopsharing.templates:4001 msgid "" "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 " @@ -74,13 +74,13 @@ msgstr "" #. Type: string #. Description -#: ../x2godesktopsharing.templates:5001 +#: ../x2goserver-desktopsharing.templates:5001 msgid "Assign X2Go Desktop Sharing privilege to POSIX group:" msgstr "" #. Type: string #. Description -#: ../x2godesktopsharing.templates:5001 +#: ../x2goserver-desktopsharing.templates:5001 msgid "" "Please specify the name of the POSIX group that you want to assign the X2Go " "Desktop Sharing privilege to." @@ -88,25 +88,25 @@ msgstr "" #. Type: string #. Description -#: ../x2godesktopsharing.templates:5001 +#: ../x2goserver-desktopsharing.templates:5001 msgid "If you leave this empty, the \"root\" group will be used." msgstr "" #. Type: boolean #. Description -#: ../x2godesktopsharing.templates:6001 +#: ../x2goserver-desktopsharing.templates:6001 msgid "Delete the group that was formerly used for this?" msgstr "" #. Type: boolean #. Description -#: ../x2godesktopsharing.templates:6001 +#: ../x2goserver-desktopsharing.templates:6001 msgid "The group for the X2Go Desktop Sharing privilege has been modified." msgstr "" #. Type: boolean #. Description -#: ../x2godesktopsharing.templates:6001 +#: ../x2goserver-desktopsharing.templates:6001 msgid "" "Please specify whether the old group should be deleted. If unsure, keep the " "formerly used group and manually investigate later." @@ -114,13 +114,13 @@ msgstr "" #. Type: error #. Description -#: ../x2godesktopsharing.templates:7001 +#: ../x2goserver-desktopsharing.templates:7001 msgid "Non-existing group" msgstr "" #. Type: error #. Description -#: ../x2godesktopsharing.templates:7001 +#: ../x2goserver-desktopsharing.templates:7001 msgid "" "The given group does not exist on this system. You should specify an already " "existing group." @@ -128,13 +128,13 @@ msgstr "" #. Type: boolean #. Description -#: ../x2godesktopsharing.templates:8001 +#: ../x2goserver-desktopsharing.templates:8001 msgid "Auto-start X2Go Desktop Sharing applet on desktop session startup?" msgstr "" #. Type: boolean #. Description -#: ../x2godesktopsharing.templates:8001 +#: ../x2goserver-desktopsharing.templates:8001 msgid "" "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 " @@ -144,7 +144,7 @@ msgstr "" #. Type: boolean #. Description -#: ../x2godesktopsharing.templates:8001 +#: ../x2goserver-desktopsharing.templates:8001 msgid "" "The applet can be configured to start automatically on desktop session " "startup, but for security reasons this is not the default." @@ -152,13 +152,13 @@ msgstr "" #. Type: boolean #. Description -#: ../x2godesktopsharing.templates:9001 +#: ../x2goserver-desktopsharing.templates:9001 msgid "Auto-activate X2Go Desktop Sharing on desktop session startup?" msgstr "" #. Type: boolean #. Description -#: ../x2godesktopsharing.templates:9001 +#: ../x2goserver-desktopsharing.templates:9001 msgid "" "The X2Go Desktop Sharing applet normally starts in non-sharing mode (users " "that request to share the running desktop session get auto-rejected). The " @@ -167,7 +167,7 @@ msgstr "" #. Type: boolean #. Description -#: ../x2godesktopsharing.templates:9001 +#: ../x2goserver-desktopsharing.templates:9001 msgid "" "If you enabled the auto-start option in the previous screen, you can " "additionally choose here, if desktop sharing shall be activated when the " @@ -176,7 +176,7 @@ msgstr "" #. Type: boolean #. Description -#: ../x2godesktopsharing.templates:9001 +#: ../x2goserver-desktopsharing.templates:9001 msgid "" "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 " diff --git a/debian/rules b/debian/rules index bddc7fe..95a028c 100755 --- a/debian/rules +++ b/debian/rules @@ -26,13 +26,13 @@ override_dh_auto_build: qmake QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" x2godesktopsharing.pro override_dh_install: - install -m 644 x2godesktopsharing $(CURDIR)/debian/x2godesktopsharing/usr/bin/ - install -m 644 x2godesktopsharing.desktop $(CURDIR)/debian/x2godesktopsharing/usr/share/applications/ - install -m 644 icons/x2godesktopsharing.xpm $(CURDIR)/debian/x2godesktopsharing/usr/share/x2godesktopsharing/icons/x2godesktopsharing.xpm - install -m 644 icons/128x128/x2godesktopsharing.png $(CURDIR)/debian/x2godesktopsharing/usr/share/icons/hicolor/128x128/apps/x2godesktopsharing.png - install -m 644 icons/16x16/x2godesktopsharing.png $(CURDIR)/debian/x2godesktopsharing/usr/share/icons/hicolor/16x16/apps/x2godesktopsharing.png - install -m 644 icons/64x64/x2godesktopsharing.png $(CURDIR)/debian/x2godesktopsharing/usr/share/icons/hicolor/64x64/apps/x2godesktopsharing.png - install -m 644 icons/32x32/x2godesktopsharing.png $(CURDIR)/debian/x2godesktopsharing/usr/share/icons/hicolor/32x32/apps/x2godesktopsharing.png + install -m 644 x2godesktopsharing $(CURDIR)/debian/x2goserver-desktopsharing/usr/bin/ + install -m 644 x2godesktopsharing.desktop $(CURDIR)/debian/x2goserver-desktopsharing/usr/share/applications/ + install -m 644 icons/x2godesktopsharing.xpm $(CURDIR)/debian/x2goserver-desktopsharing/usr/share/x2godesktopsharing/icons/x2godesktopsharing.xpm + install -m 644 icons/128x128/x2godesktopsharing.png $(CURDIR)/debian/x2goserver-desktopsharing/usr/share/icons/hicolor/128x128/apps/x2godesktopsharing.png + install -m 644 icons/16x16/x2godesktopsharing.png $(CURDIR)/debian/x2goserver-desktopsharing/usr/share/icons/hicolor/16x16/apps/x2godesktopsharing.png + install -m 644 icons/64x64/x2godesktopsharing.png $(CURDIR)/debian/x2goserver-desktopsharing/usr/share/icons/hicolor/64x64/apps/x2godesktopsharing.png + install -m 644 icons/32x32/x2godesktopsharing.png $(CURDIR)/debian/x2goserver-desktopsharing/usr/share/icons/hicolor/32x32/apps/x2godesktopsharing.png dh_install override_dh_clean: 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/x2goserver-desktopsharing.config b/debian/x2goserver-desktopsharing.config new file mode 100755 index 0000000..5708985 --- /dev/null +++ b/debian/x2goserver-desktopsharing.config @@ -0,0 +1,75 @@ +#!/bin/sh + +set -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +# remember the formerly used (or default) group names, if any +db_get x2goserver-desktopsharing/group-sharing && db_set x2goserver-desktopsharing/last-group-sharing $RET || true + +# set the confirmation questions for group deletions always to false before we begin... +db_set x2goserver-desktopsharing/del-last-group-sharing false + +db_input high x2goserver-desktopsharing/create-group-for-sharing || true +db_go +db_get x2goserver-desktopsharing/create-group-for-sharing +create_group=$RET + +# always allow usage of existing group (also when $create_group is set) +db_set x2goserver-desktopsharing/use-existing-group-for-sharing true +if [ "$create_group" = "false" ]; then + + db_get x2goserver-desktopsharing/group-sharing + if [ -z "$RET" ] || ! getent group $RET 1>/dev/null; then + db_set x2goserver-desktopsharing/group-sharing "root" + fi + + db_input high x2goserver-desktopsharing/use-existing-group-for-sharing || true + db_go +fi + +db_get x2goserver-desktopsharing/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 x2goserver-desktopsharing/group-sharing || true + db_go + + db_get x2goserver-desktopsharing/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 x2goserver-desktopsharing/no-such-group || true + db_go + continue + fi + fi + + db_get x2goserver-desktopsharing/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 x2goserver-desktopsharing/del-last-group-sharing || true + db_go + fi + done +fi + +db_input high x2goserver-desktopsharing/auto-start-on-logon || true +db_go +db_get x2goserver-desktopsharing/auto-start-on-logon +auto_start=$RET + +if [ "$auto_start" = "true" ]; then + db_input high x2goserver-desktopsharing/auto-activate-on-logon || true + db_go +fi diff --git a/debian/x2godesktopsharing.dirs b/debian/x2goserver-desktopsharing.dirs similarity index 92% rename from debian/x2godesktopsharing.dirs rename to debian/x2goserver-desktopsharing.dirs index 64b1d6c..e20feed 100644 --- a/debian/x2godesktopsharing.dirs +++ b/debian/x2goserver-desktopsharing.dirs @@ -1,4 +1,4 @@ -etc/x2godesktopsharing +etc/x2go/desktopsharing usr/bin usr/share/applications usr/share/x2godesktopsharing diff --git a/debian/x2godesktopsharing.docs b/debian/x2goserver-desktopsharing.docs similarity index 100% rename from debian/x2godesktopsharing.docs rename to debian/x2goserver-desktopsharing.docs diff --git a/debian/x2godesktopsharing.install b/debian/x2goserver-desktopsharing.install similarity index 71% rename from debian/x2godesktopsharing.install rename to debian/x2goserver-desktopsharing.install index 741eefa..8c1decb 100644 --- a/debian/x2godesktopsharing.install +++ b/debian/x2goserver-desktopsharing.install @@ -1,4 +1,4 @@ VERSION.x2godesktopsharing usr/share/x2go/versions bin/* usr/bin/ share/* usr/share/x2go/ -debian/settings etc/x2godesktopsharing/ +debian/settings etc/x2go/desktopsharing/ diff --git a/debian/x2godesktopsharing.manpages b/debian/x2goserver-desktopsharing.manpages similarity index 100% rename from debian/x2godesktopsharing.manpages rename to debian/x2goserver-desktopsharing.manpages diff --git a/debian/x2godesktopsharing.postinst b/debian/x2goserver-desktopsharing.postinst similarity index 84% rename from debian/x2godesktopsharing.postinst rename to debian/x2goserver-desktopsharing.postinst index 438cc21..e7aac11 100755 --- a/debian/x2godesktopsharing.postinst +++ b/debian/x2goserver-desktopsharing.postinst @@ -26,16 +26,16 @@ 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 + db_get x2goserver-desktopsharing/create-group-for-sharing && x2godesktopsharing_create_group_for_sharing=$RET + db_get x2goserver-desktopsharing/use-existing-group-for-sharing && x2godesktopsharing_use_existing_group_for_sharing=$RET # remove previously used sharing group - db_get x2godesktopsharing/del-last-group-sharing + db_get x2goserver-desktopsharing/del-last-group-sharing del_last_group="$RET" if [ "$del_last_group" = "true" ]; then - db_get x2godesktopsharing/last-group-sharing + db_get x2goserver-desktopsharing/last-group-sharing last_group=$(echo $RET | cut -d" " -f1) # try to remove the formerly used sharing group; on failure, ignore it @@ -45,7 +45,7 @@ case "$1" in # create debconf-configured sharing group - db_get x2godesktopsharing/group-sharing + db_get x2goserver-desktopsharing/group-sharing # for sanity: we take everything as a group name until we find a blank... group=$(echo $RET | cut -d" " -f1) @@ -62,10 +62,10 @@ case "$1" in # 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/" + sed -i /etc/x2go/desktopsharing/settings -e "s/group=.*/group=$group/" fi - db_get x2godesktopsharing/auto-start-on-logon + db_get x2goserver-desktopsharing/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 @@ -74,7 +74,7 @@ case "$1" in rm -f /etc/xdg/autostart/x2godesktopsharing.desktop fi - db_get x2godesktopsharing/auto-activate-on-logon + db_get x2goserver-desktopsharing/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@' diff --git a/debian/x2godesktopsharing.postrm b/debian/x2goserver-desktopsharing.postrm similarity index 100% rename from debian/x2godesktopsharing.postrm rename to debian/x2goserver-desktopsharing.postrm diff --git a/debian/x2godesktopsharing.templates b/debian/x2goserver-desktopsharing.templates similarity index 87% rename from debian/x2godesktopsharing.templates rename to debian/x2goserver-desktopsharing.templates index 79241a9..ae70cea 100644 --- a/debian/x2godesktopsharing.templates +++ b/debian/x2goserver-desktopsharing.templates @@ -7,12 +7,12 @@ # Even minor modifications require translation updates and such # changes should be coordinated with translators and reviewers. -Template: x2godesktopsharing/last-group-sharing +Template: x2goserver-desktopsharing/last-group-sharing Type: string Default: Description: for internal use -Template: x2godesktopsharing/create-group-for-sharing +Template: x2goserver-desktopsharing/create-group-for-sharing Type: boolean Default: true _Description: Create group for X2Go Desktop Sharing now? @@ -30,7 +30,7 @@ _Description: Create group for X2Go Desktop Sharing now? 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 +Template: x2goserver-desktopsharing/use-existing-group-for-sharing Type: boolean Default: false _Description: Use already existing groups for X2Go Desktop Sharing? @@ -38,7 +38,7 @@ _Description: Use already existing groups for X2Go Desktop Sharing? 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 +Template: x2goserver-desktopsharing/group-sharing Type: string Default: x2godesktopsharing _Description: Assign X2Go Desktop Sharing privilege to POSIX group: @@ -47,7 +47,7 @@ _Description: Assign X2Go Desktop Sharing privilege to POSIX group: . If you leave this empty, the "root" group will be used. -Template: x2godesktopsharing/del-last-group-sharing +Template: x2goserver-desktopsharing/del-last-group-sharing Type: boolean Default: false _Description: Delete the group that was formerly used for this? @@ -56,13 +56,13 @@ _Description: Delete the group that was formerly used for this? 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 +Template: x2goserver-desktopsharing/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 +Template: x2goserver-desktopsharing/auto-start-on-logon Type: boolean Default: false _Description: Auto-start X2Go Desktop Sharing applet on desktop session startup? @@ -74,7 +74,7 @@ _Description: Auto-start X2Go Desktop Sharing applet on desktop session startup? 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 +Template: x2goserver-desktopsharing/auto-activate-on-logon Type: boolean Default: false _Description: Auto-activate X2Go Desktop Sharing on desktop session startup? diff --git a/sharetray.cpp b/sharetray.cpp index c0e34c2..cf4c445 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -604,7 +604,7 @@ void ShareTray::showList() void ShareTray::loadSystemSettings() { - QString settings_file = "/etc/x2godesktopsharing/settings"; + QString settings_file = "/etc/x2go/desktopsharing/settings"; if ( fileExists (settings_file) ) { qDebug() << "loading system-wide settings: "<<settings_file; diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 51c676b..6ec852d 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,5 +1,5 @@ Name: x2godesktopsharing -Version: 3.1.1.5 +Version: 3.2.0.0 Release: 0.0x2go1%{?dist} Summary: Share X11 desktops with other users via X2Go @@ -77,6 +77,9 @@ Requires: procps-ng BuildRoot: %{_tmppath}/%{name}-%{version}-build +%package -n x2goserver-desktopsharing +Group: Applications/Communications + %description X2Go is a server based computing environment with - session resuming -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git