This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 135419f6 x2goserver-xsession/etc/Xsession: check for *SuSE via /usr/lib/os-release and /etc/os-release and generally refine checking layout a bit. new 91efd2a2 x2goserver-xsession/Makefile: Xresources is a file, not a directory. The 1 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 | 1 + x2goserver-xsession/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- Alioth's /home/x2go-admin/maintenancescripts/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 91efd2a2c52c2d48ec8dcb8d08b9838aa1ba1a0a Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 27 22:28:21 2023 +0100 x2goserver-xsession/Makefile: Xresources is a file, not a directory. --- debian/changelog | 1 + x2goserver-xsession/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 84294b52..911544ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -427,6 +427,7 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium - x2goserver-xsession/etc/Xsession: check for *SuSE via /usr/lib/os-release and /etc/os-release and generally refine checking layout a bit. + - x2goserver-xsession/Makefile: Xresources is a file, not a directory. * debian/control: + Build-depend upon lsb-release for distro version detection. + Pull in base64 as a run-time dependency. We'll need it in scripts. diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index d2cea16b..2f2bdf86 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -57,7 +57,7 @@ install_config: # *SuSE moved this to /usr/etc for later releases (currently Tumbleweed). # Prefer this location. for xres_prefix in '/usr' '/'; do \ - if [ -d "$${xres_prefix}/etc/X11/Xresources" ]; then \ + if [ -f "$${xres_prefix}/etc/X11/Xresources" ]; then \ $(INSTALL_SYMLINK) "$${xres_prefix}/etc/X11/Xresources" $(DESTDIR)$(ETCDIR)/ ; \ break; \ fi; \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org