conflicts with jamin-cvs

2 files changed, 2 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5098f1bc3b7..d3ad7e474ed3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,6 +19,7 @@ pkgbase = jamin-gtk2
 	depends = liblo
 	provides = jamin
 	conflicts = jamin
+	conflicts = jamin-cvs
 	options = !libtool
 	source = typefix.patch
 	md5sums = a0a18224447f431503471b3dfe1b715c
diff --git a/PKGBUILD b/PKGBUILD
index f6b9aef776d3..5a44d8f47d65 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ url="http://jamin.sourceforge.net/"
 license=('GPL')
 depends=('jack' 'libxml2' 'gtk2' 'swh-plugins' 'fftw' 'liblo')
 makedepends=('perl-xml-parser' 'ladspa' 'cvs' 'intltool')
-conflicts=('jamin')
+conflicts=('jamin' 'jamin-cvs')
 provides=('jamin')
 options=('!libtool')
 install=${pkgname}.install