aboutsummaryrefslogtreecommitdiff
path: root/debian/wrappers
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-01-27 13:56:36 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-01-28 11:35:59 +0100
commitb3d32ec569b8cd7efcb7a332d896eecd9681af02 (patch)
tree3c7e1d87ee226804e85e359dfe31bcdf67b0a198 /debian/wrappers
parenta3087eec9b048d308ae704f7a0540eaa416d4813 (diff)
downloadnx-libs-b3d32ec569b8cd7efcb7a332d896eecd9681af02.tar.gz
nx-libs-b3d32ec569b8cd7efcb7a332d896eecd9681af02.tar.bz2
nx-libs-b3d32ec569b8cd7efcb7a332d896eecd9681af02.zip
Fully rework the way nx-libs gets packaged for Debian/Ubuntu.
* Debian/Ubuntu packaging: + Fully rework the way nx-libs gets packaged for Debian/Ubuntu. + Split up libnx-x11 into individual packages. + Provide dbg:packages for each bin:package containing binaries. + Use Makefile logic to install files into DESTDIR. + Provide dev:packages for each lib:package individually. + Provide nx-x11proto-*-dev packages for all libnx-* libraries. + Install _all_ library files (*.so*) to /usr/lib/<triplet>/, so no extra settings of LD_LIBRARY_PATH is necessary.
Diffstat (limited to 'debian/wrappers')
-rw-r--r--debian/wrappers/nxagent3
-rw-r--r--debian/wrappers/nxauth3
-rw-r--r--debian/wrappers/nxproxy3
-rw-r--r--debian/wrappers/x2goagent3
4 files changed, 0 insertions, 12 deletions
diff --git a/debian/wrappers/nxagent b/debian/wrappers/nxagent
index 0aa75a82a..6306ed069 100644
--- a/debian/wrappers/nxagent
+++ b/debian/wrappers/nxagent
@@ -23,10 +23,7 @@ NX_LOCAL_LIBS=/usr/local/lib/nx
NX_TEMP=${NX_TEMP:-/tmp}
export NX_TEMP
-LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH
test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS
-export LD_LIBRARY_PATH
-
exec $NX_LIBS/bin/$NXAPP "$@"
diff --git a/debian/wrappers/nxauth b/debian/wrappers/nxauth
index e49e79058..c8dbb83f3 100644
--- a/debian/wrappers/nxauth
+++ b/debian/wrappers/nxauth
@@ -23,10 +23,7 @@ NX_LOCAL_LIBS=/usr/local/lib/nx
NX_TEMP=${NX_TEMP:-/tmp}
export NX_TEMP
-LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH
test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS
-export LD_LIBRARY_PATH
-
exec $NX_LIBS/bin/$NXAPP "$@" \ No newline at end of file
diff --git a/debian/wrappers/nxproxy b/debian/wrappers/nxproxy
index 7dfe2f3f0..23e7109e3 100644
--- a/debian/wrappers/nxproxy
+++ b/debian/wrappers/nxproxy
@@ -23,10 +23,7 @@ NX_LOCAL_LIBS=/usr/local/lib/nx
NX_TEMP=${NX_TEMP:-/tmp}
export NX_TEMP
-LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH
test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS
-export LD_LIBRARY_PATH
-
exec $NX_LIBS/bin/$NXAPP "$@" \ No newline at end of file
diff --git a/debian/wrappers/x2goagent b/debian/wrappers/x2goagent
index ba07a3f80..09011efbe 100644
--- a/debian/wrappers/x2goagent
+++ b/debian/wrappers/x2goagent
@@ -23,10 +23,7 @@ NX_LOCAL_LIBS=/usr/local/lib/nx
NX_TEMP=${NX_TEMP:-/tmp}
export NX_TEMP
-LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH
test -x $NX_LOCAL_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
test -x $NX_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LIBS
-export LD_LIBRARY_PATH
-
exec $NX_LIBS/../x2go/bin/$NXAPP "$@"