summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSquare2019-05-20 02:15:21 +0200
committerSquare2019-05-20 02:15:21 +0200
commit197c57311addd5e5fb0cffa8a405f81e6212fd84 (patch)
treec6284f42d4d52056639b8f2c9b360b8c58102639
parent7555a8d88af551e1512fd5f53a981a7d2bcd850f (diff)
downloadaur-197c57311addd5e5fb0cffa8a405f81e6212fd84.tar.gz
add missing conflict
Diffstat
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ae371b02627f..ada8580dbfbf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,6 +9,7 @@ pkgbase = solokeys-udev
depends = udev
provides = solokeys-udev
conflicts = solokeys-udev
+ conflicts = solokeys-udev-git
source = 70-solokeys-access.rules
source = solokeys-udev.install
sha256sums = 09134a1f4d97f5a1e591194a24595f966edf5d5f0c6ae45e2bef32d710535c6b
diff --git a/PKGBUILD b/PKGBUILD
index 422bcbedb9ec..9750890ed0a5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ url='https://github.com/solokeys/solo/tree/master/udev'
license=('Apache')
depends=('udev')
provides=("$pkgname")
-conflicts=("$pkgname")
+conflicts=("$pkgname" "solokeys-udev-git")
sha256sums=('09134a1f4d97f5a1e591194a24595f966edf5d5f0c6ae45e2bef32d710535c6b')
source=('70-solokeys-access.rules'
'solokeys-udev.install')