This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 55be1930533dfe80d620517beb5f6edb60b9c640 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 14 10:34:46 2018 +0100 Don't rely on "ln -sf" to remove a symlink before recreating it. If the target is non-writable, this may fail (observed on a Debian stretch system). Thus, removing the symlink file first and then recreating it. --- debian/changelog | 3 +++ x2goserver-xsession/Makefile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1347e27..a27f0a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium - x2goserver/lib/x2gocheckport: chmod a+x. - New bin:pkg: x2goserver-desktopsharing. Move all desktop sharing integration logic from x2godesktopsharing to x2goserver src:pkg. + - Don't rely on "ln -sf" to remove a symlink before recreating it. If the + target is non-writable, this may fail (observed on a Debian stretch + system). Thus, removing the symlink file first and then recreating it. * debian/x2goserver*.dirs: + Let dirs have a trailing slash in their path (for the human eye merely). * debian/copyright: diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index ad6c765..80e6ccf 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -55,7 +55,7 @@ install_config: $(INSTALL_PROGRAM) etc/Xsession $(DESTDIR)$(ETCDIR)/ $(INSTALL_SYMLINK) /etc/X11/Xresources $(DESTDIR)$(ETCDIR)/ if [ -e /etc/debian_version ]; then if [ -e $(XSESSIONOPTIONFILE) ]; then $(INSTALL_SYMLINK) $(XSESSIONOPTIONFILE) $(DESTDIR)$(ETCDIR)/Xsession.options; else touch $(DESTDIR)$(ETCDIR)/Xsession.options; fi; fi - if [ -e /etc/debian_version ]; then if [ -d $(XSESSIONDIR) ]; then $(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.d; fi; fi + if [ -e /etc/debian_version ]; then if [ -d $(XSESSIONDIR) ]; then $(RM_FILE) $(DESTDIR)$(ETCDIR)/Xsession.d; $(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.d; fi; fi if [ -e /etc/redhat-release ] || [ -e /etc/gentoo-release ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi if [ -e /etc/redhat-release ] || [ -e /etc/gentoo-release ]; then if [ -d $(XCLIENTSDIR) ]; then $(INSTALL_SYMLINK) $(XCLIENTSDIR) $(DESTDIR)$(ETCDIR)/Xclients.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xclients.d; fi; fi if [ -e /etc/os-release ] && cat /etc/os-release | grep "suse" 1>/dev/null || [ -d /usr/share/doc/packages/brp-check-suse ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git