summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMendel Greenberg2019-08-30 13:47:00 -0700
committerMendel Greenberg2019-08-30 13:47:00 -0700
commit1215e050fe77683ff7e7f59bbeafc9b13ae0900f (patch)
tree1a07ecf288e8554d682f475491e7679e42229792
parent24ad9ce765a1cee727ca2a896f23747c33ab31c7 (diff)
downloadaur-1215e050fe77683ff7e7f59bbeafc9b13ae0900f.tar.gz
added a conflicts for citra-canary-bin
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 3 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a3ed5331826..0986ad59aab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,6 +11,8 @@ pkgbase = citra-bin
conflicts = citra-qt-nightly-bin
conflicts = citra-bin
conflicts = citra-qt
+ conflicts = citra-canary-bin
+ conflicts = citra-qt-canary-bin
replaces = citra-nightly-bin
replaces = citra-qt-nightly-bin
source = https://github.com/citra-emu/citra-nightly/releases/download/nightly-1343/citra-linux-20190821-8fa6be5.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index 9cbdbaf0093..1d2afd76b40 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=('citra-bin' 'citra-qt-bin')
pkgrel=8
pkgver=1343_20190821_8fa6be5
pkgdesc="An experimental open-source Nintendo 3DS emulator/debugger"
-conflicts=('citra-git' 'citra-qt-git' 'citra-nightly-bin' 'citra-qt-nightly-bin' 'citra-bin' 'citra-qt')
+conflicts=('citra-git' 'citra-qt-git' 'citra-nightly-bin' 'citra-qt-nightly-bin' 'citra-bin' 'citra-qt' 'citra-canary-bin' 'citra-qt-canary-bin')
replaces=("citra-nightly-bin" "citra-qt-nightly-bin")
license=('GPL2')
arch=('x86_64')