using normal granite

2 files changed, 5 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3ef458b69e94..1e9cb34446d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sun Sep 24 12:54:53 UTC 2017
 pkgbase = pantheon-calculator-git
 	pkgdesc = The Pantheon Calculator
-	pkgver = r438.4d93534
+	pkgver = 1.5.5.r105.g5d3c275
 	pkgrel = 1
 	url = https://github.com/elementary/calculator
 	arch = i686
@@ -10,7 +8,7 @@ pkgbase = pantheon-calculator-git
 	groups = pantheon-unstable
 	license = GPL3
 	makedepends = git
-	makedepends = granite-git
+	makedepends = granite
 	makedepends = intltool
 	makedepends = meson
 	makedepends = vala
diff --git a/PKGBUILD b/PKGBUILD
index 98fd21ec6644..c1addb8c3b93 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Maxime Gauduin <alucryd@archlinux.org>
 
 pkgname=pantheon-calculator-git
-pkgver=r438.4d93534
+pkgver=1.5.5.r105.g5d3c275
 pkgrel=1
 pkgdesc='The Pantheon Calculator'
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ license=('GPL3')
 groups=('pantheon-unstable')
 depends=('glib2' 'glibc' 'gtk3'
          'libgranite.so')
-makedepends=('git' 'granite-git' 'intltool' 'meson' 'vala')
+makedepends=('git' 'granite' 'intltool' 'meson' 'vala')
 provides=('pantheon-calculator')
 conflicts=('pantheon-calculator')
 source=('pantheon-calculator::git+https://github.com/elementary/calculator.git')
@@ -18,8 +18,7 @@ sha256sums=('SKIP')
 
 pkgver() {
   cd pantheon-calculator
-
-  echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {