[X2Go-Commits] [x2goserver] branch feature/x2goserver-xsettings updated (42b2125 -> 34ff953)

git-admin at x2go.org git-admin at x2go.org
Mon Mar 16 06:29:14 CET 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch feature/x2goserver-xsettings
in repository x2goserver.

  discards  42b2125   xsettings: remove temporary file in x2goserver_xsettings_merge.
  discards  37fea37   xsettings: fix speling errors in POSIX BRE character classes.
  discards  ef94bea   xsettings: try really hard to avoid name clashes by prefixing own shell functions with x2goserver_xsettings_.
  discards  2520776   xsettings: rename faulty "base" to "data".
  discards  696f7e3   xsettings: remove faulty directory installed by Makefile from debian/x2goserver-xsettings.install.
  discards  d5b47e0   xsettings: add missing post-resume.d targets to Makefile.
  discards  9b1e88f   extensions: add data/common.sh, providing commonly used variables.
  discards  4dadfa6   xsettings: split up common functionality (variables, functions) into extensions/base/x2goserver-xsettings-common.sh and reference this file in hooks.
  discards  01e9a55   extensions: add "data" directory to man page.
  discards  df2e282   extensions: add data directory in hooks directory used for shared data/programs/scripts.
  discards  7755b30   x2goserver: add generic typo and whitespace fixes comment to debian/changelog.
  discards  b6c7ef3   x2goserver: add x2gopath etc addition to debian/changelog.
  discards  78594b8   xsettings: add post-resume hook. source line must still be fixed to access shared shell code. TBD.
  discards  f291832   xsettings: add debian/x2goserver-xsettings.manpages.
  discards  fe2baa6   xsettings: add debian/x2goserver-xsettings.install.
  discards  dc73ef5   xsettings: add debian/x2goserver-xsettings.dirs.
  discards  927fa15   xsettings: add debian/changelog entries to reflect x2goserver-xsettings addition.
  discards  a0864d7   xsettings: add x2goserver-xsettings package to debian/control.
  discards  35ab117   xsettings: spell XSETTINGS in uppercase in RPM spec file.
  discards  70798b3   xsettings: change RPM spec file to include the new x2goserver-xsettings package.
  discards  e5c3d07   xsettings: documentation update, describe the newly implemented features.
  discards  82425ea   xsettings: rename xsettings.conf previously missed.
  discards  ae7792b   xsettings: create XSETTINGSD_OVERRIDES_CONF if missing.
  discards  7a4a5b5   xsettings: add comment explaining the merge shell function and its requirements.
  discards  2e69748   xsettings: remove .conf suffix from xsettingsd config files.
  discards  b008e93   xsettings: use merge shell function to merge the determined base config with the overrides config.
  discards  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.
  discards  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.
  discards  cc6c8fa   xsettings: rename XSETTINGSD_USER_CONF to XSETTINGSD_REMOTE_CONF.
  discards  625dddb   xsettings: use out file directly, no need for a second temp file.
  discards  95737dc   xsettings: filter out overriden keys. Add the rest to the second temporary file.
  discards  0f16fd2   xsettings: add loop through base file extracting key-value pairs.
  discards  4bfbe91   xsettings: go through overrides file and extract key-value pairs, write them into temp files for future reference.
  discards  a21c2fe   xsettings: add session dir parameter to merge shell function and create two temporary files in that session directory.
  discards  bc16d31   xsettings: add extract_value shell function to be used on a sanitized xsettingsd config file line.
  discards  e9e21b1   xsettings: add extract_key shell function to be used on a sanitized xsettingsd config file line.
  discards  d17b4fa   xsettings: add sanitize_line shell function to remove white space and comments from an xsettingsd config file line.
  discards  c3956a0   xsettings: add incomplete merge function to startup script.
  discards  c3dc40d   xsettings: also delete pre-processed man pages in clean_man2html target.
  discards  c7ec4b2   xsettings: pregen man files by piping man pages ending in .in through sed to replace placeholders.
  discards  081631e   xsettings: fix default config file.
  discards  4ec0b5a   xsettings: add manual page.
  discards  a055178   xsettings: add X2GO_XSETTINGS feature.
  discards  7c05046   xsettings: add default xsettingsd configuration file enabling MenuImages and ButtonImages.
  discards  a10fb98   xsettings: add pre-terminate hook.
  discards  a82068f   xsettings: add post-start hook.
  discards  1a23dd0   xsettings: add VERSION file.
  discards  efe2a07   x2goserver: add 'etc' target to x2gopath, use value specified in Makefile at build time.
  discards  ec962a7   xsettings: add README.md.
  discards  296a200   xsettings: add new stub.
      adds  825df7b   x2goserver.spec: only create session DB in x2goserver's post install script.
      adds  532d4f3   x2goserver.spec: add support for %{_datadir}/applications symlink in %{_sysconfdir}/x2go.
      adds  aa1929e   x2goserver.spec: don't use %{_sbindir} for chkconfig and service on SLE{S,D}.
      adds  bcafc6f   x2goserver.spec: change deprecated and removed PreReq to Requires(pre) header.
      adds  ecd0451   release 4.0.1.19 (cherry-picked from release/4.0.1.x branch)
      adds  e68165a   TERMINAL Session: Add support for qterminal
      adds  e617a5b   x2goserver/bin/x2gogetapps: respect NoDisplay and Hidden values, don't parse the full desktop file if there are non-Desktop Entries groups.
      adds  6ec2dcd   x2goserver/bin/x2gogetapps: first define an array, then use it...
      adds  4814587   x2goserver/bin/x2gogetapps: do not print spurious newlines.
       new  10b847e   xsettings: add new stub.
       new  0072d8a   xsettings: add README.md.
       new  1146f9f   x2goserver: add 'etc' target to x2gopath, use value specified in Makefile at build time.
       new  933529e   xsettings: add VERSION file.
       new  29fefd7   xsettings: add post-start hook.
       new  cbf9e1c   xsettings: add pre-terminate hook.
       new  7e04967   xsettings: add default xsettingsd configuration file enabling MenuImages and ButtonImages.
       new  5f70a94   xsettings: add X2GO_XSETTINGS feature.
       new  1cb7165   xsettings: add manual page.
       new  b7e4f22   xsettings: fix default config file.
       new  90b10cd   xsettings: pregen man files by piping man pages ending in .in through sed to replace placeholders.
       new  58cbdaf   xsettings: also delete pre-processed man pages in clean_man2html target.
       new  345f9f1   xsettings: add incomplete merge function to startup script.
       new  5c03855   xsettings: add sanitize_line shell function to remove white space and comments from an xsettingsd config file line.
       new  0db30a0   xsettings: add extract_key shell function to be used on a sanitized xsettingsd config file line.
       new  b5359fe   xsettings: add extract_value shell function to be used on a sanitized xsettingsd config file line.
       new  dcde05b   xsettings: add session dir parameter to merge shell function and create two temporary files in that session directory.
       new  e4798c5   xsettings: go through overrides file and extract key-value pairs, write them into temp files for future reference.
       new  05b7270   xsettings: add loop through base file extracting key-value pairs.
       new  8e5ba30   xsettings: filter out overriden keys. Add the rest to the second temporary file.
       new  d356d1c   xsettings: use out file directly, no need for a second temp file.
       new  f9b2743   xsettings: rename XSETTINGSD_USER_CONF to XSETTINGSD_REMOTE_CONF.
       new  9860fe0   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  3b64611   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  c629157   xsettings: use merge shell function to merge the determined base config with the overrides config.
       new  e2ac69d   xsettings: remove .conf suffix from xsettingsd config files.
       new  cd7d78b   xsettings: add comment explaining the merge shell function and its requirements.
       new  50c83a0   xsettings: create XSETTINGSD_OVERRIDES_CONF if missing.
       new  629ad37   xsettings: rename xsettings.conf previously missed.
       new  e63f30a   xsettings: documentation update, describe the newly implemented features.
       new  29bbf68   xsettings: change RPM spec file to include the new x2goserver-xsettings package.
       new  78c89ce   xsettings: spell XSETTINGS in uppercase in RPM spec file.
       new  2d89175   xsettings: add x2goserver-xsettings package to debian/control.
       new  9e3ff0a   xsettings: add debian/changelog entries to reflect x2goserver-xsettings addition.
       new  76d03e2   xsettings: add debian/x2goserver-xsettings.dirs.
       new  9a0a61e   xsettings: add debian/x2goserver-xsettings.install.
       new  57ddf48   xsettings: add debian/x2goserver-xsettings.manpages.
       new  1ef1966   xsettings: add post-resume hook. source line must still be fixed to access shared shell code. TBD.
       new  45da265   x2goserver: add x2gopath etc addition to debian/changelog.
       new  a82312e   x2goserver: add generic typo and whitespace fixes comment to debian/changelog.
       new  71f0235   extensions: add data directory in hooks directory used for shared data/programs/scripts.
       new  bc4da32   extensions: add "data" directory to man page.
       new  6721346   xsettings: split up common functionality (variables, functions) into extensions/base/x2goserver-xsettings-common.sh and reference this file in hooks.
       new  0c36f1c   extensions: add data/common.sh, providing commonly used variables.
       new  9b2e1c8   xsettings: add missing post-resume.d targets to Makefile.
       new  23c719c   xsettings: remove faulty directory installed by Makefile from debian/x2goserver-xsettings.install.
       new  85df6b5   xsettings: rename faulty "base" to "data".
       new  95d2c58   xsettings: try really hard to avoid name clashes by prefixing own shell functions with x2goserver_xsettings_.
       new  503f822   xsettings: fix speling errors in POSIX BRE character classes.
       new  34ff953   xsettings: remove temporary file in x2goserver_xsettings_merge.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (42b2125)
            \
             N -- N -- N   refs/heads/feature/x2goserver-xsettings (34ff953)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omits" are not gone; other references still
refer to them.  Any revisions marked "discards" are gone forever.

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.


Summary of changes:
 debian/changelog              |   23 ++++++++++--
 x2goserver.spec               |   56 +++++++++++++++--------------
 x2goserver/bin/x2gogetapps    |   78 +++++++++++++++++++++++++++--------------
 x2goserver/bin/x2goruncommand |    2 ++
 4 files changed, 104 insertions(+), 55 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git


More information about the x2go-commits mailing list