Added imagemagick-full-git to conflicts

2 files changed, 5 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2774979cfd1f..e7141f517e1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat May 28 15:18:53 UTC 2016
+# Sat Jun  4 01:26:59 UTC 2016
 pkgbase = imagemagick-full
 	pkgdesc = An image viewing/manipulation program (Q32 HDRI with all libs and features)
 	pkgver = 7.0.1.6
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.imagemagick.org/
 	arch = i686
 	arch = x86_64
@@ -50,6 +50,7 @@ pkgbase = imagemagick-full
 	provides = libMagick++-7.Q32HDRI.so
 	conflicts = imagemagick
 	conflicts = imagemagick-git
+	conflicts = imagemagick-full-git
 	conflicts = imagemagick-fftw
 	conflicts = imagemagick-no-hdri
 	options = !docs
diff --git a/PKGBUILD b/PKGBUILD
index dc6c2c9cf11a..e22b5b3f1de1 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _srcname="ImageMagick"
 _srcver="7.0.1-6"
 pkgname=imagemagick-full
 pkgver="$(echo ${_srcver} | tr '-' '.')"
-pkgrel=1
+pkgrel=2
 pkgdesc="An image viewing/manipulation program (Q32 HDRI with all libs and features)"
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
@@ -31,7 +31,7 @@ provides=("imagemagick"
           "libMagickCore-${pkgver%%.*}.Q32HDRI.so"
           "libMagickWand-${pkgver%%.*}.Q32HDRI.so"
             "libMagick++-${pkgver%%.*}.Q32HDRI.so")
-conflicts=('imagemagick' 'imagemagick-git' 'imagemagick-fftw' 'imagemagick-no-hdri')
+conflicts=('imagemagick' 'imagemagick-git' 'imagemagick-full-git' 'imagemagick-fftw' 'imagemagick-no-hdri')
 backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml"
         "etc/ImageMagick-${pkgver%%.*}/colors.xml"
         "etc/ImageMagick-${pkgver%%.*}/delegates.xml"