This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit da87ee3c6a3c5d6e9b2c333c260412575dbede42 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 20 23:43:53 2018 +0100 x2goserver.spec: remove stale symlinks check workaround now that we pull in nxagent >= 3.5.99.0 by default. --- debian/changelog | 2 ++ x2goserver.spec | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index bfa33b8..fe3db4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium * x2goserver.spec: + Do not install rgb file/symlink any longer. + Bump nxagent requirement to 3.5.99.5+. + + Remove stale symlinks check workaround now that we pull in nxagent >= + 3.5.99.0 by default. * debian/copyright.in: + Remove reference to rgb file. * debian/x2goserver.dirs: diff --git a/x2goserver.spec b/x2goserver.spec index fe6644f..595ba15 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -563,10 +563,6 @@ make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=% %install make install DESTDIR=%{buildroot} PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx -# We currently need to disable the broken symlinks check on OpenSuSE, as long -# as we can't pull in nx-libs 3.5.99 or higher. Once we can add it as a BuildRequires, -# this env var can and should be removed again. -export NO_BRP_STALE_LINK_ERROR=yes # Make sure the .packlist file is removed from %%{perl_vendorarch}... find %{buildroot}%{perl_vendorarch} -name .packlist | while read file; do rm -f "$file"; done -- 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 40ce8734501a064ddc82b8de0a55c2ad0e7e46d8 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 20 23:55:24 2018 +0100 x2goserver-x2goagent/bin: remove x2goagent wrapper script. Unneeded and actually harmful nowadays. --- debian/changelog | 2 ++ x2goserver-x2goagent/bin/x2goagent | 19 ------------------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index c52885a..2efe14d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium make executable. - x2goserver-x2goagent/Makefile: replace ${PREFIX}/bin/x2goagent wrapper script with a symlink to the ... x2goagent symlink in the NXLIBDIR. + - x2goserver-x2goagent/bin: remove x2goagent wrapper script. Unneeded and + actually harmful nowadays. * debian/{control,compat}: + Bump DH compat level to 9. * debian/: diff --git a/x2goserver-x2goagent/bin/x2goagent b/x2goserver-x2goagent/bin/x2goagent deleted file mode 100755 index 8a73387..0000000 --- a/x2goserver-x2goagent/bin/x2goagent +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2012-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# -# 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, see http://www.gnu.org/licenses/. - -export NXAPP=x2goagent -exec nxagent "$@" -- 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 efff9a99b3461f8aac31d5ba8f467d8d17863476 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 20 23:58:46 2018 +0100 debian/copyright.in: remove reference to x2goagent wrapper script. --- debian/changelog | 1 + debian/copyright.in | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3ef7274..bb31afc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -70,6 +70,7 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium 3.5.99.0 by default. * debian/copyright.in: + Remove reference to rgb file. + + Remove reference to x2goagent wrapper script. * debian/x2goserver.dirs: + Remove etc/x2go/x2gosql references, already handled by x2goserver-common. diff --git a/debian/copyright.in b/debian/copyright.in index 0c696e8..7c456f8 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -222,7 +222,6 @@ License: GPL (v2 or later) FIXME Files: Makefile.docupload - x2goserver-x2goagent/bin/x2goagent x2goserver-x2goagent/share/x2go/x2gofeature.d/x2goserver-x2goagent.features Copyright: 2010-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> 2012-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -- 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 04ca658dca826870c2a23282173feb5bb8f89fbe Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 20 23:42:51 2018 +0100 x2goserver.spec: bump nxagent requirement to 3.5.99.5+. --- debian/changelog | 1 + x2goserver.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 117d99d..bfa33b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,7 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium + Do not install rgb file/symlink any longer. * x2goserver.spec: + Do not install rgb file/symlink any longer. + + Bump nxagent requirement to 3.5.99.5+. * debian/copyright.in: + Remove reference to rgb file. * debian/x2goserver.dirs: diff --git a/x2goserver.spec b/x2goserver.spec index b8ccfed..fe6644f 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -305,7 +305,7 @@ This package contains the X2Go::Log Perl package. %package x2goagent Group: Applications/System Summary: X2Go Server's X2Go Agent -Requires: nxagent >= 3.5.99.3 +Requires: nxagent >= 3.5.99.5 Conflicts: x2goagent < 3.5.99.0 Obsoletes: x2goagent < 3.5.99.0 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git