From d9d49b5d8606df5d400c34726cdc5fb9cccaa47b Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 11 Jan 2012 17:25:08 +0100 Subject: Drop patch: 101_nxagent_set-rgb-path.path, add patch: 202_nxagent_set-rgb-path-x2go-flavour-aware.patch. --- debian/changelog | 2 ++ debian/patches/101_nxagent_set-rgb-path.patch | 19 ------------- ...2_nxagent_set-rgb-path-x2go-flavour-aware.patch | 33 ++++++++++++++++++++++ debian/patches/series | 2 +- 4 files changed, 36 insertions(+), 20 deletions(-) delete mode 100644 debian/patches/101_nxagent_set-rgb-path.patch create mode 100644 debian/patches/202_nxagent_set-rgb-path-x2go-flavour-aware.patch 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 Wed, 11 Jan 2012 15:30:36 +0100 diff --git a/debian/patches/101_nxagent_set-rgb-path.patch b/debian/patches/101_nxagent_set-rgb-path.patch deleted file mode 100644 index b77348cc0..000000000 --- a/debian/patches/101_nxagent_set-rgb-path.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 . -Forwarded: not-needed -Author: Mike Gabriel -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 - #include - --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 diff --git a/debian/patches/202_nxagent_set-rgb-path-x2go-flavour-aware.patch b/debian/patches/202_nxagent_set-rgb-path-x2go-flavour-aware.patch new file mode 100644 index 000000000..c4f043357 --- /dev/null +++ b/debian/patches/202_nxagent_set-rgb-path-x2go-flavour-aware.patch @@ -0,0 +1,33 @@ +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 . +Forwarded: not-needed +Author: Mike Gabriel +Last-Update: 2011-12-31 +--- a/nx-X11/programs/Xserver/os/oscolor.c ++++ b/nx-X11/programs/Xserver/os/oscolor.c +@@ -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 + #include + #include + +-static char* nxAltRgbPaths[] = {"/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 -- cgit v1.2.3