[X2go-Commits] x2goagent.git - master (branch) updated: 3.5.0.2-15-g3955136

[X2go dev team]

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

    programs/Xserver/Imakefile: use /usr/lib/nx and /usr/lib/nx/X11 as NX library paths.

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 095197a..a9c2421 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ x2goagent (3.5.0.5-0~x2go1) UNRELEASED; urgency=low
     libraries.
   * programs/Xserver/os/Imakefile: use /usr/include/nx as include path for NX
     headers.
+  * programs/Xserver/Imakefile: use /usr/lib/nx and /usr/lib/nx/X11 as NX
+    library paths.
 
  -- Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>  Tue, 04 Oct 2011 08:11:22 +0200
 
diff --git a/programs/Xserver/Imakefile b/programs/Xserver/Imakefile
index fa03077..383407c 100644
--- a/programs/Xserver/Imakefile
+++ b/programs/Xserver/Imakefile
@@ -1019,7 +1019,7 @@ NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \
                 -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \
                 -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst
 #else
-NXAGENTNXLIBS = \
+NXAGENTNXLIBS = -L /usr/lib/nx -L /usr/lib/nx/X11 \
                 -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \
                 -lXtst -lXdamage -lXrandr -lXcomposite
 #endif


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).