buildscripts.git - master (branch) updated: 844888d6da7097ece222b3d57052e52dd1f73049 - x2go-commits

28 Nov 2013

The branch, master has been updated
       via  844888d6da7097ece222b3d57052e52dd1f73049 (commit)
      from  f292fb5a248b2eacc3cd716a1740aa9ce9480384 (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 844888d6da7097ece222b3d57052e52dd1f73049
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Thu Nov 28 09:11:22 2013 +0100

    change version scheme of X2Go auto-built packages

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

Summary of changes:
 bin/build-deb-package |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

The diff of changes is:

diff --git a/bin/build-deb-package b/bin/build-deb-package
index 4d73daf..17ede71 100755
--- a/bin/build-deb-package
+++ b/bin/build-deb-package
@@ -117,6 +117,8 @@ prepare_workspace() {
 		git fetch origin pristine-tar:pristine-tar || true
 		git clean -df
 	fi
+
+	GIT_OBJECT_ID=`git show-ref -s heads/master`
 	cd "$PROJECT_DIR"
 
 	# by default we build for all current debian versions
@@ -225,7 +227,11 @@ build_packages() {
 				}
 
 				# modify changelog for this build
-				dch --distribution $VERSION --force-distribution -l "+$l_CODENAME~$COMPONENT$DATE~$GITREV~build" "Auto-built $l_DIST $l_CODENAME package for $REPOS_SERVER repository."
+				if [ "$COMPONENT" != "$COMPONENT_NIGHTLY" ]; then
+					dch --distribution $VERSION --force-distribution -l "+git$DATE.$GITREV+$l_CODENAME.$COMPONENT." "Auto-built $l_DIST $l_CODENAME package for $REPOS_SERVER repository (Git commit: $GIT_OBJECT_ID)."
+				else
+					dch --distribution $VERSION --force-distribution -l "~git$DATE.$GITREV+$l_CODENAME.$COMPONENT." "Development-Snapshot!!! Auto-built $l_DIST $l_CODENAME package for $REPOS_SERVER repository (Git commit: $GIT_OBJECT_ID)."
+				fi
 				mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/{amd64,i386}
 				OTHERMIRROR=""
 				if [ "x$COMPONENT" = "x$COMPONENT_NIGHTLY" ]; then


hooks/post-receive
-- 
buildscripts.git (X2Go packaging scripts)

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 "buildscripts.git" (X2Go packaging scripts).

    