aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-01-11 17:25:08 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-01-11 17:25:08 +0100
commitd9d49b5d8606df5d400c34726cdc5fb9cccaa47b (patch)
treeb31d0fdd6578d2367582fc01847e2e74ddca7b86 /debian
parent43de8b97236e4fe94d06c2152da732aafaaa32ce (diff)
downloadnx-libs-d9d49b5d8606df5d400c34726cdc5fb9cccaa47b.tar.gz
nx-libs-d9d49b5d8606df5d400c34726cdc5fb9cccaa47b.tar.bz2
nx-libs-d9d49b5d8606df5d400c34726cdc5fb9cccaa47b.zip
Drop patch: 101_nxagent_set-rgb-path.path, add patch: 202_nxagent_set-rgb-path-x2go-flavour-aware.patch.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/202_nxagent_set-rgb-path-x2go-flavour-aware.patch (renamed from debian/patches/101_nxagent_set-rgb-path.patch)18
-rw-r--r--debian/patches/series2
3 files changed, 19 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 23cd1d8e3..38e59aee4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ nx-libs (2:3.5.0.2-1) UNRELEASED; urgency=low
- 999_nxagent_unbrand-nxagent-brand-x2goagent.patch
* Add patch: 023_add-x2goagent-wrapper.patch.
* Add patch: 209_x2goagent-add-man-page.patch.
+ * Drop patch: 101_nxagent_set-rgb-path.path,
+ add patch: 202_nxagent_set-rgb-path-x2go-flavour-aware.patch.
-- 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/202_nxagent_set-rgb-path-x2go-flavour-aware.patch
index b77348cc0..c4f043357 100644
--- a/debian/patches/101_nxagent_set-rgb-path.patch
+++ b/debian/patches/202_nxagent_set-rgb-path-x2go-flavour-aware.patch
@@ -2,18 +2,32 @@ Description: FHS path fix for rgb file
This patch is needed on Debian only, not reporting this path
addition to upstream.
.
+ This patch also is X2Go-flavour-aware.
+ .
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 @@
+@@ -47,13 +47,19 @@
+ ******************************************************************/
+ /* $Xorg: oscolor.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */
+
++#include "Init.h"
++
+ #ifdef NX_TRANS_SOCKET
+
+ #include <sys/types.h>
#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"};
++if (nxagentX2go) {
++ static char* nxAltRgbPaths[] = {"/usr/share/x2go/rgb", "/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"};
++} else {
++ static char* nxAltRgbPaths[] = {"/usr/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 26d3ee812..6f638c46e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,7 +21,6 @@
021_add-nxauth-wrapper.patch
022_add-nxproxy-wrapper.patch
023_add-x2goagent-wrapper.patch
-101_nxagent_set-rgb-path.patch
102_xserver-xext_set-securitypolicy-path.patch
103_nxagent_set-X0-config-path.patch
105_nxagent_export-remote-keyboard-config.patch
@@ -32,6 +31,7 @@
110_nxagent_createpixmap-bounds-check.patch
200_nxagent_check-binary-x2go-flavour.patch
201_nxagent_set-x2go-icon-if-x2goagent-flavour.patch
+202_nxagent_set-rgb-path-x2go-flavour-aware.patch
209_x2goagent-add-man-page.patch
300_nxagent_set-wm-class.patch
999_nxagent_unbrand-nxagent-brand-x2goagent.patch