[X2Go-Commits] nx-libs.git - build-main (branch) updated: redist-server/3.5.0.2-9-g0d3a820
X2Go dev team
git-admin at x2go.org
Fri Aug 30 16:23:09 CEST 2013
The branch, build-main has been updated
via 0d3a820b3ed1f76860cdee8dc0532674d621f1e3 (commit)
from d9d49b5d8606df5d400c34726cdc5fb9cccaa47b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 --
...-aware.patch => 101_nxagent_set-rgb-path.patch} | 18 ++----------------
debian/patches/series | 2 +-
3 files changed, 3 insertions(+), 19 deletions(-)
rename debian/patches/{202_nxagent_set-rgb-path-x2go-flavour-aware.patch => 101_nxagent_set-rgb-path.patch} (51%)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 38e59ae..23cd1d8 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 at 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
similarity index 51%
rename from debian/patches/202_nxagent_set-rgb-path-x2go-flavour-aware.patch
rename to debian/patches/101_nxagent_set-rgb-path.patch
index c4f0433..b77348c 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 at gmail.com>.
Forwarded: not-needed
Author: Mike Gabriel <mike.gabriel at 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 6f638c4..26d3ee8 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
hooks/post-receive
--
nx-libs.git (NX (redistributed))
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).
More information about the x2go-commits
mailing list