[X2Go-Commits] nx-libs.git - master (branch) updated: redist-client/3.5.0.20-10-gead1e82

X2Go dev team git-admin at x2go.org
Sat May 11 20:42:01 CEST 2013


The branch, master has been updated
       via  ead1e823aeb71e0e2e6742124cc485252699b22a (commit)
      from  4c462f28d9083f41960be0425e533e9db0e149b7 (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 ead1e823aeb71e0e2e6742124cc485252699b22a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat May 11 20:40:57 2013 +0200

    * Tarball roller script:
      + Only install keystrokes.cfg when in full mode.
      + Only install nxproxy wrapper when in lite mode.

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

Summary of changes:
 debian/changelog        |    3 +++
 debian/roll-tarballs.sh |   20 ++++++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 4de9a36..ee527a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ nx-libs (2:3.5.0.21-0) UNRELEASED; urgency=low
     (for x2goagent). (Fixes: #199).
   * Set NXAGENT_KEYSTROKEFILE to /etc/x2go/keystrokes.cfg for wrapper x2goagent.
   * For vanilla nxagent move keystrokes.cfg from /etc/nx to /etc/nxagent.
+  * Tarball roller script:
+    + Only install keystrokes.cfg when in full mode.
+    + Only install nxproxy wrapper when in lite mode.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 28 Mar 2013 21:07:42 +0100
 
diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh
index 2dc1c89..fd36b28 100755
--- a/debian/roll-tarballs.sh
+++ b/debian/roll-tarballs.sh
@@ -111,10 +111,18 @@ for f in $(ls README* 2>/dev/null); do
 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
+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
+    # 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
+fi
 
 mv -v debian/changelog doc/changelog
 
@@ -122,10 +130,6 @@ mv -v debian/changelog doc/changelog
 test -f Makefile || test -f debian/Makefile.nx-libs && cp -v debian/Makefile.nx-libs Makefile
 test -f replace.sh || test -f debian/Makefile.replace.sh && cp -v debian/Makefile.replace.sh replace.sh
 
-# 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
-
 # remove folders that we do not want to roll into the tarball
 rm -Rf ".pc/"
 rm -Rf "debian/"


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