x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2godesktopsharing.git - master (branch) updated: 3.1.1.0-10-g350abfc
by git-admin＠x2go.org 10 Dec '13

10 Dec '13

The branch, master has been updated via 350abfcba9c52f75976917065f4efc45c213e1f9 (commit) from dda853b86dd85db2b0bea4bf4feb60449cacb5fd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 350abfcba9c52f75976917065f4efc45c213e1f9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Dec 10 18:43:59 2013 +0100 Rework LONG_DESCRIPTION in several other aspects. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 96d9776..ec618b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ x2godesktopsharing (3.1.1.1-0x2go1) UNRELEASED; urgency=low - Fix FSF address in COPYING file. * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + + Rework LONG_DESCRIPTION in several other aspects. * debian/source/format: Switch to format 1.0. diff --git a/debian/control b/debian/control index 9201764..a71991f 100644 --- a/debian/control +++ b/debian/control @@ -22,8 +22,8 @@ Depends: x2goserver (>= 3.0.99.9-0~), libqt4-gui, Recommends: -Description: share X2go desktops with other users (via shadow sessions) - X2go is a server based computing environment with +Description: Share X11 desktops with other users via X2Go + X2Go is a server based computing environment with - session resuming - low bandwidth support - session brokerage support @@ -31,6 +31,7 @@ Description: share X2go desktops with other users (via shadow sessions) - audio support - authentication by smartcard and USB stick . - x2godesktopsharing is an X2go add-on tool that allows a user to - grant other X2go users access to the current session (shadow session - support). + X2Go Desktop Sharing is an X2Go add-on tool that allows a user to + 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. hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2godesktopsharing.git" (Desktop Sharing for X2Go).

1 0

x2godesktopsharing.git - master (branch) updated: 3.1.1.0-9-gdda853b
by git-admin＠x2go.org 10 Dec '13

10 Dec '13

The branch, master has been updated via dda853b86dd85db2b0bea4bf4feb60449cacb5fd (commit) from 3b408a1817b369ba3e52a35b01e667aa7fbc26a7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit dda853b86dd85db2b0bea4bf4feb60449cacb5fd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Dec 10 18:15:24 2013 +0100 Fix FSF address in COPYING file ----------------------------------------------------------------------- Summary of changes: COPYING | 4 ++-- debian/changelog | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/COPYING b/COPYING index 62553c7..b9679b2 100644 --- a/COPYING +++ b/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found. 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. diff --git a/debian/changelog b/debian/changelog index 773cac0..96d9776 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ x2godesktopsharing (3.1.1.1-0x2go1) UNRELEASED; urgency=low * New upstream version (3.1.1.1): - Update man pages (Fixes: #281). + - Fix FSF address in COPYING file. * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. * debian/source/format: hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2godesktopsharing.git" (Desktop Sharing for X2Go).

1 0

x2godesktopsharing.git - master (branch) updated: 3.1.1.0-11-g56bb51d
by git-admin＠x2go.org 10 Dec '13

10 Dec '13

The branch, master has been updated via 56bb51d7ca52e6cbe4ffadad05d9b4f7f0c7475c (commit) from 350abfcba9c52f75976917065f4efc45c213e1f9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 56bb51d7ca52e6cbe4ffadad05d9b4f7f0c7475c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Dec 10 18:44:45 2013 +0100 x2goclient.spec: Ship x2goclient.spec (RPM package definitions) in upstream project. (Thanks to the Fedora package maintainers). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++ x2godesktopsharing.spec | 92 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 x2godesktopsharing.spec The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ec618b6..d9e980c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ x2godesktopsharing (3.1.1.1-0x2go1) UNRELEASED; urgency=low + Rework LONG_DESCRIPTION in several other aspects. * debian/source/format: Switch to format 1.0. + * x2goclient.spec: + + Ship x2goclient.spec (RPM package definitions) in upstream project. + (Thanks to the Fedora package maintainers). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 08 Jun 2013 01:13:44 +0200 diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec new file mode 100644 index 0000000..6858f59 --- /dev/null +++ b/x2godesktopsharing.spec @@ -0,0 +1,92 @@ +Name: x2godesktopsharing +Version: 3.1.1.1 +Release: 0.0x2go1%{?dist} +Summary: Share X11 desktops with other users via X2Go + +Group: Applications/Communications +License: GPLv2+ +URL: http://www.x2go.org +Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz + +BuildRequires: desktop-file-utils +BuildRequires: qt4-devel +Requires: hicolor-icon-theme +Requires: x2goserver + +%description +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 + +X2Go Desktop Sharing is an X2Go add-on tool that allows a user to +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 +%setup -q + + +%build +qmake-qt4 +make %{?_smp_mflags} + + +%install +mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_datadir}/{applications,x2go} +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/%{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}/ + + +%pre +# Needed for sharing a desktop with another user +getent group x2godesktopsharing >/dev/null || groupadd -r x2godesktopsharing + +%post +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%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 +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + +%files +%doc COPYING +%{_bindir}/%{name} +%{_bindir}/x2goresume-desktopsharing +%{_bindir}/x2gosuspend-desktopsharing +%{_bindir}/x2goterminate-desktopsharing +%{_datadir}/applications/%{name}.desktop +%{_datadir}/%{name}/ +%{_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 + hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2godesktopsharing.git" (Desktop Sharing for X2Go).

1 0

pinentry-x2go.git - master (branch) updated: 0.7.5.6-14-g097b12e
by git-admin＠x2go.org 10 Dec '13

10 Dec '13

The branch, master has been updated via 097b12ec1fbc0990c42ffab7fb123ab7e234f12a (commit) from 44d22a994e8ae76d2a14b995eed5013ff5a1b32d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 097b12ec1fbc0990c42ffab7fb123ab7e234f12a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Dec 10 13:45:49 2013 +0100 pinentry-x2go.spec: gcc-c++ does not seem to be required for Fedora 19+20 ----------------------------------------------------------------------- Summary of changes: pinentry-x2go.spec | 2 ++ 1 file changed, 2 insertions(+) The diff of changes is: diff --git a/pinentry-x2go.spec b/pinentry-x2go.spec index e54126f..c034b80 100644 --- a/pinentry-x2go.spec +++ b/pinentry-x2go.spec @@ -12,7 +12,9 @@ Source0: http://code.x2go.org/releases/source/%name/%name-%version.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %endif BuildRequires: autoconf >= 2.57, automake >= 1.7.6 +%if 0%{!?fe19} || 0%{!?fe20} BuildRequires: gcc-c++ +%endif BuildRequires: libcap-devel, ncurses-devel %if 0%{?el5} || 0%{?el6} BuildRequires: qt4-devel hooks/post-receive -- pinentry-x2go.git (PinEntry Dialog (Qt) for X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pinentry-x2go.git" (PinEntry Dialog (Qt) for X2Go Client).

1 0

x2goclient.git - master (branch) updated: 4.0.1.1-58-g5b6ece7
by git-admin＠x2go.org 10 Dec '13

10 Dec '13

The branch, master has been updated via 5b6ece799d8afd3a1655de7b2f3a3b4a3292d2b5 (commit) from e235cdd161c2e7e67f62c46df3ea6531aea02313 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5b6ece799d8afd3a1655de7b2f3a3b4a3292d2b5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Dec 10 13:29:57 2013 +0100 fix x2goplugin-provider installation ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- x2goclient.spec | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/Makefile b/Makefile index edbd38d..f007c72 100755 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ clean_pluginprovider: clean_man: make -f Makefile.man2html clean -install: install_client install_plugin install_man +install: install_client install_plugin install_man install_pluginprovider install_client: $(INSTALL_DIR) $(DESTDIR)$(BINDIR)/ diff --git a/x2goclient.spec b/x2goclient.spec index fef2017..5edf0e5 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -146,5 +146,11 @@ fi %files -n x2goplugin %{_libdir}/mozilla/plugins/libx2goplugin.so +%files -n x2goplugin-provider +%{_sysconfdir}/x2go/x2goplugin-apache.conf +%{_sysconfdir}/httpd/ +%{_sysconfdir}/x2go/plugin-provider/ +%{_datadir}/x2go/plugin/ + %changelog hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 4.0.1.1-57-ge235cdd
by git-admin＠x2go.org 10 Dec '13

10 Dec '13

The branch, master has been updated via e235cdd161c2e7e67f62c46df3ea6531aea02313 (commit) from 739e7f79ac55ba1d7ca4e71110b3ce84b92af816 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e235cdd161c2e7e67f62c46df3ea6531aea02313 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Dec 10 12:25:09 2013 +0100 x2goclient.spec: fix creation of /etc/httpd/conf.d ----------------------------------------------------------------------- Summary of changes: x2goclient.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goclient.spec b/x2goclient.spec index be5a038..fef2017 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -115,7 +115,7 @@ make %{?_smp_mflags} make install DESTDIR=%{buildroot} PREFIX=%{_prefix} desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop -mkdir %{buildroot}%{_sysconfdir}/httpd/conf.d +mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d ln -s ../../x2go/x2goplugin-apache.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/x2goplugin-provider.conf %post hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

page changed: doc:organigram
by wiki-admin＠x2go.org 10 Dec '13

10 Dec '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/12/10 10:47 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:23.0) Gecko/20100101 Firefox/23.0 Iceweasel/23.0 IP-Address : 213.178.75.58,10.0.32.50 Hostname : nocatv2.tng.de,10.0.32.50 Old Revision: http://wiki.x2go.org/doku.php/doc:organigram?rev=1377894127 New Revision: http://wiki.x2go.org/doku.php/doc:organigram Edit Summary: User : sunweaver @@ -37,8 +37,9 @@ Further people with write access to upstream X2Go Git: * Terje Andersen (i18n team leader) * Jan Engelhardt (RPM maintainer) + * Michael DePaulo (X2Go Client installers for MS Windows) All core developers have permission to commit code on [[http://git.x2go.org|X2Go Git]]. ===== Professional Support ===== @@ -76,9 +77,9 @@ * Jan Engelhardt (X2Go for RPM-based distros) * Mike Gabriel (X2Go Package Repositories, Debian Developer) * Clemens Lang (X2Go Client for Mac OS X, MacPorts Developer) * Orion Paplowski (X2Go packages in Fedora) - * Oleksandr Shneyder (Windows Installer) + * Oleksandr Shneyder, Michael DePaulo (Windows Installer) * Reinhard Tartler (Debian/Ubuntu Developer) ===== Miscellaneous Contributors ===== -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-294-gdbb02f2
by git-admin＠x2go.org 10 Dec '13

10 Dec '13

The branch, master has been updated via dbb02f206e7b617be9466deecc430147dfe2c0b2 (commit) from 224da73d735cf30dc143fe539aa34afa201e1713 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit dbb02f206e7b617be9466deecc430147dfe2c0b2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Dec 10 11:42:18 2013 +0100 fix for commit 65810d3 ----------------------------------------------------------------------- Summary of changes: x2goserver.spec | 4 ++++ 1 file changed, 4 insertions(+) The diff of changes is: diff --git a/x2goserver.spec b/x2goserver.spec index 670bf1a..ac4770b 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -390,8 +390,12 @@ exit 0 %if 0%{?fedora} %{_unitdir}/x2goserver.service %else +%if 0%{?el5} +%{_initrddir}/x2goserver +%else %{_initddir}/x2goserver %endif +%endif %files -n perl-X2Go-Log hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goclient.git - master (branch) updated: 4.0.1.1-56-g739e7f7
by git-admin＠x2go.org 10 Dec '13

10 Dec '13

The branch, master has been updated via 739e7f79ac55ba1d7ca4e71110b3ce84b92af816 (commit) from a0bb56b4bb95a207f52a818848aaf983afe6a4c7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 739e7f79ac55ba1d7ca4e71110b3ce84b92af816 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Dec 10 11:40:15 2013 +0100 x2goclient.spec: add forgotten %description tags ----------------------------------------------------------------------- Summary of changes: x2goclient.spec | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) The diff of changes is: diff --git a/x2goclient.spec b/x2goclient.spec index 7efcd15..be5a038 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -55,11 +55,38 @@ Requires: mozilla-filesystem Requires: nxproxy Requires: openssh-clients, openssh-server +%description -n x2goplugin +X2Go is a serverbased computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client-side mass storage mounting support + - client-side printing support + - audio support + - authentication by smartcard and USB stick + +X2Go Client is a graphical client (qt4) for the X2Go system. +You can use it to connect to running sessions and start new sessions. + +This package provides X2Go Client as QtBrowser-based Mozilla plugin. + %package -n x2goplugin-provider Summary: Provide X2Go Plugin via Apache webserver Requires: httpd +%description -n x2goplugin-provider +X2Go is a serverbased computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client-side mass storage mounting support + - client-side printing support + - audio support + - authentication by smartcard and USB stick + +This package provides an example configuration for providing +the X2Go Plugin via an Apache webserver. %prep %setup -q hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 4.0.1.1-55-ga0bb56b
by git-admin＠x2go.org 10 Dec '13

10 Dec '13

The branch, master has been updated via a0bb56b4bb95a207f52a818848aaf983afe6a4c7 (commit) from ca5d397a4a52966d04642a1385cb9463fab26468 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a0bb56b4bb95a207f52a818848aaf983afe6a4c7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Dec 10 11:36:23 2013 +0100 x2goclient.spec: fix dependency token ----------------------------------------------------------------------- Summary of changes: x2goclient.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goclient.spec b/x2goclient.spec index 09322d1..7efcd15 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -10,7 +10,7 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. BuildRequires: cups-devel BuildRequires: desktop-file-utils -BuildRequires: libssh-devel (>= 0.4.7) +BuildRequires: libssh-devel >= 0.4.7 BuildRequires: libXpm-devel %if 0%{?fedora} BuildRequires: man2html-core hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits