The branch, master has been updated via 8fed94d5b710e919761c7396414e1c7417e5cf01 (commit) via 8c0d5b93b80109be957d5746987935abc2ea6a11 (commit) from 8318f7035b8d7d335ecef604a7ec67644b2ce57b (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 8fed94d5b710e919761c7396414e1c7417e5cf01 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 21 22:10:49 2011 +0100 lib/X11/Imakefile: use /usr/lib/nx as search path for libXcomp* libraries. commit 8c0d5b93b80109be957d5746987935abc2ea6a11 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 21 22:10:17 2011 +0100 permissions fix for debian/rules ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + lib/X11/Imakefile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) mode change 100644 => 100755 debian/rules The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 13d614d..a3528c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ x2goagent (3.5.0.5-0~x2go1) UNRELEASED; urgency=low * Use an LD_LIBRARY_PATH compliant to nx-libs (2:3.5.0) in x2goagent wrapper script. * Remove xorg-dev, xutils-dev from build dependencies. + * lib/X11/Imakefile: use /usr/lib/nx as search path for libXcomp* libraries. -- Oleksandr Shneyder <oleksandr.shneyder@treuchtlingen.de> Tue, 04 Oct 2011 08:11:22 +0200 diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755 diff --git a/lib/X11/Imakefile b/lib/X11/Imakefile index 7689d7b..df49a36 100644 --- a/lib/X11/Imakefile +++ b/lib/X11/Imakefile @@ -59,14 +59,14 @@ NX_XCOMPLIBNAME = libXcomp.so NX_XCOMPEXTLIBNAME = libXcompext.so #endif -NX_XCOMPLIBDIR = /usr/lib +NX_XCOMPLIBDIR = /usr/lib/nx NX_XCOMPLIBLINK = Xcomp NX_XCOMPLIBTARGET = $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME) NX_REQUIREDLIBS = -L$(NX_XCOMPLIBDIR) -l$(NX_XCOMPLIBLINK) NX_XCOMPDEPTARGET = $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME) NX_XCOMPCONFIGTARGET = $(NX_XCOMPLIBDIR)/config.status -NX_XCOMPEXTLIBDIR = /usr/lib +NX_XCOMPEXTLIBDIR = /usr/lib/nx NX_XCOMPEXTLIBTARGET = $(NX_XCOMPEXTLIBDIR)/$(NX_XCOMPEXTLIBNAME) NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status 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).