summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Pujol2017-07-20 10:52:11 +0100
committerAlexandre Pujol2017-07-20 10:52:11 +0100
commit2fe617c6e304d9180294a459c24abc87ae9f87d4 (patch)
tree83d2ccec42218d1e074dfdcba0d335858283909f
parent92729f95097134e396182dcec4b66bf298dfb299 (diff)
downloadaur-2fe617c6e304d9180294a459c24abc87ae9f87d4.tar.gz
Fix conflicts
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 330d7ccb0f4..6d4025a3ac8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mausoleum
pkgdesc = A Python GUI application, command line interface, and wrapper for Tomb
pkgver = 0.8.3
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/mandeep/Mausoleum
arch = any
license = GPL3
@@ -13,7 +13,7 @@ pkgbase = mausoleum
depends = python-appdirs
provides = mausoleum
provides = mausoleum-gui
- conflicts = mausoleum
+ conflicts = mausoleum-git
source = https://github.com/mandeep/Mausoleum/archive/v0.8.3.tar.gz
source = mausoleum.desktop
sha512sums = 23ec29c2393125558da0db9f04bbdf995a46d8166dee8ba6dbe4d66bb669f48c6ce8f40c41db2073897deb5f329fe8c203ac3ba42da8d2aefddb3d5068d53106
diff --git a/PKGBUILD b/PKGBUILD
index 1d7cfcae90d..dafafa32955 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_name='mausoleum'
pkgname="${_name}"
pkgver=0.8.3
-pkgrel=1
+pkgrel=2
pkgdesc='A Python GUI application, command line interface, and wrapper for Tomb'
arch=('any')
url='https://github.com/mandeep/Mausoleum'
@@ -14,7 +14,7 @@ depends=('tomb'
'python-pytoml'
'python-click'
'python-appdirs')
-conflicts=("${_name}")
+conflicts=("${_name}-git")
provides=("${_name}" "${_name}-gui")
source=("https://github.com/mandeep/Mausoleum/archive/v${pkgver}.tar.gz"
"mausoleum.desktop")