[X2go-Commits] x2goagent.git - master (branch) updated: 3.5.0.2-14-g61fa6c1

[X2go dev team]

The branch, master has been updated
       via  61fa6c1604c7c8cf2615d65dd1b87b37b1c201cc (commit)
      from  72efbcab4c5eaf5bdcd9038554b028d14b02a219 (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 -----------------------------------------------------------------
commit 61fa6c1604c7c8cf2615d65dd1b87b37b1c201cc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Nov 21 22:38:52 2011 +0100

    programs/Xserver/os/Imakefile: use /usr/include/nx as include path for NX headers.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog              |    2 ++
 programs/Xserver/os/Imakefile |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f691d0c..095197a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ x2goagent (3.5.0.5-0~x2go1) UNRELEASED; urgency=low
   * lib/X11/Imakefile: use /usr/lib/nx as search path for libXcomp* libraries.
   * programms/Xserver/Imakefile: use /usr/lib/nx as search path for libXcomp*
     libraries.
+  * programs/Xserver/os/Imakefile: use /usr/include/nx as include path for NX
+    headers.
 
  -- Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>  Tue, 04 Oct 2011 08:11:22 +0200
 
diff --git a/programs/Xserver/os/Imakefile b/programs/Xserver/os/Imakefile
index 22be060..6c6e8a1 100644
--- a/programs/Xserver/os/Imakefile
+++ b/programs/Xserver/os/Imakefile
@@ -30,7 +30,7 @@ XCOMM $XFree86: xc/programs/Xserver/os/Imakefile,v 3.40 2003/09/09 03:20:41 dawe
 
 #if NXLibraries
 
-NX_INCLUDES = -I../../../../nxcomp
+NX_INCLUDES = -I../../../../nxcomp -I/usr/include/nx
 
 NX_DEFINES = -DNX_TRANS_SOCKET        \
              -DNX_TRANS_AUTH          \


hooks/post-receive
-- 
x2goagent.git (X2go (NX-like) Agent)

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 "x2goagent.git" (X2go (NX-like) Agent).