summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew McGinn2019-05-13 19:54:15 +0800
committerMatthew McGinn2019-05-13 19:54:15 +0800
commitacbabab6720d72f685eeb0d6ac91c46b16912adf (patch)
tree241e5343a5238627a675992b901b5563c77399c8
parent8cb4adfd0545d7cc3a3e6f52b6692fd0d6f686d3 (diff)
downloadaur-acbabab6720d72f685eeb0d6ac91c46b16912adf.tar.gz
update conflicting packages list
Signed-off-by: Matthew McGinn <mamcgi@gmail.com>
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 7 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1fe76519d8e2..6f95a8bcba4c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,6 +18,9 @@ pkgbase = etcher
depends = alsa-lib
optdepends = libnotify: for notifications
optdepends = speech-dispatcher: for text-to-speech
+ conflicts = balena-etcher
+ conflicts = etcher-git
+ conflicts = etcher-bin
options = !strip
source = etcher::git+https://github.com/balena-io/etcher.git#tag=v1.5.35
source = git+https://github.com/balena-io/scripts.git
diff --git a/PKGBUILD b/PKGBUILD
index 35f1888aaee1..4033b320c708 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,6 +22,10 @@ sha256sums=('SKIP'
'SKIP'
'4499f316e4de865696312b31545f8df62850aad4492bcc9736cccb6d8eeb96ec'
'89291532fb6e6c5555b43d61c9ba3df103bca0eace040483884b86fd30dca3e4')
+conflicts=("balena-${pkgname}"
+ "${pkgname}-git"
+ "${pkgname}-bin"
+)
prepare() {
cd "${pkgname}"