The branch, nx-buildscripts has been updated via 21155f218d7f0ce09ea0f2c905075dec4d4132b4 (commit) from 3b5bd5e3aeaa2f5f235fbe06727db7e2f857b4c5 (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 21155f218d7f0ce09ea0f2c905075dec4d4132b4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jan 16 22:59:26 2012 +0100 Change nx-tarballrelease, so that no client-only branch is needed anymore, can be used for nx-libs >= 3.5.0.8. ----------------------------------------------------------------------- Summary of changes: bin/nx-tarballrelease | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/bin/nx-tarballrelease b/bin/nx-tarballrelease index 1184e83..f0e772f 100755 --- a/bin/nx-tarballrelease +++ b/bin/nx-tarballrelease @@ -36,9 +36,11 @@ CHECKOUT="$2" test -n "$CHECKOUT" || usage if [ "x$CHECKOUT" = "xmaster" ] || [ "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 + MODE="lite" CHECKOUT="redist-client/$RELEASE" RELEASE_SUFFIX='-lite' else @@ -57,17 +59,23 @@ trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0 # create local copy of Git project at temp location git clone . "$TEMP_DIR/${PROJECT}_$RELEASE" -# check out the refspec needed... -( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && git fetch origin client-only:client-only && git checkout --force ${CHECKOUT} 2>/dev/null || true ) +# 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) +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) +fi # apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball -( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && mkdir doc/ && find debian/patches | egrep -v "(series|debian/patches/[0-9]+a_debian_.*\.patch)" | while read file; do cp -a $file doc/applied-patches; done) -( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && cat debian/patches/series | egrep -v "[0-9]+a_debian_.*\.patch" doc/applied-patches/series) ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && QUILT_PATCHES=doc/applied-patches quilt push -a) ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && mv -f README* doc/) ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && mv -f debian/changelog doc/changelog) - # remove folders that we do not want to roll into the tarball ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && rm -Rf ".git"* ) ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && rm -Rf ".pc"* ) 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)).