This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 52a9f44d6594886f1dedd3bbb4cc5be2b7eb52f4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 14 10:06:04 2018 +0100 Revert "x2godesktopsharing.spec: keep x2godesktopsharing name in most locations." This reverts commit bf32771e72ed2a118559b0cf214f0edecc943412. --- debian/changelog | 1 - x2godesktopsharing.spec | 45 ++++++++++++++++++++++----------------------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index 91cafec..bca62a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,7 +24,6 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium + Fix typo in %pre scriptlet package name. + Really fix the typo. + Completely rename to x2goserver-desktopsharing, drop name overrides. - + Keep x2godesktopsharing name in most locations. [ Mike Gabriel ] * New upstream version (3.1.1.5): diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 30a9e2b..dadcea7 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,4 +1,3 @@ -%global my_name x2godesktopsharing Name: x2goserver-desktopsharing Version: 3.2.0.0 Release: 0.0x2go1%{?dist} @@ -12,8 +11,8 @@ Group: Applications/Communications License: GPLv2+ %endif URL: http://www.x2go.org -Source0: http://code.x2go.org/releases/source/%{my_name}/%{my_name}-%{version}.tar.gz -Source1: %{my_name}-rpmlintrc +Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz +Source1: %{name}-rpmlintrc %if 0%{?suse_version} && 0%{?suse_version} <= 1130 BuildRequires: update-desktop-files @@ -75,7 +74,7 @@ Requires: procps-ng %endif %endif -BuildRoot: %{_tmppath}/%{my_name}-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: x2godesktopsharing Provides: x2godesktopsharing = %{version}-%{release} @@ -111,20 +110,20 @@ make %{?_smp_mflags} %install mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_datadir}/{applications,x2go} -cp -p %{my_name} %{buildroot}%{_bindir}/ -desktop-file-install --dir %{buildroot}%{_datadir}/applications %{my_name}.desktop -mkdir -p %{buildroot}%{_datadir}/%{my_name}/icons -install -p -m 644 icons/%{my_name}.xpm %{buildroot}%{_datadir}/%{my_name}/icons/%{my_name}.xpm +cp -p %{name} %{buildroot}%{_bindir}/ +desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop +mkdir -p %{buildroot}%{_datadir}/%{name}/icons +install -p -m 644 icons/%{name}.xpm %{buildroot}%{_datadir}/%{name}/icons/%{name}.xpm mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,64x64,128x128}/apps -install -p -m 644 icons/128x128/%{my_name}.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{my_name}.png -install -p -m 644 icons/16x16/%{my_name}.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{my_name}.png -install -p -m 644 icons/64x64/%{my_name}.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{my_name}.png -install -p -m 644 icons/32x32/%{my_name}.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{my_name}.png +install -p -m 644 icons/128x128/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png +install -p -m 644 icons/16x16/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png +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/ cp -rp man %{buildroot}%{_datadir}/ %if 0%{?suse_version} && 0%{?suse_version} <= 1130 -%suse_update_desktop_file -n %{buildroot}%{_datadir}/applications/%{my_name}.desktop +%suse_update_desktop_file -n %{buildroot}%{_datadir}/applications/%{name}.desktop %endif @@ -149,13 +148,13 @@ fi %defattr(-,root,root) %doc debian/changelog %doc debian/copyright -%{_bindir}/%{my_name} +%{_bindir}/%{name} %{_bindir}/x2goresume-desktopsharing %{_bindir}/x2gosuspend-desktopsharing %{_bindir}/x2goterminate-desktopsharing -%{_datadir}/applications/%{my_name}.desktop -%dir %{_datadir}/%{my_name}/ -%{_datadir}/%{my_name}/ +%{_datadir}/applications/%{name}.desktop +%dir %{_datadir}/%{name}/ +%{_datadir}/%{name}/ %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/128x128 %dir %{_datadir}/icons/hicolor/128x128/apps @@ -167,12 +166,12 @@ fi %dir %{_datadir}/icons/hicolor/64x64/apps %dir %{_datadir}/x2go %dir %{_datadir}/x2go/x2gofeature.d -%{_datadir}/icons/hicolor/128x128/apps/%{my_name}.png -%{_datadir}/icons/hicolor/16x16/apps/%{my_name}.png -%{_datadir}/icons/hicolor/32x32/apps/%{my_name}.png -%{_datadir}/icons/hicolor/64x64/apps/%{my_name}.png -%{_datadir}/x2go/x2gofeature.d/%{my_name}.features -%{_mandir}/man1/%{my_name}.1.gz +%{_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 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 75c84fd6e42878cdf1cf66e8e90fca9e88c8fe95 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 14 10:05:56 2018 +0100 Revert "x2godesktopsharing.spec: unpack sources to project name, not source package name." This reverts commit 3a1d142a661d6d904e08c9cb0af492dd9f081717. --- debian/changelog | 1 - x2godesktopsharing.spec | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0db2d67..cbda949 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,7 +28,6 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium + Install system-wide configuration file, akin to Debian packages. + Don't use %{my_name} in Sources1-9, buildscripts can only handle/replace %{name}. - + Unpack sources to project name, not source package name. [ Mike Gabriel ] * New upstream version (3.1.1.5): diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 7b65c18..ab70506 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -95,7 +95,7 @@ support). The current session may be an X2Go session itself or simply a local X11 session. %prep -%setup -q -n %{my_name}-%{version} +%setup -q %build -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 0d31d88e52d56b5c08d29bf3a3d6272bf8790c93 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 14 10:06:03 2018 +0100 Revert "x2godesktopsharing.spec: install system-wide configuration file, akin to Debian packages." This reverts commit 44d3f10b486091e1bce9e7cc3474e545984030e1. --- debian/changelog | 1 - x2godesktopsharing.spec | 5 ----- 2 files changed, 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index e1b650a..91cafec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,7 +25,6 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium + Really fix the typo. + Completely rename to x2goserver-desktopsharing, drop name overrides. + Keep x2godesktopsharing name in most locations. - + Install system-wide configuration file, akin to Debian packages. [ Mike Gabriel ] * New upstream version (3.1.1.5): diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 5b864ab..30a9e2b 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -121,8 +121,6 @@ install -p -m 644 icons/16x16/%{my_name}.png %{buildroot}%{_datadir}/icons/hicol install -p -m 644 icons/64x64/%{my_name}.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{my_name}.png install -p -m 644 icons/32x32/%{my_name}.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{my_name}.png install -p -m 755 bin/* %{buildroot}%{_bindir}/ -install -d -m 755 %{buildroot}%{_sysconfdir}/x2go/desktopsharing -install -p -m 644 debian/settings %{buildroot}%{_sysconfdir}/x2go/desktopsharing cp -rp share/* %{buildroot}%{_datadir}/x2go/ cp -rp man %{buildroot}%{_datadir}/ %if 0%{?suse_version} && 0%{?suse_version} <= 1130 @@ -178,9 +176,6 @@ fi %{_mandir}/man8/x2goresume-desktopsharing.8.gz %{_mandir}/man8/x2gosuspend-desktopsharing.8.gz %{_mandir}/man8/x2goterminate-desktopsharing.8.gz -%dir %{_sysconfdir}/x2go/ -%dir %{_sysconfdir}/x2go/desktopsharing -%config(noreplace) %{_sysconfdir}/x2go/desktopsharing/settings %changelog -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit d8584be8dc519e210d80670ac8a4c3068eb0ece2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 14 10:06:07 2018 +0100 Revert "x2godesktopsharing.spec: remove package names from %prep, %build and %install macros." This reverts commit e4ded9acbb871f0b6dc244d43cef15855fb23b06. --- debian/changelog | 1 - x2godesktopsharing.spec | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 86a27b9..8c54e07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,7 +20,6 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium + Obsolete and provide x2godesktopsharing in x2goserver-desktopsharing. + Remove first erroneous Group line. + Rename other sections to x2goserver-desktopsharing. - + Remove package names from %prep, %build and %install macros. [ Mike Gabriel ] * New upstream version (3.1.1.5): diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 3cc0526..756f9fb 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -100,11 +100,11 @@ 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. -%prep +%prep -n x2goserver-desktopsharing %setup -q -%build +%build -n x2goserver-desktopsharing %if 0%{?suse_version} && 0%{?suse_version} < 1315 lrelease x2godesktopsharing.pro qmake QMAKE_CFLAGS+="%{optflags}" QMAKE_CXXFLAGS+="%{optflags}" QMAKE_STRIP=":" x2godesktopsharing.pro @@ -115,7 +115,7 @@ qmake-qt5 QMAKE_CFLAGS+="%{optflags}" QMAKE_CXXFLAGS+="%{optflags}" QMAKE_STRIP= make %{?_smp_mflags} -%install +%install -n x2goserver-desktopsharing mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_datadir}/{applications,x2go} cp -p %{name} %{buildroot}%{_bindir}/ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 18720f24dbd2e5ea457909ef60edaffa2f02b085 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 14 10:06:08 2018 +0100 Revert "x2godesktopsharing.spec: rename other sections to x2goserver-desktopsharing." This reverts commit d2f95d4b22d1f0333203483a9430aad9fc66b594. --- debian/changelog | 1 - x2godesktopsharing.spec | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8c54e07..4b37c97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,6 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium + Use Qt4 for SLES 11.x builds. + Obsolete and provide x2godesktopsharing in x2goserver-desktopsharing. + Remove first erroneous Group line. - + Rename other sections to x2goserver-desktopsharing. [ Mike Gabriel ] * New upstream version (3.1.1.5): diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 756f9fb..e9e98d3 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -86,7 +86,7 @@ Group: Applications/Communications Obsoletes: x2godesktopsharing Provides: x2godesktopsharing = %{version}-%{release} -%description -n x2goserver-desktopsharing +%description X2Go is a server based computing environment with - session resuming - low bandwidth support @@ -100,11 +100,11 @@ 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. -%prep -n x2goserver-desktopsharing +%prep %setup -q -%build -n x2goserver-desktopsharing +%build %if 0%{?suse_version} && 0%{?suse_version} < 1315 lrelease x2godesktopsharing.pro qmake QMAKE_CFLAGS+="%{optflags}" QMAKE_CXXFLAGS+="%{optflags}" QMAKE_STRIP=":" x2godesktopsharing.pro @@ -115,7 +115,7 @@ qmake-qt5 QMAKE_CFLAGS+="%{optflags}" QMAKE_CXXFLAGS+="%{optflags}" QMAKE_STRIP= make %{?_smp_mflags} -%install -n x2goserver-desktopsharing +%install mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_datadir}/{applications,x2go} cp -p %{name} %{buildroot}%{_bindir}/ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop @@ -134,20 +134,20 @@ cp -rp man %{buildroot}%{_datadir}/ %endif -%pre -n x2ogserver-desktopsharing +%pre # Needed for sharing a desktop with another user getent group x2godesktopsharing >/dev/null || groupadd -r x2godesktopsharing -%post -n x2goserver-desktopsharing +%post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -%postun -n x2goserver-desktopsharing +%postun if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi -%posttrans -n x2goserver-desktopsharing +%posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 0b4228001045f690b43da65e7d0ce1cee19fa4f9 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 14 09:28:08 2018 +0100 Revert "debian/*: Namespace change. Rename bin:pkg to x2goserver-desktopsharing. Expect system-wide config in /etc/x2go/desktopsharing." This reverts commit 1b65bd121e031c5d0464e2b2b545cf9d19474b85. --- 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 ++++++++++++++++++++++ ...desktopsharing.dirs => x2godesktopsharing.dirs} | 2 +- ...desktopsharing.docs => x2godesktopsharing.docs} | 0 ...psharing.install => x2godesktopsharing.install} | 2 +- ...haring.manpages => x2godesktopsharing.manpages} | 0 ...haring.postinst => x2godesktopsharing.postinst} | 16 ++--- ...topsharing.postrm => x2godesktopsharing.postrm} | 0 ...ring.templates => x2godesktopsharing.templates} | 16 ++--- debian/x2goserver-desktopsharing.config | 75 ---------------------- sharetray.cpp | 2 +- x2godesktopsharing.spec | 5 +- 17 files changed, 129 insertions(+), 151 deletions(-) diff --git a/VERSION.x2godesktopsharing b/VERSION.x2godesktopsharing index 69a1172..82e63a5 100644 --- a/VERSION.x2godesktopsharing +++ b/VERSION.x2godesktopsharing @@ -1 +1 @@ -3.2.0.0 +3.1.1.5 diff --git a/debian/changelog b/debian/changelog index a3b3177..c49bc1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium +x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium [ Mihai Moldovan ] * New upstream version (3.1.1.5): diff --git a/debian/control b/debian/control index 96740dd..18f5789 100644 --- a/debian/control +++ b/debian/control @@ -16,14 +16,12 @@ 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: x2goserver-desktopsharing +Package: x2godesktopsharing 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 @@ -37,20 +35,3 @@ 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 68a5797..94e567d 100644 --- a/debian/po/POTFILES.in +++ b/debian/po/POTFILES.in @@ -1 +1 @@ -[type: gettext/rfc822deb] x2goserver-desktopsharing.templates +[type: gettext/rfc822deb] x2godesktopsharing.templates diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 53db274..656070a 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-14 00:13+0100\n" +"POT-Creation-Date: 2018-11-13 23:41+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 -#: ../x2goserver-desktopsharing.templates:3001 +#: ../x2godesktopsharing.templates:3001 msgid "Create group for X2Go Desktop Sharing now?" msgstr "" #. Type: boolean #. Description -#: ../x2goserver-desktopsharing.templates:3001 +#: ../x2godesktopsharing.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 -#: ../x2goserver-desktopsharing.templates:3001 +#: ../x2godesktopsharing.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 -#: ../x2goserver-desktopsharing.templates:3001 +#: ../x2godesktopsharing.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 -#: ../x2goserver-desktopsharing.templates:3001 +#: ../x2godesktopsharing.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 -#: ../x2goserver-desktopsharing.templates:4001 +#: ../x2godesktopsharing.templates:4001 msgid "Use already existing groups for X2Go Desktop Sharing?" msgstr "" #. Type: boolean #. Description -#: ../x2goserver-desktopsharing.templates:4001 +#: ../x2godesktopsharing.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 -#: ../x2goserver-desktopsharing.templates:5001 +#: ../x2godesktopsharing.templates:5001 msgid "Assign X2Go Desktop Sharing privilege to POSIX group:" msgstr "" #. Type: string #. Description -#: ../x2goserver-desktopsharing.templates:5001 +#: ../x2godesktopsharing.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 -#: ../x2goserver-desktopsharing.templates:5001 +#: ../x2godesktopsharing.templates:5001 msgid "If you leave this empty, the \"root\" group will be used." msgstr "" #. Type: boolean #. Description -#: ../x2goserver-desktopsharing.templates:6001 +#: ../x2godesktopsharing.templates:6001 msgid "Delete the group that was formerly used for this?" msgstr "" #. Type: boolean #. Description -#: ../x2goserver-desktopsharing.templates:6001 +#: ../x2godesktopsharing.templates:6001 msgid "The group for the X2Go Desktop Sharing privilege has been modified." msgstr "" #. Type: boolean #. Description -#: ../x2goserver-desktopsharing.templates:6001 +#: ../x2godesktopsharing.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 -#: ../x2goserver-desktopsharing.templates:7001 +#: ../x2godesktopsharing.templates:7001 msgid "Non-existing group" msgstr "" #. Type: error #. Description -#: ../x2goserver-desktopsharing.templates:7001 +#: ../x2godesktopsharing.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 -#: ../x2goserver-desktopsharing.templates:8001 +#: ../x2godesktopsharing.templates:8001 msgid "Auto-start X2Go Desktop Sharing applet on desktop session startup?" msgstr "" #. Type: boolean #. Description -#: ../x2goserver-desktopsharing.templates:8001 +#: ../x2godesktopsharing.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 -#: ../x2goserver-desktopsharing.templates:8001 +#: ../x2godesktopsharing.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 -#: ../x2goserver-desktopsharing.templates:9001 +#: ../x2godesktopsharing.templates:9001 msgid "Auto-activate X2Go Desktop Sharing on desktop session startup?" msgstr "" #. Type: boolean #. Description -#: ../x2goserver-desktopsharing.templates:9001 +#: ../x2godesktopsharing.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 -#: ../x2goserver-desktopsharing.templates:9001 +#: ../x2godesktopsharing.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 -#: ../x2goserver-desktopsharing.templates:9001 +#: ../x2godesktopsharing.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 95a028c..bddc7fe 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/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 + 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 dh_install override_dh_clean: diff --git a/debian/x2godesktopsharing.config b/debian/x2godesktopsharing.config new file mode 100755 index 0000000..a847666 --- /dev/null +++ b/debian/x2godesktopsharing.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 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.dirs b/debian/x2godesktopsharing.dirs similarity index 92% rename from debian/x2goserver-desktopsharing.dirs rename to debian/x2godesktopsharing.dirs index e20feed..64b1d6c 100644 --- a/debian/x2goserver-desktopsharing.dirs +++ b/debian/x2godesktopsharing.dirs @@ -1,4 +1,4 @@ -etc/x2go/desktopsharing +etc/x2godesktopsharing usr/bin usr/share/applications usr/share/x2godesktopsharing diff --git a/debian/x2goserver-desktopsharing.docs b/debian/x2godesktopsharing.docs similarity index 100% rename from debian/x2goserver-desktopsharing.docs rename to debian/x2godesktopsharing.docs diff --git a/debian/x2goserver-desktopsharing.install b/debian/x2godesktopsharing.install similarity index 71% rename from debian/x2goserver-desktopsharing.install rename to debian/x2godesktopsharing.install index 8c1decb..741eefa 100644 --- a/debian/x2goserver-desktopsharing.install +++ b/debian/x2godesktopsharing.install @@ -1,4 +1,4 @@ VERSION.x2godesktopsharing usr/share/x2go/versions bin/* usr/bin/ share/* usr/share/x2go/ -debian/settings etc/x2go/desktopsharing/ +debian/settings etc/x2godesktopsharing/ diff --git a/debian/x2goserver-desktopsharing.manpages b/debian/x2godesktopsharing.manpages similarity index 100% rename from debian/x2goserver-desktopsharing.manpages rename to debian/x2godesktopsharing.manpages diff --git a/debian/x2goserver-desktopsharing.postinst b/debian/x2godesktopsharing.postinst similarity index 84% rename from debian/x2goserver-desktopsharing.postinst rename to debian/x2godesktopsharing.postinst index e7aac11..438cc21 100755 --- a/debian/x2goserver-desktopsharing.postinst +++ b/debian/x2godesktopsharing.postinst @@ -26,16 +26,16 @@ case "$1" in configure) # fetch debconf-variables for x2godesktopsharing - 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 + 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 x2goserver-desktopsharing/del-last-group-sharing + db_get x2godesktopsharing/del-last-group-sharing del_last_group="$RET" if [ "$del_last_group" = "true" ]; then - db_get x2goserver-desktopsharing/last-group-sharing + 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 @@ -45,7 +45,7 @@ case "$1" in # create debconf-configured sharing group - db_get x2goserver-desktopsharing/group-sharing + 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) @@ -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/x2go/desktopsharing/settings -e "s/group=.*/group=$group/" + sed -i /etc/x2godesktopsharing/settings -e "s/group=.*/group=$group/" fi - db_get x2goserver-desktopsharing/auto-start-on-logon + 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 @@ -74,7 +74,7 @@ case "$1" in rm -f /etc/xdg/autostart/x2godesktopsharing.desktop fi - db_get x2goserver-desktopsharing/auto-activate-on-logon + 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@' diff --git a/debian/x2goserver-desktopsharing.postrm b/debian/x2godesktopsharing.postrm similarity index 100% rename from debian/x2goserver-desktopsharing.postrm rename to debian/x2godesktopsharing.postrm diff --git a/debian/x2goserver-desktopsharing.templates b/debian/x2godesktopsharing.templates similarity index 87% rename from debian/x2goserver-desktopsharing.templates rename to debian/x2godesktopsharing.templates index ae70cea..79241a9 100644 --- a/debian/x2goserver-desktopsharing.templates +++ b/debian/x2godesktopsharing.templates @@ -7,12 +7,12 @@ # Even minor modifications require translation updates and such # changes should be coordinated with translators and reviewers. -Template: x2goserver-desktopsharing/last-group-sharing +Template: x2godesktopsharing/last-group-sharing Type: string Default: Description: for internal use -Template: x2goserver-desktopsharing/create-group-for-sharing +Template: x2godesktopsharing/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: x2goserver-desktopsharing/use-existing-group-for-sharing +Template: x2godesktopsharing/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: x2goserver-desktopsharing/group-sharing +Template: x2godesktopsharing/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: x2goserver-desktopsharing/del-last-group-sharing +Template: x2godesktopsharing/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: x2goserver-desktopsharing/no-such-group +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: x2goserver-desktopsharing/auto-start-on-logon +Template: x2godesktopsharing/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: x2goserver-desktopsharing/auto-activate-on-logon +Template: x2godesktopsharing/auto-activate-on-logon Type: boolean Default: false _Description: Auto-activate X2Go Desktop Sharing on desktop session startup? diff --git a/debian/x2goserver-desktopsharing.config b/debian/x2goserver-desktopsharing.config deleted file mode 100755 index 5708985..0000000 --- a/debian/x2goserver-desktopsharing.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 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/sharetray.cpp b/sharetray.cpp index cf4c445..c0e34c2 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -604,7 +604,7 @@ void ShareTray::showList() void ShareTray::loadSystemSettings() { - QString settings_file = "/etc/x2go/desktopsharing/settings"; + QString settings_file = "/etc/x2godesktopsharing/settings"; if ( fileExists (settings_file) ) { qDebug() << "loading system-wide settings: "<<settings_file; diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 6ec852d..51c676b 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,5 +1,5 @@ Name: x2godesktopsharing -Version: 3.2.0.0 +Version: 3.1.1.5 Release: 0.0x2go1%{?dist} Summary: Share X11 desktops with other users via X2Go @@ -77,9 +77,6 @@ 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

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@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@obviously-nice.de> -# Copyright (C) 2011-2015 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> -# Copyright (C) 2011-2015 Mike Gabriel <mike.gabriel@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@obviously-nice.de> -# Copyright (C) 2011-2015 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> -# Copyright (C) 2011-2015 Mike Gabriel <mike.gabriel@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@obviously-nice.de> -# Copyright (C) 2011-2015 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> -# Copyright (C) 2011-2015 Mike Gabriel <mike.gabriel@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@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