This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/x2goserver-xsettings in repository x2goserver. commit 3a6f39bef061718bf0d2bda0f383c5765a7c66ac Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 01:29:18 2014 +0100 xsettings: remove .conf suffix from xsettingsd config files. --- x2goserver-xsettings/Makefile | 4 ++-- x2goserver-xsettings/README.md | 2 +- .../post-start.d/900_xsettings-xsettingsd-startup | 8 ++++---- .../man/man8/x2goserver-xsettings.8.in | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/x2goserver-xsettings/Makefile b/x2goserver-xsettings/Makefile index 90ea411..b3facbc 100755 --- a/x2goserver-xsettings/Makefile +++ b/x2goserver-xsettings/Makefile @@ -63,7 +63,7 @@ install_scripts: install_config: $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) - $(INSTALL_FILE) etc/xsettings.conf $(DESTDIR)$(ETCDIR)/ + $(INSTALL_FILE) etc/xsettings $(DESTDIR)$(ETCDIR)/ install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) @@ -84,7 +84,7 @@ uninstall_scripts: for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done uninstall_config: - $(RM_FILE) $(DESTDIR)$(ETCDIR)/xsettings.conf + $(RM_FILE) $(DESTDIR)$(ETCDIR)/xsettings uninstall_man: for file in man/man8/*.8; do $(RM_FILE) $(DESTDIR)$(MANDIR)/$${file#man}.gz; done diff --git a/x2goserver-xsettings/README.md b/x2goserver-xsettings/README.md index 90d009d..375aa55 100644 --- a/x2goserver-xsettings/README.md +++ b/x2goserver-xsettings/README.md @@ -3,7 +3,7 @@ This folder contains scripts and default settings to enable the use of the XSETT * etc - contains the default xsettings.conf file + contains the default xsettings file * lib diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index 9468359..492834f 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -115,10 +115,10 @@ X2GO_SESSION_DIR="${HOME}/.x2go/C-${X2GO_SESSION}/" X2GO_CONF_DIR="$(x2gopath etc)" XSETTINGSD_PID="${X2GO_SESSION_DIR}/xsettingsd.pid" XSETTINGSD_LOG="${X2GO_SESSION_DIR}/xsettingsd.log" -XSETTINGSD_REMOTE_CONF="${X2GO_SESSION_DIR}/xsettings-remote.conf" -XSETTINGSD_DEFAULT_CONF="${X2GO_CONF_DIR}/xsettings.conf" -XSETTINGSD_OVERRIDES_CONF="${HOME}/.xsettings-x2go.conf" -XSETTINGSD_CONF="${X2GO_CONF_DIR}/xsettings.conf" +XSETTINGSD_REMOTE_CONF="${X2GO_SESSION_DIR}/xsettings-remote" +XSETTINGSD_DEFAULT_CONF="${X2GO_CONF_DIR}/xsettings" +XSETTINGSD_OVERRIDES_CONF="${HOME}/.xsettings-x2go" +XSETTINGSD_CONF="${X2GO_CONF_DIR}/xsettings" export DISPLAY=":$(echo "${X2GO_SESSIONINFO}" | cut -d "|" -f3 | sed -e "s/[^0-9\-]//g")" diff --git a/x2goserver-xsettings/man/man8/x2goserver-xsettings.8.in b/x2goserver-xsettings/man/man8/x2goserver-xsettings.8.in index 5181181..4632f44 100644 --- a/x2goserver-xsettings/man/man8/x2goserver-xsettings.8.in +++ b/x2goserver-xsettings/man/man8/x2goserver-xsettings.8.in @@ -31,7 +31,7 @@ This package provides hooks for starting \fBxsettingsd\fP\&. .SH "CONFIGURATION" \fBxsettingsd\fP uses plain text files as configuration storage\&. A default configuration handling issues with GTK-based applications is shipped as -\fI@@SYSCONFDIR@@/xsettings\&.conf\fP\&. Edit the file to suit your needs\&. +\fI@@SYSCONFDIR@@/xsettings\fP\&. Edit the file to suit your needs\&. More sophisticated configuration handling is scheduled to be implemented at a later date and this documentation updated accordingly\&. -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git