conflict with vimiv

2 files changed, 3 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 60b0cb7159e8..99a9e0f1a0e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sat Jan 30 10:48:40 UTC 2016
+# Sun Apr 24 09:46:45 UTC 2016
 pkgbase = vimiv-git
 	pkgdesc = An image viewer with vim-like keybindings
 	pkgver = r69.58d15aa
@@ -14,6 +14,7 @@ pkgbase = vimiv-git
 	depends = python-pillow
 	optdepends = imagemagick: for the optimization of images
 	optdepends = jhead: for much better autorotation depending on EXIF data
+	conflicts = vimiv
 	backup = etc/vimiv/vimivrc
 	backup = etc/vimiv/keys.conf
 	source = vimiv-git::git+https://github.com/karlch/vimiv.git
diff --git a/PKGBUILD b/PKGBUILD
index ae7700fa240d..7341c8d9d4a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,6 +11,7 @@ depends=('python3' 'python-gobject' 'gtk3' 'python-pillow')
 makedepends=('git')
 optdepends=('imagemagick: for the optimization of images'
             'jhead: for much better autorotation depending on EXIF data')
+conflicts=('vimiv')
 backup=('etc/vimiv/vimivrc' 'etc/vimiv/keys.conf')
 source=("$pkgname::git+${url}.git")
 md5sums=('SKIP')