From 4acbfa8dd8db98667e97ae198f714bb30d7b1712 Mon Sep 17 00:00:00 2001
From: Roland Mas <lolando@debian.org>
Date: Thu, 28 Jun 2012 13:21:07 +0000
Subject: [PATCH] Work in progress

---
 .../scripts/fusionforge-build-and-test-deb.sh | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/tests/scripts/fusionforge-build-and-test-deb.sh b/tests/scripts/fusionforge-build-and-test-deb.sh
index 83d1689af5..236e47c429 100755
--- a/tests/scripts/fusionforge-build-and-test-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-deb.sh
@@ -16,22 +16,20 @@ set -e
 set -x
 
 COWBUILDERBASE=/var/lib/jenkins/builder/
-COWBUILDERBUILDPLACE=$COWBUILDERBASE/buildplace
-COWBUILDERCOW=$COWBUILDERBASE/cow/base-$DIST-amd64.cow
 COWBUILDERCONFIG=$COWBUILDERBASE/config/$DIST.config
 
-#sudo cowbuilder --update --basepath $COWBUILDERCOW --buildplace=$COWBUILDERBASE
-
 cat > $COWBUILDERCONFIG <<EOF
 PDEBUILD_PBUILDER=cowbuilder
-BASEPATH=$COWBUILDERCOW
-BUILDPLACE=$COWBUILDERBUILDPLACE
+BASEPATH=$COWBUILDERBASE/cow/base-$DIST-amd64.cow
+BUILDPLACE=$COWBUILDERBASE/buildplace
 APTCACHEHARDLINK="no"
 APTCACHE="/var/cache/pbuilder/aptcache"
 PBUILDERROOTCMD="sudo HOME=${HOME}"
 BUILDRESULT=$BUILDRESULT
 EOF
 
+sudo cowbuilder --update --configfile $COWBUILDERCONFIG
+
 cd $CHECKOUTPATH/src
 PKGNAME=$(dpkg-parsechangelog | awk '/^Source:/ { print $2 }')
 PKGVERS=$(dpkg-parsechangelog | awk '/^Version:/ { print $2 }')
@@ -39,13 +37,13 @@ MAJOR=${PKGVERS%-*}
 SMAJOR=${MAJOR#*:}
 MINOR=${PKGVERS##*-}
 if [ -d $CHECKOUTPATH/.svn ] ; then
-    MINOR=$MINOR-svn$(svn info | awk '/^Revision:/ { print $2 }')
+    MINOR=-$MINOR+svn$(svn info | awk '/^Revision:/ { print $2 }')
 elif [ -d $CHECKOUTPATH/.bzr ] ; then
-    MINOR=$MINOR-bzr$(bzr revno)
+    MINOR=-$MINOR+bzr$(bzr revno)
 elif [ -d $CHECKOUTPATH/.git ] ; then
-    MINOR=$MINOR-git$(git describe --always)
+    MINOR=-$MINOR+git$(git describe --always)
 else
-    MINOR=$MINOR-$(TZ=UTC date +%Y%m%d%H%M%S)
+    MINOR=-$MINOR+$(TZ=UTC date +%Y%m%d%H%M%S)
 fi
 ARCH=$(dpkg-architecture -qDEB_BUILD_ARCH)
 
@@ -53,7 +51,7 @@ dch -b -v $MAJOR$MINOR -D UNRELEASED "This is $DIST-$ARCH autobuild"
 perl -pi -e "s/UNRELEASED/$DIST/" debian/changelog
 pdebuild --configfile $COWBUILDERCONFIG
 
-CHANGEFILE=$(PKGNAME)_$(SMAJOR)$(MINOR)_$(ARCH).changes
+CHANGEFILE=$PKGNAME_$SMAJOR$MINOR_$ARCH.changes
 
 cd $BUILDRESULT
 reprepro -Vb include $DIST $CHANGEFILE
-- 
2.30.2