Updating dependency; cnijfilter-common=4.00

3 files changed, 8 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3be6169db03d..44e443283cf6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cnijfilter-mp550
 	pkgdesc = Canon IJ Printer Driver (For Multifunction MP550 series)
 	pkgver = 3.20
-	pkgrel = 10
+	pkgrel = 11
 	url = http://www.canon-europe.com/Support/Consumer_Products/products/Fax__Multifunctionals/InkJet/PIXMA_MP_series/PIXMA_MP550.aspx
 	install = cnijfilter-mp550.install
 	arch = i686
@@ -11,7 +11,7 @@ pkgbase = cnijfilter-mp550
 	makedepends = automake>=1.6
 	makedepends = tar
 	makedepends = make
-	depends = cnijfilter-common=3.20
+	depends = cnijfilter-common=4.00
 	source = http://files.canon-europe.com/files/soft37280/Software/IJ_Linux_Printer_Driver_Source_320.tar
 	source = id.patch
 	source = cups.patch
@@ -21,7 +21,7 @@ pkgbase = cnijfilter-mp550
 	sha512sums = b75cdbdadac5fb396458dc9f14529c5e39a4fa47f97cd6a21a69b0dbac73f1b8dd90780068f6a348fcfb15939d0866dde1a1cf1ff7faaf0c443d2205a242ccd5
 	sha512sums = f1f8cc44d7892eb50b44e0fe9d5be877fa5d8f8783aedf494d739eee20c147befac4f4776959f42cdb9cfd9f766522635fc2aae2626fdaf0c4465226a66dcc0e
 	sha512sums = 0d8310867f45721150a870170172d3a0688bfba0267f627a630c105ff965d31f25dbcc31d3795874325bcb8eaeee395bf32b0648a743ff663dea6f977ab9070e
-	sha512sums = 05eaef447a3145fe735ae856d86375144b368c378e86bf642db084a1f16eb474e0c1cf8df592620db76b6b99ff6dcd16b15c6c74f5ee9e00a3703c0bf104bf66
+	sha512sums = 807a2f726b5fb0f383118fc6c60449bd37f3a68f788a0ba2e3643f054f592fb886298c397b190280ef565cba2fe57f943abdbf86e8a4890172aaf716984cb70f
 	depends_i686 = gtk2
 	depends_i686 = libxml2
 	makedepends_i686 = gcc
diff --git a/PKGBUILD b/PKGBUILD
index c3c928be93ae..55b5367fa92d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=('cnijfilter-mp550')
 _pkgname=cnijfilter
 
 pkgver=3.20
-pkgrel=10
+pkgrel=11
 _pkgreview=1
 
 pkgdesc="Canon IJ Printer Driver (For Multifunction MP550 series)"
@@ -21,7 +21,7 @@ makedepends_i686=('gcc' 'popt')
 depends_i686=('gtk2' 'libxml2')
 
 makedepends=('autoconf>=2.13' 'automake>=1.6' 'tar' 'make')
-depends=("${_pkgname}-common=${pkgver}")
+depends=("${_pkgname}-common=4.00")
 
 install=cnijfilter-mp550.install
 
@@ -35,7 +35,7 @@ sha512sums=('28a82d08d3b8a233b89a17e0e029510fc5b3cede97300eb71a9af03c9a15cca4355
             'b75cdbdadac5fb396458dc9f14529c5e39a4fa47f97cd6a21a69b0dbac73f1b8dd90780068f6a348fcfb15939d0866dde1a1cf1ff7faaf0c443d2205a242ccd5'
             'f1f8cc44d7892eb50b44e0fe9d5be877fa5d8f8783aedf494d739eee20c147befac4f4776959f42cdb9cfd9f766522635fc2aae2626fdaf0c4465226a66dcc0e'
             '0d8310867f45721150a870170172d3a0688bfba0267f627a630c105ff965d31f25dbcc31d3795874325bcb8eaeee395bf32b0648a743ff663dea6f977ab9070e'
-            '05eaef447a3145fe735ae856d86375144b368c378e86bf642db084a1f16eb474e0c1cf8df592620db76b6b99ff6dcd16b15c6c74f5ee9e00a3703c0bf104bf66')
+            '807a2f726b5fb0f383118fc6c60449bd37f3a68f788a0ba2e3643f054f592fb886298c397b190280ef565cba2fe57f943abdbf86e8a4890172aaf716984cb70f')
 
 prepare() {
   cd ${srcdir}
diff --git a/mychanges.patch b/mychanges.patch
index 739856d7ce50..5c2787a5e8d4 100644
--- a/mychanges.patch
+++ b/mychanges.patch
@@ -643,33 +643,19 @@ diff -aur cnijfilter-source-3.20-1/lgmon/src/lm_sub.c cnijfilter-source-3.20-1.n
 diff -aur cnijfilter-source-3.20-1/Makefile cnijfilter-source-3.20-1.new/Makefile
 --- cnijfilter-source-3.20-1/Makefile	2009-04-06 14:19:22.000000000 +0430
 +++ cnijfilter-source-3.20-1.new/Makefile	2015-06-24 18:40:20.695615264 +0430
-@@ -14,3 +14,25 @@
+@@ -14,3 +14,12 @@
  install :
  	target=install; $(scripts)
  
-+common :
-+	for dir in "libs" "cngpij" "pstocanonij" "backend" "backendnet"; do \
-+	  (cd $$dir; ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin --libdir=/usr/lib32; make) || exit 1; \
-+	done; \
-+	(cd lgmon; ./autogen.sh --prefix=/usr --program-suffix=common-general --enable-progpath=/usr/bin --libdir=/usr/lib32; cd src; make libbscc2sts.a) || exit 1; \
-+	(cd cngpijmon/cnijnpr; LIBS="-ldl" ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin --libdir=/usr/lib32; make) || exit 1;
-+
 +mp550 :
 +	for dir in "lgmon" "ppd" "cnijfilter" "printui" "cngpijmon"; do \
 +	  (cd $$dir; ./autogen.sh --prefix=/usr --program-suffix=mp550 --enable-progpath=/usr/bin --libdir=/usr/lib32; make) || exit 1; \
 +	done
 +
-+installcommon :
-+	for dir in "libs" "cngpij" "pstocanonij" "backend" "backendnet" "cngpijmon/cnijnpr"; do \
-+	  (cd $$dir; make install DESTDIR=${PACKAGEDIR}) || exit 1; \
-+	done
-+
 +installmp550 :
-+	(cd ppd; make install DESTDIR=${PACKAGEDIR}) || exit 1; \
-+	for dir in "cnijfilter" "printui" "lgmon" "cngpijmon"; do \
++	for dir in "ppd" "cnijfilter" "printui" "lgmon" "cngpijmon"; do \
 +	  (cd $$dir; make install DESTDIR=${PACKAGEDIR}) || exit 1; \
 +	done
-+
 diff -aur cnijfilter-source-3.20-1/ppd/canonmp550.ppd cnijfilter-source-3.20-1.new/ppd/canonmp550.ppd
 --- cnijfilter-source-3.20-1/ppd/canonmp550.ppd	2009-06-08 07:12:09.000000000 +0430
 +++ cnijfilter-source-3.20-1.new/ppd/canonmp550.ppd	2013-07-26 00:14:14.439987972 +0430