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

Provide wrapper scripts for launch NX components in $(src)/bin/.
53329e60 · Mike Gabriel · 1a824cfb · 53329e60 · 53329e60 · 53329e60
Commit 53329e60 authored Feb 14, 2015 by Mike Gabriel
25 changed files
--- a/debian/wrappers/nxagent
+++ b/debian/wrappers/nxagent
--- a/debian/wrappers/nxauth
+++ b/debian/wrappers/nxauth
--- a/debian/wrappers/nxproxy
+++ b/debian/wrappers/nxproxy
--- a/debian/wrappers/x2goagent
+++ b/debian/wrappers/x2goagent
--- a/debian/libnx-x11-6.docs
+++ b/debian/libnx-x11-6.docs
-nx-X11/changelog
\ No newline at end of file
--- a/debian/libnx-xau6.docs
+++ b/debian/libnx-xau6.docs
-nx-X11/changelog
\ No newline at end of file
--- a/debian/libnx-xcomposite1.docs
+++ b/debian/libnx-xcomposite1.docs
-nx-X11/changelog
\ No newline at end of file
--- a/debian/libnx-xdamage1.docs
+++ b/debian/libnx-xdamage1.docs
-nx-X11/changelog
\ No newline at end of file
--- a/debian/libnx-xdmcp6.docs
+++ b/debian/libnx-xdmcp6.docs
-nx-X11/changelog
\ No newline at end of file
--- a/debian/libnx-xext6.docs
+++ b/debian/libnx-xext6.docs
-nx-X11/changelog
\ No newline at end of file
--- a/debian/libnx-xfixes3.docs
+++ b/debian/libnx-xfixes3.docs
-nx-X11/changelog
\ No newline at end of file
--- a/debian/libnx-xinerama1.docs
+++ b/debian/libnx-xinerama1.docs
-nx-X11/changelog
\ No newline at end of file
--- a/debian/libnx-xpm4.docs
+++ b/debian/libnx-xpm4.docs
-nx-X11/changelog
\ No newline at end of file
--- a/debian/libnx-xrandr2.docs
+++ b/debian/libnx-xrandr2.docs
-nx-X11/changelog
\ No newline at end of file
--- a/debian/libnx-xrender1.docs
+++ b/debian/libnx-xrender1.docs
-nx-X11/changelog
\ No newline at end of file
--- a/debian/libnx-xtst6.docs
+++ b/debian/libnx-xtst6.docs
-nx-X11/changelog
\ No newline at end of file
--- a/debian/libxcomp3.docs
+++ b/debian/libxcomp3.docs
-nxcomp/changelog
--- a/debian/libxcompext3.docs
+++ b/debian/libxcompext3.docs
-nxcompext/changelog
--- a/debian/libxcompshad3.docs
+++ b/debian/libxcompshad3.docs
-nxcompshad/changelog
--- a/debian/nxagent.docs
+++ b/debian/nxagent.docs
-nx-X11/programs/Xserver/hw/nxagent/changelog
 README.keystrokes
\ No newline at end of file
--- a/debian/nxauth.docs
+++ b/debian/nxauth.docs
-nx-X11/programs/nxauth/changelog
\ No newline at end of file
--- a/debian/nxproxy.docs
+++ b/debian/nxproxy.docs
-nxproxy/changelog
 nxproxy/README
 nxproxy/README-IPAQ
 nxproxy/README-VALGRIND
--- 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

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

--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -661,8 +661,6 @@ information on NX.
 %setup -q
 # copy files from the debian/ folder to designated places in the source tree,
 # taken from roll-tarball.sh:
-mkdir bin/
-cp -v debian/wrappers/* bin/
 mkdir etc/
 cp -v debian/keystrokes.cfg etc/keystrokes.cfg
 cp -v debian/rgb etc/rgb