diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-01-11 17:34:18 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-01-11 17:34:18 +0100 |
| commit | 0d3a820b3ed1f76860cdee8dc0532674d621f1e3 (patch) | |
| tree | 2f95fad7007138ea71e22588646f232afd7b3910 | |
| parent | d9d49b5d8606df5d400c34726cdc5fb9cccaa47b (diff) | |
| download | nx-libs-0d3a820b3ed1f76860cdee8dc0532674d621f1e3.tar.gz nx-libs-0d3a820b3ed1f76860cdee8dc0532674d621f1e3.tar.bz2 nx-libs-0d3a820b3ed1f76860cdee8dc0532674d621f1e3.zip | |
Revert "Drop patch: 101_nxagent_set-rgb-path.path, add patch: 202_nxagent_set-rgb-path-x2go-flavour-aware.patch."
This reverts commit d9d49b5d8606df5d400c34726cdc5fb9cccaa47b.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/101_nxagent_set-rgb-path.patch (renamed from debian/patches/202_nxagent_set-rgb-path-x2go-flavour-aware.patch) | 18 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 3 insertions, 19 deletions
diff --git a/debian/changelog b/debian/changelog index 38e59aee4..23cd1d8e3 100644 --- a/debian/changelog +++ b/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 diff --git a/debian/patches/202_nxagent_set-rgb-path-x2go-flavour-aware.patch b/debian/patches/101_nxagent_set-rgb-path.patch index c4f043357..b77348cc0 100644 --- a/debian/patches/202_nxagent_set-rgb-path-x2go-flavour-aware.patch +++ b/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 diff --git a/debian/patches/series b/debian/patches/series index 6f638c46e..26d3ee812 100644 --- a/debian/patches/series +++ b/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 |