aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/101_nxagent_set-rgb-path.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-01-11 17:34:18 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-01-11 17:34:18 +0100
commit0d3a820b3ed1f76860cdee8dc0532674d621f1e3 (patch)
tree2f95fad7007138ea71e22588646f232afd7b3910 /debian/patches/101_nxagent_set-rgb-path.patch
parentd9d49b5d8606df5d400c34726cdc5fb9cccaa47b (diff)
downloadnx-libs-0d3a820b3ed1f76860cdee8dc0532674d621f1e3.tar.gz
nx-libs-0d3a820b3ed1f76860cdee8dc0532674d621f1e3.tar.bz2
nx-libs-0d3a820b3ed1f76860cdee8dc0532674d621f1e3.zip
Revert "Drop patch: 101_nxagent_set-rgb-path.path, add patch: 202_nxagent_set-rgb-path-x2go-flavour-aware.patch."
This reverts commit d9d49b5d8606df5d400c34726cdc5fb9cccaa47b.
Diffstat (limited to 'debian/patches/101_nxagent_set-rgb-path.patch')
-rw-r--r--debian/patches/101_nxagent_set-rgb-path.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/debian/patches/101_nxagent_set-rgb-path.patch b/debian/patches/101_nxagent_set-rgb-path.patch
new file mode 100644
index 000000000..b77348cc0
--- /dev/null
+++ b/debian/patches/101_nxagent_set-rgb-path.patch
@@ -0,0 +1,19 @@
+Description: FHS path fix for rgb file
+ This patch is needed on Debian only, not reporting this path
+ addition to upstream.
+ .
+ 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
+--- a/nx-X11/programs/Xserver/os/oscolor.c
++++ b/nx-X11/programs/Xserver/os/oscolor.c
+@@ -53,7 +53,7 @@
+ #include <sys/stat.h>
+ #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 _NXRgbPath[1024];
+
+ #endif