summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbinex-dsk2021-02-08 16:34:07 -0500
committerbinex-dsk2021-02-08 16:34:07 -0500
commit981fba7976afb3b21efffb9b8d5f7c99a7b47e70 (patch)
tree44684c510897e752ecfcabc81a1e7b79bb177c37
parent10a849b551f43955288503a7d772e6c317dbe953 (diff)
downloadaur-981fba7976afb3b21efffb9b8d5f7c99a7b47e70.tar.gz
added conflicts with new denise package
Diffstat
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5ffbe044783d..b85bfcb9f9b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,6 +11,7 @@ pkgbase = denise-git
depends = gtk3
provides = denise
conflicts = denise-bin
+ conflicts = denise
source = git+https://bitbucket.org/piciji/denise.git
source = desktop_patch.patch
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 1ca654d5e941..88fb8e911621 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ source=('git+https://bitbucket.org/piciji/denise.git'
md5sums=('SKIP'
'06a239a04fa746ba7465cfe516a00a61')
provides=('denise')
-conflicts=('denise-bin')
+conflicts=('denise-bin' 'denise')
depends=('sdl2' 'gtk3')
makedepends=('git')
arch=('i686' 'x86_64')