Updated version function to exclude the tag and keep only the revision - to avoid confusion with the stable realease

2 files changed, 8 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d050c68f9c2e..ceac0470bf5c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Sep 15 12:51:10 UTC 2018
+# Tue Nov  6 19:28:56 UTC 2018
 pkgbase = mixxx-git
-	pkgdesc = Digital DJ mixing software. Development branch from git.
-	pkgver = release.2.1.4.r495.gbc69f995ae
+	pkgdesc = Digital DJ mixing software. Git master branch (development/alpha).
+	pkgver = r6643
 	pkgrel = 1
 	url = http://www.mixxx.org/
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 0ec1043b50de..4110cbd74617 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 # Contributor: regreddit <nik.martin@gmail.com>
 
 pkgname=mixxx-git
-pkgver=release.2.1.4.r495.gbc69f995ae
+pkgver=r6643
 pkgrel=1
-pkgdesc="Digital DJ mixing software. Development branch from git."
+pkgdesc="Digital DJ mixing software. Git master branch (development/alpha)."
 arch=('i686' 'x86_64')
 url="http://www.mixxx.org/"
 license=('GPL2')
@@ -17,8 +17,9 @@ source=("${pkgname%-*}::git+https://github.com/mixxxdj/mixxx.git")
 md5sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/${pkgname%-*}"
-  echo "$(git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')"
+   cd "$srcdir/${pkgname%-*}"
+#  echo "$(git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')"
+   echo "r$(git log --pretty=oneline --first-parent | wc -l)"
 }
 
 build() {