aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-01-28 11:21:02 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-01-28 11:38:09 +0100
commitbb70adf75aa95c94db3b4d7df5d2c526aa012cee (patch)
treea1f0848e65d82784760be9200b9dcf4f05897612 /debian
parent7357f8c0e011e9549e5a7351c0e23a45cba511e7 (diff)
downloadnx-libs-bb70adf75aa95c94db3b4d7df5d2c526aa012cee.tar.gz
nx-libs-bb70adf75aa95c94db3b4d7df5d2c526aa012cee.tar.bz2
nx-libs-bb70adf75aa95c94db3b4d7df5d2c526aa012cee.zip
Modify 101_nxagent_set-rgb-path.full.patch. Allow configurable rgb files.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/101_nxagent_set-rgb-path.full.patch2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 1b7bb6b4c..a8cb9d8ae 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 793b19d5b..9d20bee24 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