This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit aeae77dee85b1b5dfbf75f394b4e2ea0ee793055 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon May 16 21:44:15 2022 +0200 Makefile: Create symlink from /etc/x2go/Xsession.options.d/ to /etc/X11/Xsession.options.d on Debian-like systems. --- debian/changelog | 2 ++ x2goserver-xsession/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 04d1a3de..c3594381 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium This change only gets activated for Debian for now and focuses on policykit-1 (<= 0.105). (Debian maintainers of policykit-1 are holding back newer versions for unknown reason). + - Makefile: Create symlink from /etc/x2go/Xsession.options.d/ to + /etc/X11/Xsession.options.d on Debian-like systems. * debian/x2goserver.postinst: + Drop duplicate sourcing of debconf includes. + Add Dutch debconf translation. Thanks to Frans Spiesschaert. diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index 163e9c51..ea15a314 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -21,6 +21,7 @@ MANDIR ?= $(PREFIX)/share/man SHAREDIR ?= $(PREFIX)/share/x2go XSESSIONDIR ?= /etc/X11/Xsession.d +XSESSIONOPTIONSDIR ?= /etc/X11/Xsession.options.d XSESSIONOPTIONFILE ?= /etc/X11/Xsession.options XINITRCDIR ?= /etc/X11/xinit/xinitrc.d XCLIENTSDIR ?= /etc/X11/xinit/Xclients.d @@ -56,6 +57,7 @@ install_config: $(INSTALL_SYMLINK) /etc/X11/Xresources $(DESTDIR)$(ETCDIR)/ if [ -e /etc/debian_version ] || [ -e /etc/devuan_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 ] || [ -e /etc/devuan_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/debian_version ] || [ -e /etc/devuan_version ]; then if [ -d $(XSESSIONOPTIONSDIR) ]; then $(RM_FILE) $(DESTDIR)$(ETCDIR)/Xsession.options.d; $(INSTALL_SYMLINK) $(XSESSIONOPTIONSDIR) $(DESTDIR)$(ETCDIR)/Xsession.options.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.options.d; fi; fi if [ -e /etc/redhat-release ] || [ -e /etc/gentoo-release ] || [ -e /etc/rt-os-release ] || [ -e /etc/slackware-version ]; 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 ] || [ -e /etc/rt-os-release ] || [ -e /etc/slackware-version ]; 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