Merge lp:~andreserl/maas/fix_calculation_of_version into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

Improve the version calculation.

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-06-27 16:56:57 +0000
+++ debian/changelog	2017-07-03 16:41:30 +0000
@@ -6,7 +6,7 @@
   * Add maas-beacon-monitor script to sudoers file.
     (Allows observation of UDP traffic sent to port 5240.)
 
- -- Mike Pontillo <[e-mail]>  Wed, 21 Jun 2017 08:36:26 -0700
+ -- Andres Rodriguez <[e-mail]>  Wed, 28 Jun 2017 14:53:05 -0400
 
 maas (2.2.0+bzr6054-0ubuntu2) artful; urgency=medium
 
 
=== modified file 'release-build'
--- release-build	2017-06-23 13:30:50 +0000
+++ release-build	2017-07-03 16:41:30 +0000
@@ -29,12 +29,12 @@
 #REV=$(head -n 1 debian/changelog | sed -rne 's,.*[+~.]git([0-9a-zA-Z]+).*,\1,p')
 REV_COUNT=$(git -C $1 rev-list --count $COMMIT)
 REV_SHORT=$(git -C $1 rev-parse --short $COMMIT)
-FULL_VER="$MAJOR_VER+git$REV_COUNT.$REV_SHORT"
+FULL_VER="$MAJOR_VER-$REV_COUNT-g$REV_SHORT"
 TARBALL="maas_$FULL_VER.orig.tar.gz"
 
 get_orig_source() {
         branch="$1"
-        git -C $branch archive --format=tar.gz --prefix="maas-$FULL_VER.orig/" $COMMIT -o $TARBALL $REV
+        git -C $branch archive --format=tar.gz --prefix="maas-$FULL_VER.orig/" $COMMIT -o $TARBALL
 	
 }
 # Obtain the tarball from a local branch