This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/x2gogetapps in repository x2goserver. commit 48145879d18eafb5b865b1fb7895115871853571 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 13 01:28:15 2015 +0100 x2goserver/bin/x2gogetapps: do not print spurious newlines. --- debian/changelog | 1 + x2goserver/bin/x2gogetapps | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3ca102b..8f70c3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -153,6 +153,7 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low - x2goserver/bin/x2gogetapps: respect NoDisplay and Hidden values, don't parse the full desktop file if there are non-Desktop Entries groups. Based on a patch submitted by Jason Alavaliant. Fixes: #812. + - x2goserver/bin/x2gogetapps: do not print spurious newlines. * 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/bin/x2gogetapps b/x2goserver/bin/x2gogetapps index b118898..c0b3ce3 100755 --- a/x2goserver/bin/x2gogetapps +++ b/x2goserver/bin/x2gogetapps @@ -105,7 +105,7 @@ sub geticon { push(@ret, encode_base64($buf)); } - push(@ret, "</icon>\n"); + push(@ret, "</icon>"); close(I); } else @@ -181,12 +181,13 @@ sub proc_desktop_file } } close (F); - push(@output, "</desktop>\n"); + push(@output, "</desktop>"); # Print out parsed entry if it's not hidden or marked NoDisplay. if (! $nodisplay) { print join("\n", @output); + print "\n"; } } else -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git