summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dd1c27f03196..ec50f64d833a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by makepkg 4.2.1
-# Sun May 17 09:47:43 UTC 2015
+# Mon Jul 20 14:57:20 UTC 2015
pkgbase = merkaartor-git
pkgdesc = Merkaartor openstreetmap mapping program
- pkgver = 0.18.1.r144.gdcebd61
+ pkgver = 0.18.2.r0.g59d30ce
pkgrel = 1
url = http://www.merkaartor.be/
install = merkaartor-git.install
diff --git a/PKGBUILD b/PKGBUILD
index f88f12b6f149..22c7e09f9fdb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
_pkgname=merkaartor
pkgname=$_pkgname-git
-pkgver=0.18.1.r144.gdcebd61
+pkgver=0.18.2.r0.g59d30ce
pkgrel=1
pkgdesc='Merkaartor openstreetmap mapping program'
url='http://www.merkaartor.be/'
@@ -16,14 +16,14 @@ conflicts=("$_pkgname")
pkgver() {
cd "$_pkgname"
- git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+ git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
cd "$_pkgname"
lrelease-qt5 src/src.pro
qmake-qt5 -r PREFIX='/usr'
- make release
+ make
}
package() {