Provide wrapper scripts for launch NX components in $(src)/bin/.

  The installation process copies NX wrapper scripts into
  $(srcbase)/bin/ before build time.

  Those wrapper scripts are now in place natively and need not
  to be copied prior to building NX.

  Packaging scripts with adaptation:

   debian/roll-tarballs.sh
   debian/rules
   debian/*.docs
   nx-libs.spec

24 files changed, 2 insertions, 145 deletions

diff --git a/debian/libnx-x11-6.docs b/debian/libnx-x11-6.docs
deleted file mode 100644
index 5a57a3fdc..000000000
--- a/debian/libnx-x11-6.docs
+++ /dev/null
@@ -1 +0,0 @@
-nx-X11/changelog
\ No newline at end of file
diff --git a/debian/libnx-xau6.docs b/debian/libnx-xau6.docs
deleted file mode 100644
index 5a57a3fdc..000000000
--- a/debian/libnx-xau6.docs
+++ /dev/null
@@ -1 +0,0 @@
-nx-X11/changelog
\ No newline at end of file
diff --git a/debian/libnx-xcomposite1.docs b/debian/libnx-xcomposite1.docs
deleted file mode 100644
index 5a57a3fdc..000000000
--- a/debian/libnx-xcomposite1.docs
+++ /dev/null
@@ -1 +0,0 @@
-nx-X11/changelog
\ No newline at end of file
diff --git a/debian/libnx-xdamage1.docs b/debian/libnx-xdamage1.docs
deleted file mode 100644
index 5a57a3fdc..000000000
--- a/debian/libnx-xdamage1.docs
+++ /dev/null
@@ -1 +0,0 @@
-nx-X11/changelog
\ No newline at end of file
diff --git a/debian/libnx-xdmcp6.docs b/debian/libnx-xdmcp6.docs
deleted file mode 100644
index 5a57a3fdc..000000000
--- a/debian/libnx-xdmcp6.docs
+++ /dev/null
@@ -1 +0,0 @@
-nx-X11/changelog
\ No newline at end of file
diff --git a/debian/libnx-xext6.docs b/debian/libnx-xext6.docs
deleted file mode 100644
index 5a57a3fdc..000000000
--- a/debian/libnx-xext6.docs
+++ /dev/null
@@ -1 +0,0 @@
-nx-X11/changelog
\ No newline at end of file
diff --git a/debian/libnx-xfixes3.docs b/debian/libnx-xfixes3.docs
deleted file mode 100644
index 5a57a3fdc..000000000
--- a/debian/libnx-xfixes3.docs
+++ /dev/null
@@ -1 +0,0 @@
-nx-X11/changelog
\ No newline at end of file
diff --git a/debian/libnx-xinerama1.docs b/debian/libnx-xinerama1.docs
deleted file mode 100644
index 5a57a3fdc..000000000
--- a/debian/libnx-xinerama1.docs
+++ /dev/null
@@ -1 +0,0 @@
-nx-X11/changelog
\ No newline at end of file
diff --git a/debian/libnx-xpm4.docs b/debian/libnx-xpm4.docs
deleted file mode 100644
index 5a57a3fdc..000000000
--- a/debian/libnx-xpm4.docs
+++ /dev/null
@@ -1 +0,0 @@
-nx-X11/changelog
\ No newline at end of file
diff --git a/debian/libnx-xrandr2.docs b/debian/libnx-xrandr2.docs
deleted file mode 100644
index 5a57a3fdc..000000000
--- a/debian/libnx-xrandr2.docs
+++ /dev/null
@@ -1 +0,0 @@
-nx-X11/changelog
\ No newline at end of file
diff --git a/debian/libnx-xrender1.docs b/debian/libnx-xrender1.docs
deleted file mode 100644
index 5a57a3fdc..000000000
--- a/debian/libnx-xrender1.docs
+++ /dev/null
@@ -1 +0,0 @@
-nx-X11/changelog
\ No newline at end of file
diff --git a/debian/libnx-xtst6.docs b/debian/libnx-xtst6.docs
deleted file mode 100644
index 5a57a3fdc..000000000
--- a/debian/libnx-xtst6.docs
+++ /dev/null
@@ -1 +0,0 @@
-nx-X11/changelog
\ No newline at end of file
diff --git a/debian/libxcomp3.docs b/debian/libxcomp3.docs
deleted file mode 100644
index 97efc9f41..000000000
--- a/debian/libxcomp3.docs
+++ /dev/null
@@ -1 +0,0 @@
-nxcomp/changelog
diff --git a/debian/libxcompext3.docs b/debian/libxcompext3.docs
deleted file mode 100644
index 8323a3471..000000000
--- a/debian/libxcompext3.docs
+++ /dev/null
@@ -1 +0,0 @@
-nxcompext/changelog
diff --git a/debian/libxcompshad3.docs b/debian/libxcompshad3.docs
deleted file mode 100644
index 33632b9a6..000000000
--- a/debian/libxcompshad3.docs
+++ /dev/null
@@ -1 +0,0 @@
-nxcompshad/changelog
diff --git a/debian/nxagent.docs b/debian/nxagent.docs
index 6d791c6da..5d7d87aed 100644
--- a/debian/nxagent.docs
+++ b/debian/nxagent.docs
@@ -1,2 +1 @@
-nx-X11/programs/Xserver/hw/nxagent/changelog
 README.keystrokes
\ No newline at end of file
diff --git a/debian/nxauth.docs b/debian/nxauth.docs
deleted file mode 100644
index aaa115f2c..000000000
--- a/debian/nxauth.docs
+++ /dev/null
@@ -1 +0,0 @@
-nx-X11/programs/nxauth/changelog
\ No newline at end of file
diff --git a/debian/nxproxy.docs b/debian/nxproxy.docs
index 4b3d18d8c..2243d21ac 100644
--- a/debian/nxproxy.docs
+++ b/debian/nxproxy.docs
@@ -1,4 +1,3 @@
-nxproxy/changelog
 nxproxy/README
 nxproxy/README-IPAQ
 nxproxy/README-VALGRIND
diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh
index 37c897a66..384bc57e8 100755
--- a/debian/roll-tarballs.sh
+++ b/debian/roll-tarballs.sh
@@ -116,15 +116,7 @@ for f in $(ls README* 2>/dev/null); do
     mv -v $f doc/;
 done
 
-mkdir -p bin/
-if [ "$MODE" = "lite" ]; then
-    # copy wrapper script nxproxy only into tarball
-    cp -v debian/wrappers/nxproxy bin/
-else
-    # copy wrapper scripts into tarball
-    for w in $(ls debian/wrappers/* 2>/dev/null); do
-        cp -v $w bin/
-    done
+if [ "$MODE" = "full" ]; then
     # provide a default keystrokes.cfg file
     mkdir -p etc
     test -f etc/keystrokes.cfg || test -f debian/keystrokes.cfg && cp -v debian/keystrokes.cfg etc/keystrokes.cfg
diff --git a/debian/rules b/debian/rules
index b17828231..7b60a46a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ override_dh_auto_clean:
 override_dh_clean:
 	rm -f nx*/configure
 	. ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done
-	rm -fR bin etc/rgb etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard
+	rm -fR etc/rgb etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard
 	rm -f debian/libnx-xinerama1.postinst
 	rm -fR .preserve/
 	dh_clean
@@ -78,7 +78,6 @@ override_dh_auto_install:
 
 override_dh_auto_build:
 
-	ln -s debian/wrappers bin
 	mkdir -p etc/
 	ln -s ../debian/keystrokes.cfg etc/keystrokes.cfg
 	ln -s ../debian/rgb etc/rgb
diff --git a/debian/wrappers/nxagent b/debian/wrappers/nxagent
deleted file mode 100644
index 6306ed069..000000000
--- a/debian/wrappers/nxagent
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2012 Mike Gabriel <mike.gabriel@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
-
-test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
-test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS
-
-exec $NX_LIBS/bin/$NXAPP "$@"
diff --git a/debian/wrappers/nxauth b/debian/wrappers/nxauth
deleted file mode 100644
index c8dbb83f3..000000000
--- a/debian/wrappers/nxauth
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2012 Mike Gabriel <mike.gabriel@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
-
-test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
-test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS
-
-exec $NX_LIBS/bin/$NXAPP "$@"
\ No newline at end of file
diff --git a/debian/wrappers/nxproxy b/debian/wrappers/nxproxy
deleted file mode 100644
index 23e7109e3..000000000
--- a/debian/wrappers/nxproxy
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2012 Mike Gabriel <mike.gabriel@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
-
-test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
-test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS
-
-exec $NX_LIBS/bin/$NXAPP "$@"
\ No newline at end of file
diff --git a/debian/wrappers/x2goagent b/debian/wrappers/x2goagent
deleted file mode 100644
index 09011efbe..000000000
--- a/debian/wrappers/x2goagent
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2012 Mike Gabriel <mike.gabriel@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
-
-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
-
-exec $NX_LIBS/../x2go/bin/$NXAPP "$@"