[X2Go-Commits] [nx-libs] 10/52: Provide wrapper scripts for launch NX components in $(src)/bin/.

git-admin at x2go.org git-admin at x2go.org
Sat Feb 14 17:47:04 CET 2015 

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 53329e60938447850479858449a94f3d0467ef03
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Feb 14 15:29:25 2015 +0100

    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
---
 {debian/wrappers => bin}/nxagent   |    0
 {debian/wrappers => bin}/nxauth    |    0
 {debian/wrappers => bin}/nxproxy   |    0
 {debian/wrappers => bin}/x2goagent |    0
 debian/libnx-x11-6.docs            |    1 -
 debian/libnx-xau6.docs             |    1 -
 debian/libnx-xcomposite1.docs      |    1 -
 debian/libnx-xdamage1.docs         |    1 -
 debian/libnx-xdmcp6.docs           |    1 -
 debian/libnx-xext6.docs            |    1 -
 debian/libnx-xfixes3.docs          |    1 -
 debian/libnx-xinerama1.docs        |    1 -
 debian/libnx-xpm4.docs             |    1 -
 debian/libnx-xrandr2.docs          |    1 -
 debian/libnx-xrender1.docs         |    1 -
 debian/libnx-xtst6.docs            |    1 -
 debian/libxcomp3.docs              |    1 -
 debian/libxcompext3.docs           |    1 -
 debian/libxcompshad3.docs          |    1 -
 debian/nxagent.docs                |    1 -
 debian/nxauth.docs                 |    1 -
 debian/nxproxy.docs                |    1 -
 debian/roll-tarballs.sh            |   10 +---------
 debian/rules                       |    3 +--
 nx-libs.spec                       |    2 --
 25 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/debian/wrappers/nxagent b/bin/nxagent
similarity index 100%
rename from debian/wrappers/nxagent
rename to bin/nxagent
diff --git a/debian/wrappers/nxauth b/bin/nxauth
similarity index 100%
rename from debian/wrappers/nxauth
rename to bin/nxauth
diff --git a/debian/wrappers/nxproxy b/bin/nxproxy
similarity index 100%
rename from debian/wrappers/nxproxy
rename to bin/nxproxy
diff --git a/debian/wrappers/x2goagent b/bin/x2goagent
similarity index 100%
rename from debian/wrappers/x2goagent
rename to bin/x2goagent
diff --git a/debian/libnx-x11-6.docs b/debian/libnx-x11-6.docs
deleted file mode 100644
index 5a57a3f..0000000
--- 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 5a57a3f..0000000
--- 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 5a57a3f..0000000
--- 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 5a57a3f..0000000
--- 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 5a57a3f..0000000
--- 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 5a57a3f..0000000
--- 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 5a57a3f..0000000
--- 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 5a57a3f..0000000
--- 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 5a57a3f..0000000
--- 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 5a57a3f..0000000
--- 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 5a57a3f..0000000
--- 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 5a57a3f..0000000
--- 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 97efc9f..0000000
--- 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 8323a34..0000000
--- 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 33632b9..0000000
--- a/debian/libxcompshad3.docs
+++ /dev/null
@@ -1 +0,0 @@
-nxcompshad/changelog
diff --git a/debian/nxagent.docs b/debian/nxagent.docs
index 6d791c6..5d7d87a 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 aaa115f..0000000
--- 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 4b3d18d..2243d21 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 37c897a..384bc57 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 b178282..7b60a46 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/nx-libs.spec b/nx-libs.spec
index 897c1d2..ccbf6f9 100644
--- 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

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

More information about the x2go-commits mailing list