This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit f70ada5804330edb0ad12259afc2b548d3ba9bff Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 6 13:55:31 2020 +0100 x2goserver/lib/x2goupdateoptionsstring: replace occurrences of "option string" with "options string". --- debian/changelog | 2 ++ x2goserver/bin/x2goupdateoptionsstring | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 893ac466..e77dedfe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -204,6 +204,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium minus sign. - x2goserver/lib/x2goupdateoptionsstring: make clear that "additional parameters" are transformations. + - x2goserver/lib/x2goupdateoptionsstring: replace occurrences of "option + string" with "options string". * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/bin/x2goupdateoptionsstring b/x2goserver/bin/x2goupdateoptionsstring index 3ded909a..f72f94f0 100755 --- a/x2goserver/bin/x2goupdateoptionsstring +++ b/x2goserver/bin/x2goupdateoptionsstring @@ -187,7 +187,7 @@ sub Main { $intermediate = X2Go::Server::Agent::NX::Options::parse_options ($options); if (!(defined ($intermediate))) { - print {*STDERR} "Unable to parse option string, aborting.\n"; + print {*STDERR} "Unable to parse options string, aborting.\n"; $error_detected = 6; } } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git