summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew McGinn2019-05-13 19:47:55 +0800
committerMatthew McGinn2019-05-13 19:48:09 +0800
commit6da80e88b0de135d2d3d5902880e0e9472a25b00 (patch)
tree0f5ae305c07a262d3e9e00263fbaf155e9f4d814
parentdf138ba6c2219e1c8b1c704d51f44e61de8e11e4 (diff)
downloadaur-6da80e88b0de135d2d3d5902880e0e9472a25b00.tar.gz
update conflicts list
Signed-off-by: Matthew McGinn <mamcgi@gmail.com>
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 25b9bda25ebe..d2c1af6c7bf7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,6 +19,7 @@ pkgbase = balena-etcher
optdepends = libnotify: for notifications
optdepends = speech-dispatcher: for text-to-speech
conflicts = etcher
+ conflicts = etcher-git
conflicts = etcher-bin
options = !strip
source = etcher::git+https://github.com/balena-io/etcher.git#tag=v1.5.35
diff --git a/PKGBUILD b/PKGBUILD
index eee6a32bcc54..ab3681cddddc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,6 +15,7 @@ makedepends=(npm python2 git jq)
optdepends=('libnotify: for notifications'
'speech-dispatcher: for text-to-speech')
conflicts=("${_pkgname}"
+ "${_pkgname}-git"
"${_pkgname}-bin"
)
options=('!strip')