This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 12817a7 Trigger Xsession code for SUSE systems (look for /etc/SUSE-brand for SUSE system recognition). new 1437f01 debian/changelog: typo new 7b9cf02 Hack for x2goserver-xsession/Makefile during SUSE builds. If directoy /usr/share/doc/packages/brp-check-suse is present, the build env is also considered to be a SUSE system. 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 | 5 ++++- x2goserver-xsession/Makefile | 2 +- 2 files changed, 5 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 1437f0159645e3c0a0e57ad2713866bfc4d6ff95 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 13 16:39:27 2014 +0200 debian/changelog: typo --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 736b4eb..a01b1fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -101,7 +101,7 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low + Make sure x2goserver-*.features files do not get installed multiple times into various packages. + Make sure X2Go Server (x2gocleansessions) starts after installation. - - Make sure X2Go session DB files get updated during postinst. + + Make sure X2Go session DB files get updated during postinst. + Require Perl(Switch) (bin:package x2goserver). [ Guangzhou Nianguan Electronics Technology Co.Ltd. ] -- 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 7b9cf024ac72e3ffda22c88138033ba7bb42b35b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 13 16:40:40 2014 +0200 Hack for x2goserver-xsession/Makefile during SUSE builds. If directoy /usr/share/doc/packages/brp-check-suse is present, the build env is also considered to be a SUSE system. --- debian/changelog | 3 +++ x2goserver-xsession/Makefile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a01b1fd..06aa768 100644 --- a/debian/changelog +++ b/debian/changelog @@ -144,6 +144,9 @@ 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). + - Hack for x2goserver-xsession/Makefile during SUSE builds. If + directoy /usr/share/doc/packages/brp-check-suse is present, the build env + is also considered to be a SUSE system. - Trigger Xsession code for SUSE systems (look for /etc/SUSE-brand for SUSE system recognition). * debian/control: diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index 43f584e..a834a6f 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -60,7 +60,7 @@ install_config: if [ -e /etc/redhat-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/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 || [ -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 install_man: -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org