Revert "Drop patch: 101_nxagent_set-rgb-path.path, add patch:…

debian/changelog

@@ -10,8 +10,6 @@ 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
 

debian/patches/202_nxagent_set-rgb-path-x2go-flavour-aware.patch → debian/patches/101_nxagent_set-rgb-path.patch

@@ -2,32 +2,18 @@ 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
-@@ -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>
+@@ -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"};
-+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* nxAltRgbPaths[] = {"/usr/share/nx/rgb", "/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"};
  static char _NXRgbPath[1024];
  
  #endif

debian/patches/series

@@ -21,6 +21,7 @@
 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
@@ -31,7 +32,6 @@
 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