This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from ed91de5 x2goserver.spec: split out logcheck files into an x2goserver-logcheck subpackage. new 0c692f0 x2goserver/bin/x2gostartagent: reenable XFIXES extension. new 48a8b56 x2goserver-x2goagent/etc/x2goagent.options: reenable XFIXES extension. new b748d28 x2goserver.spec: add correct Group: to x2goserver-logcheck package. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 4 ++++ x2goserver-x2goagent/etc/x2goagent.options | 5 ----- x2goserver.spec | 6 ++++++ x2goserver/bin/x2gostartagent | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 0c692f015b14c89de2659d2b1aead14067e5f1f7 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Dec 13 03:18:15 2017 +0100 x2goserver/bin/x2gostartagent: reenable XFIXES extension. The initial problem that required this workaround has been fixed a long time ago. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 2 ++ x2goserver/bin/x2gostartagent | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 71cfb62..0e70611 100644 --- a/debian/changelog +++ b/debian/changelog @@ -251,6 +251,8 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium [ Mihai Moldovan ] * New upstream version (4.0.1.23): + - x2goserver/bin/x2gostartagent: reenable XFIXES extension. The initial + problem that required this workaround has been fixed a long time ago. * x2goserver.spec: - RPMify x2goserver-xsession description. - Remove qt4 stuff, we're not using the framework here. diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 28b70d6..3816b56 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -147,7 +147,7 @@ X2GO_TELEKINESIS_ENABLED=`echo 'use X2Go::Config qw( get_config ); use X2Go::Uti X2GO_ROOT="${HOME}/.x2go" export NX_ROOT=$X2GO_ROOT -X2GO_NXAGENT_DEFAULT_OPTIONS="-extension XFIXES -extension GLX -nolisten tcp" +X2GO_NXAGENT_DEFAULT_OPTIONS="-extension GLX -nolisten tcp" if [ -r /etc/x2go/x2goagent.options ]; then source /etc/x2go/x2goagent.options -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 48a8b56af83f0aa1b6b0dbcff39c91b5298e1860 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Dec 13 03:27:05 2017 +0100 x2goserver-x2goagent/etc/x2goagent.options: reenable XFIXES extension. --- debian/changelog | 1 + x2goserver-x2goagent/etc/x2goagent.options | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0e70611..f1951c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -196,6 +196,7 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low - README.md: whitespace fixes and typo correction. - X2Go/Server/DB/SQLite3.pm: fix command name in error messages. - X2Go/Utils.pm: backport user name regex changes. + - x2goserver-x2goagent/etc/x2goagent.options: reenable XFIXES extension. * x2goserver.spec: - Only create session DB in x2goserver's post install script. Do use proper Requires(post) statements to make sure perl-X2Go-Server-DB and diff --git a/x2goserver-x2goagent/etc/x2goagent.options b/x2goserver-x2goagent/etc/x2goagent.options index de4735d..bd19c41 100644 --- a/x2goserver-x2goagent/etc/x2goagent.options +++ b/x2goserver-x2goagent/etc/x2goagent.options @@ -11,11 +11,6 @@ X2GO_NXAGENT_DEFAULT_OPTIONS="" -# Disable XFIXES. -# Workaround for https://bugs.launchpad.net/ubuntu/+source/libxfixes/+bug/985202 -# -X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension XFIXES" - # Uncomment to disable GLX, the old mesa version is hopelessly outdated anyways. # Unbreaks the gnome3 control center # -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit b748d283e22ee0c40d40b47725ee6b80c2481ef9 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Dec 13 03:20:08 2017 +0100 x2goserver.spec: add correct Group: to x2goserver-logcheck package. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 1 + x2goserver.spec | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index f1951c4..d4d3d02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -261,6 +261,7 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium installing logcheck as a hard-dependency with X2Go Server for people who do not want or expect that. Logcheck users can install x2goserver-logcheck as a standalone package instead. + - Add correct Group: to x2goserver-logcheck package. -- X2Go Release Manager <git-admin@x2go.org> Sat, 11 Nov 2017 13:01:29 +0100 diff --git a/x2goserver.spec b/x2goserver.spec index 092eda4..fdf1459 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -528,6 +528,12 @@ Requires: %{name} = %{version}-%{release} Requires: logcheck %endif +%if 0%{?fedora} || 0%{?rhel} +Group: Applications/Communications +%else +Group: Productivity/Networking/Remote Desktop +%endif + %description logcheck 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/x2goserver.git
-
git-admin＠x2go.org