Add canon-pixma-mx920-complete to the conflicts array

2 files changed, 6 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8fc7297c535f..487fadee0794 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Sep 17 15:19:58 UTC 2020
+# Wed Oct 27 07:21:21 UTC 2021
 pkgbase = cnijfilter-common
 	pkgdesc = Canon IJ Printer Driver (Common Package)
 	pkgver = 4.10
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.canon-europe.com/support/pixma_software/
 	install = cnijfilter-common.install
 	arch = i686
@@ -14,6 +14,7 @@ pkgbase = cnijfilter-common
 	makedepends = tar
 	makedepends = make
 	conflicts = lib32-cnijfilter320
+	conflicts = canon-pixma-mx920-complete
 	source = cnijfilter-source-4.10-1.tar.gz::http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwNTg1ODAx&cmp=ACB&lang=EN
 	source = cups.patch
 	source = buildfiles.patch
diff --git a/PKGBUILD b/PKGBUILD
index 0c2d59e767b7..2cfc5f58f06f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=cnijfilter-common
 _pkgname=cnijfilter
 
 pkgver=4.10
-pkgrel=3
+pkgrel=4
 _pkgreview=1
 
 pkgdesc="Canon IJ Printer Driver (Common Package)"
@@ -17,7 +17,8 @@ url="http://www.canon-europe.com/support/pixma_software/"
 arch=('i686' 'x86_64')
 license=('custom')
 
-conflicts=('lib32-cnijfilter320')
+conflicts=('lib32-cnijfilter320'
+           'canon-pixma-mx920-complete')
 
 makedepends_x86_64=('gcc-multilib')
 depends_x86_64=('lib32-libcups' 'lib32-popt' 'lib32-libusb' 'lib32-libxml2')