diff options
| author | Marcelo Boveto Shima <marceloshima@gmail.com> | 2015-02-10 18:48:39 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-10 19:40:41 +0100 |
| commit | ceb70505c8c9796fe601b888d02cd98d62e47939 (patch) | |
| tree | b80da7b3d1aedb91e1854fa7c0bf00afb267c28f | |
| parent | 2d68caca72bd36b168b36b252c8035643c69e692 (diff) | |
| download | nx-libs-ceb70505c8c9796fe601b888d02cd98d62e47939.tar.gz nx-libs-ceb70505c8c9796fe601b888d02cd98d62e47939.tar.bz2 nx-libs-ceb70505c8c9796fe601b888d02cd98d62e47939.zip | |
FHS path fix for rgb file
This patch is needed on Debian only, not reporting this path
addition to upstream.
Patch was modified by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| -rw-r--r-- | debian/patches/101_nxagent_set-rgb-path.full.patch | 19 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/oscolor.c | 2 |
3 files changed, 1 insertions, 21 deletions
diff --git a/debian/patches/101_nxagent_set-rgb-path.full.patch b/debian/patches/101_nxagent_set-rgb-path.full.patch deleted file mode 100644 index 9d20bee24..000000000 --- a/debian/patches/101_nxagent_set-rgb-path.full.patch +++ /dev/null @@ -1,19 +0,0 @@ -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: 2012-01-12 ---- 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[] = {"/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 diff --git a/debian/patches/series b/debian/patches/series index fed95824d..ceeaa8a97 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -101_nxagent_set-rgb-path.full.patch 102_xserver-xext_set-securitypolicy-path.full.patch 103_nxagent_set-X0-config-path.full.patch 105_nxagent_export-remote-keyboard-config.full.patch diff --git a/nx-X11/programs/Xserver/os/oscolor.c b/nx-X11/programs/Xserver/os/oscolor.c index cf79857f4..d18e7b647 100644 --- a/nx-X11/programs/Xserver/os/oscolor.c +++ b/nx-X11/programs/Xserver/os/oscolor.c @@ -53,7 +53,7 @@ SOFTWARE. #include <sys/stat.h> #include <unistd.h> -static char* nxAltRgbPaths[] = {"/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 |