[X2Go-Commits] [x2goserver] 06/27: x2goserver-x2goagent/Makefile: do not stage rgb file any longer.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit ad2a047fba9935cab1f581e8765fabb0435c2dbe
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Feb 20 03:58:57 2018 +0100

    x2goserver-x2goagent/Makefile: do not stage rgb file any longer.
    
    Obsoleted, is now hardcoded into nxagent directly.
---
 debian/changelog              | 2 ++
 x2goserver-x2goagent/Makefile | 5 +----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 922f1f3..76f0a30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
     - x2goserver/lib/x2gocheckport: remove executable flag. This file is not
       meant to be executed directly, but rather sourced by other X2Go shell
       scripts.
+    - x2goserver-x2goagent/Makefile: do not stage rgb file any longer.
+      Obsoleted, is now hardcoded into nxagent directly.
   * debian/{control,compat}:
     + Bump DH compat level to 9.
   * debian/:
diff --git a/x2goserver-x2goagent/Makefile b/x2goserver-x2goagent/Makefile
index f29e2ca..810c9b0 100755
--- a/x2goserver-x2goagent/Makefile
+++ b/x2goserver-x2goagent/Makefile
@@ -62,14 +62,11 @@ install_scripts:
 
 install_data:
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/
-	$(INSTALL_FILE) etc/rgb $(DESTDIR)$(SHAREDIR)/
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/../pixmaps/
 	$(INSTALL_FILE) share/pixmaps/x2go.xpm $(DESTDIR)$(SHAREDIR)/../pixmaps/
-	$(INSTALL_SYMLINK) $(ETCDIR)/rgb $(DESTDIR)$(SHAREDIR)/
 
 install_config:
 	$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/
-	$(INSTALL_FILE) etc/rgb $(DESTDIR)$(ETCDIR)/
 	$(INSTALL_FILE) etc/x2goagent.options $(DESTDIR)$(ETCDIR)/
 	$(INSTALL_FILE) etc/x2goagent.keyboard $(DESTDIR)$(ETCDIR)/
 	$(INSTALL_FILE) etc/keystrokes.cfg $(DESTDIR)$(ETCDIR)/
@@ -93,7 +90,7 @@ uninstall_scripts:
 	for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done
 
 uninstall_data:
-	cd share && for file in pixmaps/x2go.xpm x2go/rgb; do \
+	cd share && for file in pixmaps/x2go.xpm; do \
 	    $(RM_FILE) $(DESTDIR)$(SHAREDIR)/../$$file; \
 	    $(RM_DIR) $(shell dirname $(DESTDIR)$(SHAREDIR)/../$$file); \
 	done

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git