Add conflict with pamixer

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f1f45fc7674..dcac6071fbe4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pamixer-git
 	pkgdesc = Pulseaudio command-line mixer like amixer
 	pkgver = 20191030
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/cdemoulins/pamixer
 	arch = i686
 	arch = x86_64
@@ -10,6 +10,7 @@ pkgbase = pamixer-git
 	makedepends = boost
 	depends = libpulse
 	depends = boost-libs
+	conflicts = pamixer
 	source = git+https://github.com/cdemoulins/pamixer.git
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index f7441ac8cf44..8ad49877e553 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,14 @@
 pkgname=pamixer-git
 _realname=pamixer
 pkgver=20191030
-pkgrel=1
+pkgrel=2
 pkgdesc="Pulseaudio command-line mixer like amixer"
 arch=('i686' 'x86_64')
 url="https://github.com/cdemoulins/pamixer"
 license=('GPL3')
 depends=('libpulse' 'boost-libs')
 makedepends=('git' 'boost')
+conflicts=('pamixer')
 
 source=(git+https://github.com/cdemoulins/pamixer.git)
 md5sums=('SKIP')