diff options
-rw-r--r-- | .SRCINFO | 11 | ||||
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | PKGBUILD | 11 |
3 files changed, 13 insertions, 11 deletions
@@ -1,12 +1,12 @@ -pkgbase = qmapshack-hg +pkgbase = qmapshack-git pkgdesc = Plan your next outdoor trip - pkgver = 1.13.0.r50.55dee1ae0d55 + pkgver = 1.14.1.r3.g72bf4529 pkgrel = 1 url = https://bitbucket.org/maproom/qmapshack/ arch = x86_64 license = GPL3 makedepends = cmake - makedepends = mercurial + makedepends = git depends = gdal depends = desktop-file-utils depends = quazip @@ -14,8 +14,9 @@ pkgbase = qmapshack-hg depends = routino>=3.1 provides = qmapshack conflicts = qmapshack - source = qmapshack-hg::hg+https://bitbucket.org/maproom/qmapshack + replaces = qmapshack-hg + source = qmapshack-git::git+https://github.com/Maproom/qmapshack.git sha256sums = SKIP -pkgname = qmapshack-hg +pkgname = qmapshack-git diff --git a/.gitignore b/.gitignore index 5468a6e0a529..4913c2655f39 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /pkg /qmapshack-*.pkg.tar.xz /qmapshack-*.tar.gz -/qmapshack-hg +/qmapshack-git /src @@ -1,22 +1,23 @@ # Maintainer: Sanpi <sanpi+aur@homecomputing.fr> -pkgname='qmapshack-hg' -pkgver=1.13.0.r50.55dee1ae0d55 +pkgname='qmapshack-git' +pkgver=1.14.1.r3.g72bf4529 pkgrel=1 pkgdesc='Plan your next outdoor trip' arch=('x86_64') url='https://bitbucket.org/maproom/qmapshack/' license=('GPL3') depends=('gdal' 'desktop-file-utils' 'quazip' 'qt5-webengine' 'routino>=3.1') -makedepends=('cmake' 'mercurial') +makedepends=('cmake' 'git') conflicts=('qmapshack') provides=('qmapshack') -source=("$pkgname::hg+https://bitbucket.org/maproom/qmapshack") +replaces=('qmapshack-hg') +source=("$pkgname::git+https://github.com/Maproom/qmapshack.git") sha256sums=('SKIP') pkgver() { cd "$pkgname" - hg log -r . --template '{latesttag}.r{latesttagdistance}.{node|short}' | sed 's/V //' + git describe --long --tags | sed 's/^V_//' | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } build() { |