adds a pseaudo git rev number (counting log entries) to the package version

2 files changed, 32 insertions, 3 deletions

diff --git a/bin/x2go-buildpackage b/bin/x2go-buildpackage
index a6643a8..b199323 100755
--- a/bin/x2go-buildpackage
+++ b/bin/x2go-buildpackage
@@ -38,13 +38,13 @@ set_vars() {
 		CHECKOUT=${3:-build-main}
 	elif [ "x$COMPONENT" = "xheuler" ]; then
 		CHECKOUT=${3:-master}
-		DATE="~${DATE:-$(date +%Y%m%d)}."
+		DATE="~${DATE:-$(date +%Y%m%d)}"
 	else
 		echo "error: no such package component area for X2go packages. Aborting..."
 		exit -1
 	fi
 	# the DATE might be given as ,,today'' from the command line
-	[ "x$DATE" = "xtoday" ] && DATE="~$(date +%Y%m%d)."
+	[ "x$DATE" = "xtoday" ] && DATE="~$(date +%Y%m%d)"
 
 	# setting paths
 	PROJECT_DIR=$HOME/build/$COMPONENT/$PROJECT
@@ -119,6 +119,7 @@ build_packages() {
 				git clone --local $PROJECT_DIR $TEMP_DIR/$PROJECT/ 
 				cd $TEMP_DIR/$PROJECT
 				git checkout $CHECKOUT || git checkout master
+				GITREV=$(x2go-gitrevno)
 				# translate the version name for Debian releases
 				[ "x$l_CODENAME" = "xsid" ] && VERSION=unstable
 				[ "x$l_CODENAME" = "xwheezy" ] && VERSION=testing
@@ -132,7 +133,7 @@ build_packages() {
 				}
 				
 				# modify changelog for this build
-				DEBEMAIL=git-admin@x2go.org DEBFULLNAME="X2go Git Administrator" dch --distribution $VERSION --force-distribution -l "+$l_CODENAME~$COMPONENT$DATE" "Auto-built $l_DIST $l_CODENAME package for packages.x2go.org repository."
+				DEBEMAIL=git-admin@x2go.org DEBFULLNAME="X2go Git Administrator" dch --distribution $VERSION --force-distribution -l "+$l_CODENAME~$COMPONENT$DATE~$GITREV~build" "Auto-built $l_DIST $l_CODENAME package for packages.x2go.org repository."
 				mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/{amd64,i386}
 				OTHERMIRROR="deb http://packages.x2go.org/debian $l_CODENAME $COMPONENT"
 				[ "x$USE_SUDO" != "xyes" ] && {
diff --git a/bin/x2go-gitrevno b/bin/x2go-gitrevno
new file mode 100755
index 0000000..7065da2
--- /dev/null
+++ b/bin/x2go-gitrevno
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+
+# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+#
+# Python X2go is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# Python X2go is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+
+import subprocess
+_proc = subprocess.Popen('git log --no-color --date=iso',
+                         shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+try:
+    GIT_REVISION_DATE = str(len([ x for x in _proc.communicate()[0].splitlines() if x.startswith('Date:')]))
+except IndexError:
+    GIT_REVISION_DATE = 'unknown'
+
+print GIT_REVISION_DATE