Add conflicts with iscan-data

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d2fb96e19317..12bf1a53fc2a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = iscan-plugin-network
 	pkgdesc = Plugin for using Epson scanners with ISCAN over network
 	pkgver = 1.36.0
-	pkgrel = 11
+	pkgrel = 12
 	url = http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
 	install = iscan-plugin-network.install
 	arch = i686
 	arch = x86_64
 	license = custom:AVASYSPL
 	depends = iscan
+	conflicts = iscan-data
 	source = iscan-bundle.deb.tar.gz::https://download2.ebz.epson.net/iscan/general/deb/x86/iscan-bundle-1.0.0.x86.deb.tar.gz
 	sha512sums = d91a064342640582a71c664441e944812bc2fd18bd8f00010838adac7ad0581efcf8c9224c48a136ae0aec7f26b6df8071da7c2e10110eafe91c1dbd7f9865ad
 
diff --git a/PKGBUILD b/PKGBUILD
index b5e24831819e..2c5c0da5508c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,12 +10,13 @@ _pkgdlname=iscan-bundle
 pkgver=1.36.0
 _pkgver=1.36.0-1 # workaround for hyphen in version
 _pkgdlver=1.0.0 # download bundle version
-pkgrel=11
+pkgrel=12
 pkgdesc="Plugin for using Epson scanners with ISCAN over network"
 arch=('i686' 'x86_64')
 url="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 license=('custom:AVASYSPL')
 depends=(iscan)
+conflicts=(iscan-data)
 install=iscan-plugin-network.install
 if [[ ${CARCH} = 'x86_64' ]]; then
     _pkgarch='x64'