[X2go-Commits] nx-libs.git - master (branch) updated: redist-client/3.5.0.16-35-g300bafb

X2Go dev team git-admin at x2go.org
Sun Dec 16 11:44:41 CET 2012


The branch, master has been updated
       via  300bafb1af567620df502cacb8bab7cac1ce9bf3 (commit)
       via  978aaa0a468aed9cb9efc6b414f5bb18acdcc7b1 (commit)
      from  918e2b10dbcc435b81929aadd6305b25cc0ccbad (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 300bafb1af567620df502cacb8bab7cac1ce9bf3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Dec 15 14:45:26 2012 +0100

    integrate install and uninstall rules into the top-level Makefile

commit 978aaa0a468aed9cb9efc6b414f5bb18acdcc7b1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Dec 15 14:58:58 2012 +0100

    integrate nx*/x2go* shell wrappers into debian/wrappers
    
    No longer add them as quilt patch, as they are much easier to edit this
    way. This, of course, requires adjustments to the roll-tarballs.sh script

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

Summary of changes:
 debian/Makefile.nx-libs                            |   43 +++++++++++++++++++-
 debian/changelog                                   |    2 +
 debian/libnx-mesa-extras-dev.install               |    6 +--
 debian/nxauth.install                              |    4 +-
 debian/nxproxy.install                             |    5 +--
 debian/patches/020_add-nxagent-wrapper.full.patch  |   35 ----------------
 debian/patches/021_add-nxauth-wrapper.full.patch   |   36 ----------------
 .../022_add-nxproxy-wrapper.full+lite.patch        |   36 ----------------
 .../patches/023_add-x2goagent-wrapper.full.patch   |   36 ----------------
 debian/patches/series                              |    4 --
 debian/roll-tarballs.sh                            |    8 ++++
 debian/rules                                       |   10 +++--
 debian/wrappers/nxagent                            |   32 +++++++++++++++
 debian/wrappers/nxauth                             |   32 +++++++++++++++
 debian/wrappers/nxproxy                            |   32 +++++++++++++++
 debian/wrappers/x2goagent                          |   32 +++++++++++++++
 debian/x2goagent.dirs                              |    4 +-
 debian/x2goagent.install                           |    9 ++--
 debian/x2goagent.links                             |    1 -
 19 files changed, 200 insertions(+), 167 deletions(-)
 delete mode 100644 debian/patches/020_add-nxagent-wrapper.full.patch
 delete mode 100644 debian/patches/021_add-nxauth-wrapper.full.patch
 delete mode 100644 debian/patches/022_add-nxproxy-wrapper.full+lite.patch
 delete mode 100644 debian/patches/023_add-x2goagent-wrapper.full.patch
 create mode 100644 debian/wrappers/nxagent
 create mode 100644 debian/wrappers/nxauth
 create mode 100644 debian/wrappers/nxproxy
 create mode 100644 debian/wrappers/x2goagent
 delete mode 100644 debian/x2goagent.links

The diff of changes is:
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index 3151be2..d50d699 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -1,10 +1,18 @@
 #!/usr/bin/make -f
 
+INSTALL_DIR=install -d -m 755
+INSTALL_FILE=install -m 644
+INSTALL_PROGRAM=install -m 755
+RM_FILE=rm -f
+RM_DIR=rmdir -p --ignore-fail-on-non-empty
+
 PREFIX ?= /usr/local
+BINDIR=$(PREFIX)/bin
+NXLIBDIR=$(PREFIX)/lib/nx
+X2GOLIBDIR=$(PREFIX)/lib/x2go
 CONFIGURE=./configure
 
 %:
-	if test -f bin/Makefile; then ${MAKE} -C bin $@; fi
 	if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi
 	if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi
 	if test -d nx-X11; then \
@@ -37,8 +45,39 @@ build:
 	    ${MAKE} build-full; \
 	fi
 
+install:
+	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+	for f in nxagent nxauth nxproxy x2goagent; do \
+	   $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done
+	for d in nxcomp nxproxy; do \
+	   $(MAKE) -C $$d install; done
+	[ ! -d nx-X11 ] || for d in nxcompext nxcompshad; do \
+	   $(MAKE) -C $$d install; done
+	$(INSTALL_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/
+	cd $(DESTDIR)$(X2GOLIBDIR)/bin/ && ln -sf ../../nx/bin/nxagent x2goagent
+	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/pixmaps
+	$(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/x2go.xpm $(DESTDIR)$(PREFIX)/share/pixmaps
+	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/x2go
+	$(INSTALL_FILE) rgb $(DESTDIR)$(PREFIX)/share/x2go
+	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/x2go/versions
+	$(INSTALL_FILE) VERSION.x2goagent $(DESTDIR)$(PREFIX)/share/x2go/versions
+	$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin
+	$(INSTALL_PROGRAM) nx-X11/programs/nxauth/nxauth $(DESTDIR)$(NXLIBDIR)/bin
+	$(INSTALL_PROGRAM) nxproxy/nxproxy $(DESTDIR)$(NXLIBDIR)/bin
+	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GL/internal
+	$(INSTALL_FILE) nx-X11/extras/Mesa/include/GL/*.h \
+	                $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GL/
+	$(INSTALL_FILE) nx-X11/extras/Mesa/include/GL/internal/*.h \
+	                $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GL/internal/
+	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GLES/
+	$(INSTALL_FILE) nx-X11/extras/Mesa/include/GLES/*.h \
+	                $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GLES/
+
 uninstall:
-	if test -f bin/Makefile; then ${MAKE} -C bin $@; fi
+	for f in nxagent nxauth nxproxy x2goagent; do \
+	   $(RM_FILE) $(DESTDIR)$(BINDIR)/$$f; done
+	$(RM_FILE) $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent
+	$(RM_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/
 	if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi
 	if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi
 	if test -d nx-X11; then \
diff --git a/debian/changelog b/debian/changelog
index 9350f13..335bc7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,8 @@ nx-libs (2:3.5.0.17-0) UNRELEASED; urgency=low
   * Update 031_nx-X11_parallel-make.full.patch. Add an explicit dependency
     from the NX libX11.so to the nxcomp libraries. Unbreaks parallel builds.
     (Fixes: #87).
+  * Fix and greatly enhance the top-level install and uninstall target for
+    plain makefile installs.
 
  -- Reinhard Tartler <siretart at tauware.de>  Sat, 15 Dec 2012 14:29:12 +0100
 
diff --git a/debian/libnx-mesa-extras-dev.install b/debian/libnx-mesa-extras-dev.install
index 7a54b8f..52fc7ba 100644
--- a/debian/libnx-mesa-extras-dev.install
+++ b/debian/libnx-mesa-extras-dev.install
@@ -1,3 +1,3 @@
-nx-X11/extras/Mesa/include/GL/*.h               usr/include/nx/extras/Mesa/GL/
-nx-X11/extras/Mesa/include/GL/internal/*.h      usr/include/nx/extras/Mesa/GL/internal/
-nx-X11/extras/Mesa/include/GLES/*.h             usr/include/nx/extras/Mesa/GLES/
+usr/include/nx/extras/Mesa/GL/
+usr/include/nx/extras/Mesa/GL/internal/
+usr/include/nx/extras/Mesa/GLES/
diff --git a/debian/nxauth.install b/debian/nxauth.install
index 94e4035..9c5db00 100644
--- a/debian/nxauth.install
+++ b/debian/nxauth.install
@@ -1,2 +1,2 @@
-nx-X11/programs/nxauth/nxauth                    usr/lib/nx/bin
-bin/nxauth                                       usr/bin
+usr/lib/nx/bin/nxauth
+usr/bin/nxauth
diff --git a/debian/nxproxy.install b/debian/nxproxy.install
index 7b2af0f..46c2e0a 100644
--- a/debian/nxproxy.install
+++ b/debian/nxproxy.install
@@ -1,3 +1,2 @@
-nxproxy/nxproxy                    usr/lib/nx/bin
-bin/nxproxy                        usr/bin
-
+usr/lib/nx/bin/nxproxy
+usr/bin/nxproxy
diff --git a/debian/patches/020_add-nxagent-wrapper.full.patch b/debian/patches/020_add-nxagent-wrapper.full.patch
deleted file mode 100644
index 6e98cb8..0000000
--- a/debian/patches/020_add-nxagent-wrapper.full.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- /dev/null
-+++ b/bin/nxagent
-@@ -0,0 +1,32 @@
-+#!/bin/bash
-+
-+# Copyright (C) 2012 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-+#
-+# This program is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see http://www.gnu.org/licenses/.
-+
-+NXAPP=nxagent
-+NX_LIBS=/usr/lib/nx
-+NX_LOCAL_LIBS=/usr/local/lib/nx
-+
-+# make sure nxagent starts properly with pam_tmpdir.so being in use
-+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/patches/021_add-nxauth-wrapper.full.patch b/debian/patches/021_add-nxauth-wrapper.full.patch
deleted file mode 100644
index caa1a71..0000000
--- a/debian/patches/021_add-nxauth-wrapper.full.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- /dev/null
-+++ b/bin/nxauth
-@@ -0,0 +1,32 @@
-+#!/bin/bash
-+
-+# Copyright (C) 2012 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-+#
-+# This program is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see http://www.gnu.org/licenses/.
-+
-+NXAPP=nxauth
-+NX_LIBS=/usr/lib/nx
-+NX_LOCAL_LIBS=/usr/local/lib/nx
-+
-+# make sure nxagent starts properly with pam_tmpdir.so being in use
-+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/patches/022_add-nxproxy-wrapper.full+lite.patch b/debian/patches/022_add-nxproxy-wrapper.full+lite.patch
deleted file mode 100644
index 20a1e68..0000000
--- a/debian/patches/022_add-nxproxy-wrapper.full+lite.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- /dev/null
-+++ b/bin/nxproxy
-@@ -0,0 +1,32 @@
-+#!/bin/bash
-+
-+# Copyright (C) 2012 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-+#
-+# This program is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see http://www.gnu.org/licenses/.
-+
-+NXAPP=nxproxy
-+NX_LIBS=/usr/lib/nx
-+NX_LOCAL_LIBS=/usr/local/lib/nx
-+
-+# make sure nxagent starts properly with pam_tmpdir.so being in use
-+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/patches/023_add-x2goagent-wrapper.full.patch b/debian/patches/023_add-x2goagent-wrapper.full.patch
deleted file mode 100644
index b3be894..0000000
--- a/debian/patches/023_add-x2goagent-wrapper.full.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- /dev/null
-+++ b/bin/x2goagent
-@@ -0,0 +1,32 @@
-+#!/bin/bash
-+
-+# Copyright (C) 2012 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-+#
-+# This program is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see http://www.gnu.org/licenses/.
-+
-+NXAPP=x2goagent
-+NX_LIBS=/usr/lib/nx
-+NX_LOCAL_LIBS=/usr/local/lib/nx
-+
-+# make sure nxagent starts properly with pam_tmpdir.so being in use
-+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 "$@"
-\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 01ce809..5099b99 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,10 +17,6 @@
 017_nx-X11_update-autotools-helper-files.full.patch
 018_nx-X11_update-libtool-ltmain-script.full.patch
 019_nx-X11_expat-build-against-system-libxmltok.full.patch
-020_add-nxagent-wrapper.full.patch
-021_add-nxauth-wrapper.full.patch
-022_add-nxproxy-wrapper.full+lite.patch
-023_add-x2goagent-wrapper.full.patch
 024_fix-make-clean.full.patch
 024_fix-make-clean.full+lite.patch
 026_nxcompext_honour-optflags.full.patch
diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh
index b7f0c3e..b43de4b 100755
--- a/debian/roll-tarballs.sh
+++ b/debian/roll-tarballs.sh
@@ -86,6 +86,7 @@ if [ "x$MODE" = "xfull" ]; then
         cp -v $file doc/applied-patches
         echo ${file##*/} >> doc/applied-patches/series
     done
+    cp -v debian/rgb debian/VERSION.x2goagent .
 else
     rm -Rf "nxcompshad"*
     rm -Rf "nxcompext"*
@@ -108,6 +109,13 @@ fi
 for f in $(ls README* 2>/dev/null); do
     mv -v $f doc/;
 done
+
+mkdir -p bin/
+# old releases introude the wrappers via quilt patch
+for w in $(ls debian/wrappers/* 2>/dev/null); do
+    cp -v $w bin/
+done
+
 mv -v debian/changelog doc/changelog
 
 # copy the top-level makefile if no quilt patch created it before
diff --git a/debian/rules b/debian/rules
index b9df940..c1f0294 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,9 +20,12 @@ override_dh_clean:
 	rm -f nx*/changelog
 	rm -f nx-X11/programs/Xserver/hw/nxagent/changelog
 	rm -f nx-X11/programs/nxauth/changelog
-	rm -f Makefile
+	rm -f Makefile bin rgb VERSION.x2goagent
 	dh_clean
 
+override_dh_auto_install:
+	PREFIX=/usr dh_auto_install -Smakefile
+
 override_dh_auto_build:
 	# create copies of upstream changelogs so that names apply to Debian policy...
 	cp -a nx-X11/CHANGELOG nx-X11/changelog
@@ -33,10 +36,11 @@ override_dh_auto_build:
 	cp -a nx-X11/programs/nxauth/CHANGELOG nx-X11/programs/nxauth/changelog
 	cp -a nxproxy/CHANGELOG nxproxy/changelog
 	ln -s debian/Makefile.nx-libs Makefile
+	ln -s debian/wrappers bin
+	ln -s debian/rgb
+	ln -s debian/VERSION.x2goagent
 	LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --with quilt --parallel
 	debian/post-build-nx.sh
 
-override_dh_auto_install:
-
 override_dh_strip:
 	dh_strip --dbg-package=nx-x11-dbg
diff --git a/debian/wrappers/nxagent b/debian/wrappers/nxagent
new file mode 100644
index 0000000..0aa75a8
--- /dev/null
+++ b/debian/wrappers/nxagent
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Copyright (C) 2012 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see http://www.gnu.org/licenses/.
+
+NXAPP=nxagent
+NX_LIBS=/usr/lib/nx
+NX_LOCAL_LIBS=/usr/local/lib/nx
+
+# make sure nxagent starts properly with pam_tmpdir.so being in use
+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
new file mode 100644
index 0000000..e49e790
--- /dev/null
+++ b/debian/wrappers/nxauth
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Copyright (C) 2012 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see http://www.gnu.org/licenses/.
+
+NXAPP=nxauth
+NX_LIBS=/usr/lib/nx
+NX_LOCAL_LIBS=/usr/local/lib/nx
+
+# make sure nxagent starts properly with pam_tmpdir.so being in use
+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
new file mode 100644
index 0000000..7dfe2f3
--- /dev/null
+++ b/debian/wrappers/nxproxy
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Copyright (C) 2012 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see http://www.gnu.org/licenses/.
+
+NXAPP=nxproxy
+NX_LIBS=/usr/lib/nx
+NX_LOCAL_LIBS=/usr/local/lib/nx
+
+# make sure nxagent starts properly with pam_tmpdir.so being in use
+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
new file mode 100644
index 0000000..a74f44c
--- /dev/null
+++ b/debian/wrappers/x2goagent
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Copyright (C) 2012 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see http://www.gnu.org/licenses/.
+
+NXAPP=x2goagent
+NX_LIBS=/usr/lib/nx
+NX_LOCAL_LIBS=/usr/local/lib/nx
+
+# make sure nxagent starts properly with pam_tmpdir.so being in use
+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 "$@"
\ No newline at end of file
diff --git a/debian/x2goagent.dirs b/debian/x2goagent.dirs
index 042e97d..548ecdf 100644
--- a/debian/x2goagent.dirs
+++ b/debian/x2goagent.dirs
@@ -1,3 +1,3 @@
 usr/bin
-usr/lib/nx
-usr/share/x2go
\ No newline at end of file
+usr/share/pixmaps
+usr/share/x2go
diff --git a/debian/x2goagent.install b/debian/x2goagent.install
index 20019f1..72058a9 100644
--- a/debian/x2goagent.install
+++ b/debian/x2goagent.install
@@ -1,4 +1,5 @@
-bin/x2goagent                                  usr/bin
-debian/rgb                                     usr/share/x2go
-nx-X11/programs/Xserver/hw/nxagent/x2go.xpm    usr/share/pixmaps
-debian/VERSION.x2goagent                       usr/share/x2go/versions
\ No newline at end of file
+usr/bin/x2goagent
+usr/lib/x2go/bin/x2goagent
+usr/share/pixmaps/x2go.xpm
+usr/share/x2go/rgb
+usr/share/x2go/versions/VERSION.x2goagent
diff --git a/debian/x2goagent.links b/debian/x2goagent.links
deleted file mode 100644
index 2aebb6c..0000000
--- a/debian/x2goagent.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/nx/bin/nxagent usr/lib/x2go/bin/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)).




More information about the x2go-commits mailing list