Calculate pkgver

2 files changed, 16 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e07506898e5f..f21f158187b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
-pkgbase = sat-xmpp
-	pkgver = 0.7
+pkgbase = sat-xmpp-hg
+	pkgver = 0.6.1.r2385.39d30cf722cb
 	pkgrel = 1
 	url = http://salut-a-toi.org/
 	arch = any
@@ -10,7 +10,7 @@ pkgbase = sat-xmpp
 	source = hg+http://repos.goffi.org/sat
 	md5sums = SKIP
 
-pkgname = sat-xmpp
+pkgname = sat-xmpp-hg
 	pkgdesc = Salut à Toi, multi-frontends multi-purposes XMPP client (core)
 	depends = dbus
 	depends = python2-lxml>=3.1.0
@@ -30,7 +30,7 @@ pkgname = sat-xmpp
 	depends = python2-miniupnpc
 	depends = python2-service-identity
 
-pkgname = sat-jp
+pkgname = sat-jp-hg
 	pkgdesc = Salut à Toi, multi-frontends multi-purposes XMPP client (CLI frontend)
 	depends = sat-xmpp
 	depends = python2-gobject
@@ -38,7 +38,7 @@ pkgname = sat-jp
 	depends = python2-pyinotify
 	depends = python2-babel
 
-pkgname = sat-primitivus
+pkgname = sat-primitivus-hg
 	pkgdesc = Salut à Toi, multi-frontends multi-purposes XMPP client (ncurses frontend)
 	depends = sat-xmpp
 	depends = python2-gobject
diff --git a/PKGBUILD b/PKGBUILD
index cbbd0c280b68..3c5e2acf050b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,10 @@
 # Contributor: Skippy the Kangoo <Skippythekangoo CHEZ yahoo POINT fr>
 # Contributor: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
 
-pkgname=('sat-xmpp' 'sat-jp' 'sat-primitivus')
+pkgname=('sat-xmpp-hg' 'sat-jp-hg' 'sat-primitivus-hg')
 _realname=sat
-pkgver=0.7
+pkgver=0.6.1.r2385.39d30cf722cb
+VERSION=0.6.1
 pkgrel=1
 url="http://salut-a-toi.org/"
 arch=('any')
@@ -15,6 +16,11 @@ license=('AGPL3')
 source=("hg+http://repos.goffi.org/sat")
 md5sums=('SKIP')
 options=('!strip')
+
+pkgver() {
+  cd "$_realname"
+  printf "$VERSION.r%s.%s" "$(hg identify -n)" "$(hg identify -i)" 
+}
                  
 build() {
     cd "$srcdir/$_realname"
@@ -24,7 +30,7 @@ build() {
     SAT_INSTALL=nopreinstall python2 setup.py install --root="$srcdir/fakeinstall/" --prefix=/usr --optimize=1
 }
 
-package_sat-xmpp(){
+package_sat-xmpp-hg(){
     pkgdesc="Salut à Toi, multi-frontends multi-purposes XMPP client (core)"
     depends=('dbus' 'python2-lxml>=3.1.0' 'python2-pillow' 'python2-pycryptodomex>=2.6.1' 'python2-pyopenssl' 'python2-dbus' 'pure-python2-otr' 'python2-twisted' 
 'python2-wokkel>=0.7.1' 'python-xdg' 'python2-zope-interface' 'mutagen' 'python2-markdown' 'python2-html2text' 'python2-netifaces' 'python2-miniupnpc' 
@@ -46,7 +52,7 @@ package_sat-xmpp(){
      done
  }
 
-package_sat-jp(){
+package_sat-jp-hg(){
     pkgdesc="Salut à Toi, multi-frontends multi-purposes XMPP client (CLI frontend)"
     depends=('sat-xmpp' 'python2-gobject' 'python2-progressbar' 'python2-pyinotify' 'python2-babel')
 
@@ -59,7 +65,7 @@ package_sat-jp(){
     mv -v usr/lib/python2.7/site-packages/sat_frontends/jp/ "$pkgdir/usr/lib/python2.7/site-packages/sat_frontends/"
 }
 
-package_sat-primitivus(){
+package_sat-primitivus-hg(){
     pkgdesc="Salut à Toi, multi-frontends multi-purposes XMPP client (ncurses frontend)"
     depends=('sat-xmpp' 'python2-gobject' 'python2-urwid>=1.2.0' 'python2-urwid-satext>=0.6.1' 'python2-xlib')