[X2Go-Commits] [x2goserver] 03/04: x2goserver-xsession/etc/Xsession: add support for Slackware in the RPM-based section.
git-admin at x2go.org
git-admin at x2go.org
Tue Jun 25 10:47:59 CEST 2019
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goserver.
commit 6475d276e12fd2589c34691243f26303aedf6aa7
Author: Mihai Moldovan <ionic at ionic.de>
Date: Tue Jun 25 10:46:44 2019 +0200
x2goserver-xsession/etc/Xsession: add support for Slackware in the RPM-based section.
---
debian/changelog | 2 ++
x2goserver-xsession/etc/Xsession | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index d522111..f329f2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -139,6 +139,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium
building on Devuan. No special conffile handling here since we don't
actually build Devuan packages.
- x2goserver-xsession/Makefile: same for rt-os.
+ - x2goserver-xsession/etc/Xsession: add support for Slackware in the
+ RPM-based section.
* debian/control:
+ Build-depend upon lsb-release for distro version detection.
* debian/x2goserver.manpages:
diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession
index ebee0c5..270a0b3 100755
--- a/x2goserver-xsession/etc/Xsession
+++ b/x2goserver-xsession/etc/Xsession
@@ -145,7 +145,7 @@ if [ -f /etc/debian_version ] || [ -f /etc/devuan_version ]; then
done
set -e
fi
-elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ] || [ -f /etc/os-rt-release ]; then
+elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ] || [ -f /etc/os-rt-release ] || [ -f /etc/slackware-version ]; 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 /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list