Add yggdrasil as conflicting package

Signed-off-by: Knut Ahlers <knut@ahlers.me>

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 57fa6fd5bfed..500fe1435bd3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = yggdrasil-git
 	pkgdesc = An experiment in scalable routing as an encrypted IPv6 overlay network
 	pkgver = 0.2.7
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/yggdrasil-network/yggdrasil-go
 	arch = aarch64
 	arch = armv6l
@@ -12,6 +12,7 @@ pkgbase = yggdrasil-git
 	license = LGPLv3
 	makedepends = git
 	makedepends = go
+	conflicts = yggdrasil
 	source = yggdrasil::git+https://github.com/yggdrasil-network/yggdrasil-go.git#branch=master
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 348c432abc73..54106a883baf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,12 @@
 pkgname=yggdrasil-git
 _pkgname="yggdrasil"
 pkgver=0.2.7
-pkgrel=3
+pkgrel=4
 pkgdesc="An experiment in scalable routing as an encrypted IPv6 overlay network"
 arch=('aarch64' 'armv6l' 'armv7h' 'armv7l' 'i686' 'x86_64')
 url="https://github.com/yggdrasil-network/yggdrasil-go"
 license=('LGPLv3')
+conflicts=('yggdrasil')
 makedepends=('git' 'go')
 source=("yggdrasil::git+https://github.com/yggdrasil-network/yggdrasil-go.git#branch=master")
 md5sums=("SKIP")