This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 60a406af x2goserver.spec: Xresources symlink stays in /etc/x2go for now, no need to use %{_distconfdir} or the like. new d2b53bc2 x2goserver-xsession/Makefile: on systems that do not provide a global /etc/X11/Xresources file, create a dangling symlink instead. 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 | 3 +++ x2goserver-xsession/Makefile | 8 +++++++- 2 files changed, 10 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 d2b53bc25e6e3a379ab465ad6e46fad4473a2265 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 27 23:18:03 2023 +0100 x2goserver-xsession/Makefile: on systems that do not provide a global /etc/X11/Xresources file, create a dangling symlink instead. Unbreaks Debian builds. --- debian/changelog | 3 +++ x2goserver-xsession/Makefile | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 06d89762..1c2a50ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -430,6 +430,9 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium - x2goserver-xsession/Makefile: Xresources is a file, not a directory. - x2goserver.spec: Xresources symlink stays in /etc/x2go for now, no need to use %{_distconfdir} or the like. + - x2goserver-xsession/Makefile: on systems that do not provide a global + /etc/X11/Xresources file, create a dangling symlink instead. Unbreaks + Debian builds. * 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 2f2bdf86..85c504fc 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -56,12 +56,18 @@ install_config: $(INSTALL_PROGRAM) etc/Xsession $(DESTDIR)$(ETCDIR)/ # *SuSE moved this to /usr/etc for later releases (currently Tumbleweed). # Prefer this location. + # Debian-based systems do not have a global /etc/X11/Xresources file + # at all by default, so make sure to create a dangling symlink if + # needed. for xres_prefix in '/usr' '/'; do \ if [ -f "$${xres_prefix}/etc/X11/Xresources" ]; then \ $(INSTALL_SYMLINK) "$${xres_prefix}/etc/X11/Xresources" $(DESTDIR)$(ETCDIR)/ ; \ break; \ fi; \ - done + done; \ + if [ ! -e "$(DESTDIR)$(ETCDIR)/Xresources" ]; then \ + $(INSTALL_SYMLINK) '/etc/X11/Xresources' $(DESTDIR)$(ETCDIR)/ ; \ + fi if [ -e /etc/debian_version ] || [ -e /etc/devuan_version ]; then if [ -e $(XSESSIONOPTIONFILE) ]; then $(INSTALL_SYMLINK) $(XSESSIONOPTIONFILE) $(DESTDIR)$(ETCDIR)/Xsession.options; else touch $(DESTDIR)$(ETCDIR)/Xsession.options; fi; fi if [ -e /etc/debian_version ] || [ -e /etc/devuan_version ]; then if [ -d $(XSESSIONDIR) ]; then $(RM_FILE) $(DESTDIR)$(ETCDIR)/Xsession.d; $(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.d; fi; fi if [ -e /etc/debian_version ] || [ -e /etc/devuan_version ]; then if [ -d $(XSESSIONOPTIONSDIR) ]; then $(RM_FILE) $(DESTDIR)$(ETCDIR)/Xsession.options.d; $(INSTALL_SYMLINK) $(XSESSIONOPTIONSDIR) $(DESTDIR)$(ETCDIR)/Xsession.options.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.options.d; fi; fi -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org