aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/101_nxagent_set-rgb-path.patch4
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 81f2d95c7..d9d5db5cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ nx-libs (2:3.5.0.2-1) UNRELEASED; urgency=low
* Add patch: 209_x2goagent-add-man-page.patch.
* Add binary package: x2goagent, includes man page
patch: 209_x2goagent-add-man-page.patch
+ * Modify patch: 101_nxagent_set-rgb-path.patch, add path to RGB file
+ if NX (redistributed) is installed via tarball under /usr/local.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 11 Jan 2012 15:30:36 +0100
diff --git a/debian/patches/101_nxagent_set-rgb-path.patch b/debian/patches/101_nxagent_set-rgb-path.patch
index b77348cc0..793b19d5b 100644
--- a/debian/patches/101_nxagent_set-rgb-path.patch
+++ b/debian/patches/101_nxagent_set-rgb-path.patch
@@ -5,7 +5,7 @@ Description: FHS path fix for rgb file
Originally contributed by Marcelo Boveto Shima <marceloshima@gmail.com>.
Forwarded: not-needed
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Last-Update: 2011-12-31
+Last-Update: 2012-01-12
--- a/nx-X11/programs/Xserver/os/oscolor.c
+++ b/nx-X11/programs/Xserver/os/oscolor.c
@@ -53,7 +53,7 @@
@@ -13,7 +13,7 @@ Last-Update: 2011-12-31
#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/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 _NXRgbPath[1024];
#endif