This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from ca8ec15 x2goserver-xsession/Makefile: Fix for detection of SUSE system. new 2480897 x2goserver.spec: No %{_sysconfdir}/x2go/Xclients.d on SUSE systems. new 12817a7 Trigger Xsession code for SUSE systems (look for /etc/SUSE-brand for SUSE system recognition). The 2 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 | 3 +++ x2goserver-xsession/Makefile | 1 - x2goserver-xsession/etc/Xsession | 2 +- x2goserver.spec | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 24808970f78986769073d3e5b76354421dca768c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 13 16:29:56 2014 +0200 x2goserver.spec: No %{_sysconfdir}/x2go/Xclients.d on SUSE systems. --- debian/changelog | 1 + x2goserver.spec | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index ee396ec..45a3413 100644 --- a/debian/changelog +++ b/debian/changelog @@ -153,6 +153,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium non-SUSE builds. + Add to R: x2goserver-xsession. + Don't mention /etc/x2go/x2gosql/sql twice (directly and with wildcard). + + No %{_sysconfdir}/x2go/Xclients.d on SUSE systems. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Oct 2014 15:35:38 +0200 diff --git a/x2goserver.spec b/x2goserver.spec index 3ce0d4b..71a6326 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -519,7 +519,9 @@ exit 0 %files xsession %{_sysconfdir}/x2go/xinitrc.d +%if 0%{?fedora} || 0%{?rhel} %{_sysconfdir}/x2go/Xclients.d +%endif %{_sysconfdir}/x2go/Xresources %config(noreplace) %{_sysconfdir}/x2go/Xsession %{_datadir}/x2go/x2gofeature.d/x2goserver-xsession.features -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 12817a7a9a81ecce9061ec523ce02fd284949fc8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 13 16:30:40 2014 +0200 Trigger Xsession code for SUSE systems (look for /etc/SUSE-brand for SUSE system recognition). --- debian/changelog | 2 ++ x2goserver-xsession/Makefile | 1 - x2goserver-xsession/etc/Xsession | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 45a3413..736b4eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -144,6 +144,8 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium build system (required for openSUSE/SLES builds). - Fix x2goserver-xsession/Makefile on SUSE. Detect SUSE distro and create Xsession related directory symlinks (xinitrc.d and Xclients.d). + - Trigger Xsession code for SUSE systems (look for /etc/SUSE-brand for + SUSE system recognition). * debian/control: + Add D (x2goserver): libfile-which-perl. * x2goserver.spec: diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index ab42bb5..43f584e 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -61,7 +61,6 @@ install_config: if [ -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/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; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi - if [ -e /etc/os-release ] && cat /etc/os-release | grep "suse" 1>/dev/null; then if [ -d $(XCLIENTSDIR) ]; then $(INSTALL_SYMLINK) $(XCLIENTSDIR) $(DESTDIR)$(ETCDIR)/Xclients.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xclients.d; fi; fi install_man: diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index 94692db..3b85b9e 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -130,7 +130,7 @@ if [ -f /etc/debian_version ]; then done set -e fi -elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ]; then +elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-brand ]; then # define a fallback... (should never be needed). The XSESSION_EXEC var gets set in # X2Go's x2goruncommand script and can be used with obsolete switchdesk or with -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org