[X2Go-Commits] [nx-libs] 02/24: FHS path fix for rgb file This patch is needed on Debian only, not reporting this path addition to upstream.

git-admin at x2go.org git-admin at x2go.org
Tue Feb 10 21:50:49 CET 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit ceb70505c8c9796fe601b888d02cd98d62e47939
Author: Marcelo Boveto Shima <marceloshima at gmail.com>
Date:   Tue Feb 10 18:48:39 2015 +0100

    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 at das-netzwerkteam.de>
---
 debian/patches/101_nxagent_set-rgb-path.full.patch |   19 -------------------
 debian/patches/series                              |    1 -
 nx-X11/programs/Xserver/os/oscolor.c               |    2 +-
 3 files changed, 1 insertion(+), 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 9d20bee..0000000
--- 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 at gmail.com>.
-Forwarded: not-needed
-Author: Mike Gabriel <mike.gabriel at 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 fed9582..ceeaa8a 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 cf79857..d18e7b6 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

--
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