[X2go-Commits] nx-libs.git - nx-buildscripts (branch) updated: 87585cfc6eeaa4f67e1e80612741a4a3d6b69bb5

[X2go dev team]

The branch, nx-buildscripts has been updated
       via  87585cfc6eeaa4f67e1e80612741a4a3d6b69bb5 (commit)
      from  21155f218d7f0ce09ea0f2c905075dec4d4132b4 (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 87585cfc6eeaa4f67e1e80612741a4a3d6b69bb5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Feb 16 19:21:00 2012 +0100

    tab space cleanup; support HEAD as <release-version>, really checkout $CHECKOUT

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

Summary of changes:
 bin/nx-tarballrelease |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

The diff of changes is:
diff --git a/bin/nx-tarballrelease b/bin/nx-tarballrelease
index f0e772f..5447c8d 100755
--- a/bin/nx-tarballrelease
+++ b/bin/nx-tarballrelease
@@ -24,7 +24,7 @@ set -x
 set -e
 
 usage() {
-	echo "usage: $(basename "$0") <release-version> {server|client}"
+	echo "usage: $(basename "$0") {<release-version>,HEAD} {server|client}"
 	exit 1
 }
 
@@ -35,11 +35,11 @@ test -n "$RELEASE" || usage
 CHECKOUT="$2"
 test -n "$CHECKOUT" || usage
 
-if [ "x$CHECKOUT" = "xmaster" ] || [ "x$CHECKOUT" = "xserver" ] || [ "x$CHECKOUT" = "xfull" ]; then
+if [ "x$CHECKOUT" = "xserver" ] || [ "x$CHECKOUT" = "xfull" ]; then
 	MODE="full"
 	CHECKOUT="redist-server/$RELEASE"
 	RELEASE_SUFFIX='-full'
-elif [ "x$CHECKOUT" = "xclient-only" ] || [ "x$CHECKOUT" = "xclient" ] || [ "x$CHECKOUT" = "xlite" ]; then
+elif [ "x$CHECKOUT" = "xclient" ] || [ "x$CHECKOUT" = "xlite" ]; then
 	MODE="lite"
 	CHECKOUT="redist-client/$RELEASE"
 	RELEASE_SUFFIX='-lite'
@@ -58,17 +58,20 @@ trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0
 
 # create local copy of Git project at temp location
 git clone . "$TEMP_DIR/${PROJECT}_$RELEASE"
+if [ "x$RELEASE" != "xHEAD" ]; then
+	git checkout $CHECKOUT
+fi
 
 # prepare patches for lite and full tarball
 if [ "x$MODE" = "xfull" ]; then
-    ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && mkdir -p doc/applied-patches && find debian/patches | egrep "(debian/patches/[0-9]+_.*\.(full|full\+lite)\.patch)" | while read file; do cp -a $file doc/applied-patches; done)
-    ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && cat debian/patches/series | egrep "[0-9]+_.*\.(full|full\+lite)\.patch" > doc/applied-patches/series)
+	( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && mkdir -p doc/applied-patches && find debian/patches | egrep "(debian/patches/[0-9]+_.*\.(full|full\+lite)\.patch)" | while read file; do cp -a $file doc/applied-patches; done)
+	( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && cat debian/patches/series | egrep "[0-9]+_.*\.(full|full\+lite)\.patch" > doc/applied-patches/series)
 else
-    ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && rm -Rf "nxcompshad"* )
-    ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && rm -Rf "nxcompext"* )
-    ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && rm -Rf "nx-X11"* )
-    ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && mkdir -p doc/applied-patches && find debian/patches | egrep "(series|debian/patches/[0-9]+_.*\.full\+lite\.patch)" | while read file; do cp -a $file doc/applied-patches; done)
-    ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && cat debian/patches/series | egrep "[0-9]+_.*\.full\+lite\.patch" > doc/applied-patches/series)
+	( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && rm -Rf "nxcompshad"* )
+	( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && rm -Rf "nxcompext"* )
+	( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && rm -Rf "nx-X11"* )
+	( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && mkdir -p doc/applied-patches && find debian/patches | egrep "(series|debian/patches/[0-9]+_.*\.full\+lite\.patch)" | while read file; do cp -a $file doc/applied-patches; done)
+	( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && cat debian/patches/series | egrep "[0-9]+_.*\.full\+lite\.patch" > doc/applied-patches/series)
 fi
 
 # apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball


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