[X2Go-Commits] [nx-libs] 03/19: Modify 101_nxagent_set-rgb-path.full.patch. Allow configurable rgb files.
git-admin at x2go.org
git-admin at x2go.org
Wed Jan 28 19:43:11 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository nx-libs.
commit bb70adf75aa95c94db3b4d7df5d2c526aa012cee
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Jan 28 11:21:02 2015 +0100
Modify 101_nxagent_set-rgb-path.full.patch. Allow configurable rgb files.
---
debian/changelog | 1 +
debian/patches/101_nxagent_set-rgb-path.full.patch | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 1b7bb6b..a8cb9d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
+ Fix removal of unused code (that part of the code that we know of so
far). (The debian/rules file is a Makefile and Makefiles don't understand
shell globbing with curly braces).
+ * Modify 101_nxagent_set-rgb-path.full.patch. Allow configurable rgb files.
[ Horst Schirmeier ]
* Update 320_nxagent_configurable-keystrokes.full.patch. Fix a typo that
diff --git a/debian/patches/101_nxagent_set-rgb-path.full.patch b/debian/patches/101_nxagent_set-rgb-path.full.patch
index 793b19d..9d20bee 100644
--- a/debian/patches/101_nxagent_set-rgb-path.full.patch
+++ b/debian/patches/101_nxagent_set-rgb-path.full.patch
@@ -13,7 +13,7 @@ Last-Update: 2012-01-12
#include <unistd.h>
-static char* nxAltRgbPaths[] = {"/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"};
-+static char* nxAltRgbPaths[] = {"/usr/share/nx/rgb", "/usr/local/share/nx/rgb", "/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"};
++static char* nxAltRgbPaths[] = {"/etc/nxagent/rgb", "/usr/share/nx/rgb", "/usr/local/share/nx/rgb", "/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"};
static char _NXRgbPath[1024];
#endif
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list