[X2Go-Commits] nx-libs.git - build-baikal (branch) updated: nxproxy/3.5.0-1-152-g7d9e154
X2Go dev team
git-admin at x2go.org
Fri Aug 30 16:24:41 CEST 2013
The branch, build-baikal has been updated
via 7d9e1544f5f1a3eb85b9d11ab328a4f8ce70f336 (commit)
from 0e3b58b7f13327685354b82dfa003fbc8f4987b5 (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 | 1 +
.../patches/005_nxagent_add-nxagent-wrapper.patch | 2 +-
.../patches/008_nxproxy_add-nxproxy-wrapper.patch | 2 +-
debian/patches/011_nxauth_add-nxauth-wrapper.patch | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 86ccbdb..a30b851 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,7 @@ nx-libs (2:3.5.0-0~x2go2) UNRELEASED; urgency=low
files from within /debian/rules.
* Add patch: 019_nx-x11_expat-build-against-system-libxmltok.patch, fixes
lintian error: embedded-library: expat. Build-depend on libxmltok1-dev.
+ * Fix LD_LIBRARY_PATH export in wrapper scripts/patches.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 28 Dec 2011 19:06:26 +0100
diff --git a/debian/patches/005_nxagent_add-nxagent-wrapper.patch b/debian/patches/005_nxagent_add-nxagent-wrapper.patch
index a2a9f92..2d0123b 100644
--- a/debian/patches/005_nxagent_add-nxagent-wrapper.patch
+++ b/debian/patches/005_nxagent_add-nxagent-wrapper.patch
@@ -4,7 +4,7 @@
+#!/bin/bash
+
+NX_LIBS=/usr/lib/nx
-+LD_LIBRARY_PATH=/usr/lib/nx
++LD_LIBRARY_PATH=/usr/lib/nx:/usr/lib/nx/X11:$LD_LIBRARY_PATH
+
+export NX_LIBS
+export LD_LIBRARY_PATH
diff --git a/debian/patches/008_nxproxy_add-nxproxy-wrapper.patch b/debian/patches/008_nxproxy_add-nxproxy-wrapper.patch
index 9c208e2..0d9077f 100644
--- a/debian/patches/008_nxproxy_add-nxproxy-wrapper.patch
+++ b/debian/patches/008_nxproxy_add-nxproxy-wrapper.patch
@@ -4,7 +4,7 @@
+#!/bin/bash
+
+NX_LIBS=/usr/lib/nx
-+LD_LIBRARY_PATH=/usr/lib/nx
++LD_LIBRARY_PATH=/usr/lib/nx:/usr/lib/nx/X11:$LD_LIBRARY_PATH
+
+export NX_LIBS
+export LD_LIBRARY_PATH
diff --git a/debian/patches/011_nxauth_add-nxauth-wrapper.patch b/debian/patches/011_nxauth_add-nxauth-wrapper.patch
index 231acc6..1a731b6 100644
--- a/debian/patches/011_nxauth_add-nxauth-wrapper.patch
+++ b/debian/patches/011_nxauth_add-nxauth-wrapper.patch
@@ -4,7 +4,7 @@
+#!/bin/bash
+
+NX_LIBS=/usr/lib/nx
-+LD_LIBRARY_PATH=/usr/lib/nx
++LD_LIBRARY_PATH=/usr/lib/nx:/usr/lib/nx/X11:$LD_LIBRARY_PATH
+
+export NX_LIBS
+export LD_LIBRARY_PATH
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