[X2Go-Commits] nx-libs.git - build-main (branch) updated: redist-server/3.5.0.4-1-ga295d73

[X2Go dev team]

The branch, build-main has been updated
       via  a295d73f6203acfdbfb044a69d6402978ce21b37 (commit)
      from  8199a5d2ac5270a52f7855513916b5ce444579d7 (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                               |    6 ++++++
 debian/patches/020_add-nxagent-wrapper.patch   |    4 ++--
 debian/patches/021_add-nxauth-wrapper.patch    |    4 ++--
 debian/patches/022_add-nxproxy-wrapper.patch   |    4 ++--
 debian/patches/023_add-x2goagent-wrapper.patch |    4 ++--
 5 files changed, 14 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d2b77ad..cf80f19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nx-libs (2:3.5.0.5-0) UNRELEASED; urgency=low
+
+  * Fix wrapper script patches for nxagent, x2goagent, nxauth, nxproxy.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 13 Jan 2012 00:35:56 +0100
+
 nx-libs (2:3.5.0.4-0) unstable; urgency=low
 
   * Update/fix patch: 999_nxagent_unbrand-nxagent-brand-x2goagent.patch.
diff --git a/debian/patches/020_add-nxagent-wrapper.patch b/debian/patches/020_add-nxagent-wrapper.patch
index f6a9a1d..daee69d 100644
--- a/debian/patches/020_add-nxagent-wrapper.patch
+++ b/debian/patches/020_add-nxagent-wrapper.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/bin/nxagent
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,25 @@
 +#!/bin/bash
 +
 +# Copyright (C) 2012 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
@@ -22,7 +22,7 @@
 +NX_LOCAL_LIBS=/usr/local/lib/nx
 +LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH
 +
-+test -d NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
++test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
 +export LD_LIBRARY_PATH
 +
 +exec $NX_LIBS/nxagent "$@"
diff --git a/debian/patches/021_add-nxauth-wrapper.patch b/debian/patches/021_add-nxauth-wrapper.patch
index fea0b84..6e3ea83 100644
--- a/debian/patches/021_add-nxauth-wrapper.patch
+++ b/debian/patches/021_add-nxauth-wrapper.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/bin/nxauth
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,25 @@
 +#!/bin/bash
 +
 +# Copyright (C) 2012 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
@@ -22,7 +22,7 @@
 +NX_LOCAL_LIBS=/usr/local/lib/nx
 +LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH
 +
-+test -d NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
++test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
 +export LD_LIBRARY_PATH
 +
 +exec $NX_LIBS/nxauth "$@"
diff --git a/debian/patches/022_add-nxproxy-wrapper.patch b/debian/patches/022_add-nxproxy-wrapper.patch
index 53b0c29..df603fd 100644
--- a/debian/patches/022_add-nxproxy-wrapper.patch
+++ b/debian/patches/022_add-nxproxy-wrapper.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/bin/nxproxy
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,25 @@
 +#!/bin/bash
 +
 +# Copyright (C) 2012 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
@@ -22,7 +22,7 @@
 +NX_LOCAL_LIBS=/usr/local/lib/nx
 +LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH
 +
-+test -d NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
++test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
 +export LD_LIBRARY_PATH
 +
 +exec $NX_LIBS/nxproxy "$@"
diff --git a/debian/patches/023_add-x2goagent-wrapper.patch b/debian/patches/023_add-x2goagent-wrapper.patch
index ca7d92e..d23d3f0 100644
--- a/debian/patches/023_add-x2goagent-wrapper.patch
+++ b/debian/patches/023_add-x2goagent-wrapper.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/bin/x2goagent
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,25 @@
 +#!/bin/bash
 +
 +# Copyright (C) 2012 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
@@ -22,7 +22,7 @@
 +NX_LOCAL_LIBS=/usr/local/lib/nx
 +LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH
 +
-+test -d NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
++test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
 +export LD_LIBRARY_PATH
 +
 +exec $NX_LIBS/../x2go/x2goagent "$@"


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