This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/x2goserver-xsettings in repository x2goserver. at 42b2125 xsettings: remove temporary file in x2goserver_xsettings_merge. This branch includes the following new commits: new 296a200 xsettings: add new stub. new ec962a7 xsettings: add README.md. new efe2a07 x2goserver: add 'etc' target to x2gopath, use value specified in Makefile at build time. new 1a23dd0 xsettings: add VERSION file. new a82068f xsettings: add post-start hook. new a10fb98 xsettings: add pre-terminate hook. new 7c05046 xsettings: add default xsettingsd configuration file enabling MenuImages and ButtonImages. new a055178 xsettings: add X2GO_XSETTINGS feature. new 4ec0b5a xsettings: add manual page. new 081631e xsettings: fix default config file. new c7ec4b2 xsettings: pregen man files by piping man pages ending in .in through sed to replace placeholders. new c3dc40d xsettings: also delete pre-processed man pages in clean_man2html target. new c3956a0 xsettings: add incomplete merge function to startup script. new d17b4fa xsettings: add sanitize_line shell function to remove white space and comments from an xsettingsd config file line. new e9e21b1 xsettings: add extract_key shell function to be used on a sanitized xsettingsd config file line. new bc16d31 xsettings: add extract_value shell function to be used on a sanitized xsettingsd config file line. new a21c2fe xsettings: add session dir parameter to merge shell function and create two temporary files in that session directory. new 4bfbe91 xsettings: go through overrides file and extract key-value pairs, write them into temp files for future reference. new 0f16fd2 xsettings: add loop through base file extracting key-value pairs. new 95737dc xsettings: filter out overriden keys. Add the rest to the second temporary file. new 625dddb xsettings: use out file directly, no need for a second temp file. new cc6c8fa xsettings: rename XSETTINGSD_USER_CONF to XSETTINGSD_REMOTE_CONF. new 007d6ec xsettings: add XSETTINGSD_OVERRIDES_CONF for the user-provided config overriding arbitrary settings and XSETTINGSD_CONF as the file eventually to be used by xsettingsd. new ab25df3 xsettings: set XSETTINGSD_BASE_CONF to either the remote config to be pushed to the settings dir by a generic client or, if that is not available, the shipped global config in SYSCONFDIR. new b008e93 xsettings: use merge shell function to merge the determined base config with the overrides config. new 2e69748 xsettings: remove .conf suffix from xsettingsd config files. new 7a4a5b5 xsettings: add comment explaining the merge shell function and its requirements. new ae7792b xsettings: create XSETTINGSD_OVERRIDES_CONF if missing. new 82425ea xsettings: rename xsettings.conf previously missed. new e5c3d07 xsettings: documentation update, describe the newly implemented features. new 70798b3 xsettings: change RPM spec file to include the new x2goserver-xsettings package. new 35ab117 xsettings: spell XSETTINGS in uppercase in RPM spec file. new a0864d7 xsettings: add x2goserver-xsettings package to debian/control. new 927fa15 xsettings: add debian/changelog entries to reflect x2goserver-xsettings addition. new dc73ef5 xsettings: add debian/x2goserver-xsettings.dirs. new fe2baa6 xsettings: add debian/x2goserver-xsettings.install. new f291832 xsettings: add debian/x2goserver-xsettings.manpages. new 78594b8 xsettings: add post-resume hook. source line must still be fixed to access shared shell code. TBD. new b6c7ef3 x2goserver: add x2gopath etc addition to debian/changelog. new 7755b30 x2goserver: add generic typo and whitespace fixes comment to debian/changelog. new df2e282 extensions: add data directory in hooks directory used for shared data/programs/scripts. new 01e9a55 extensions: add "data" directory to man page. new 4dadfa6 xsettings: split up common functionality (variables, functions) into extensions/base/x2goserver-xsettings-common.sh and reference this file in hooks. new 9b1e88f extensions: add data/common.sh, providing commonly used variables. new d5b47e0 xsettings: add missing post-resume.d targets to Makefile. new 696f7e3 xsettings: remove faulty directory installed by Makefile from debian/x2goserver-xsettings.install. new 2520776 xsettings: rename faulty "base" to "data". new ef94bea xsettings: try really hard to avoid name clashes by prefixing own shell functions with x2goserver_xsettings_. new 37fea37 xsettings: fix speling errors in POSIX BRE character classes. new 42b2125 xsettings: remove temporary file in x2goserver_xsettings_merge. The 50 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /srv/git/code.x2go.org/x2goserver.git//../..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git