autu: Update to 3.60-1

2 files changed, 18 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b8ba3a201e79..cf3cc9b6bc62 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 # Generated by mksrcinfo v8
-# Wed Apr 18 05:22:21 UTC 2018
+# Wed Aug 29 22:24:53 UTC 2018
 pkgbase = cndrvcups-lb-bin
-	pkgdesc = CUPS Canon UFR II LT driver for imageCLASS D Laser Shot LBP i-SENSYS MF imagePRESS iPR imageRUNNER iR ADVANCE iR-ADV FAX color copiers and printers, does not require PCL/PXL or PS dealer LMS license
-	pkgver = 3.50
+	pkgdesc = CUPS Canon UFR II LT LIPSLX driver for imageCLASS D Laser Shot LBP i-SENSYS MF imagePRESS iPR imageRUNNER iR ADVANCE iR-ADV FAX color copiers and printers, does not require PCL/PXL or PS dealer LMS license
+	pkgver = 3.60
 	pkgrel = 1
-	url = https://www.canon.co.uk/for_work/products/office_print_copy_solutions/office_black_white/imagerunner_1730i/
+	url = https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -23,15 +23,15 @@ pkgbase = cndrvcups-lb-bin
 	depends = ghostscript
 	depends = cups
 	depends = libcups
-	provides = cndrvcups-lb=3.50
-	provides = cndrvcups-common-lb=3.90
+	provides = cndrvcups-lb=3.60
+	provides = cndrvcups-common-lb=4.00
 	conflicts = cndrvcups-common-lb
 	conflicts = cndrvcups-lb
 	replaces = canon-ufr
 	options = !emptydirs
 	options = !strip
-	source = http://gdlp01.c-wss.com/gds/8/0100007658/05/linux-UFRII-drv-v350-uken.tar.gz
-	sha256sums = c00324177a6f77f0a6deb4ecc6bee8150607dd4029bad3dfc1a521f84f811e7f
+	source = http://gdlp01.c-wss.com/gds/0/0100009240/02/linux-UFRII-drv-v360-uken.tar.gz
+	sha256sums = a5bf2c2d53049ad64acf2ed8b6dc954ff261c4b996ce1cc81471e5baaf5e40cd
 	depends_i686 = glibc
 	depends_i686 = gcc-libs
 	depends_i686 = icu
diff --git a/PKGBUILD b/PKGBUILD
index 71814bd00a98..81a4988e3c37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,6 +3,8 @@
 # Contributor: Allen Choong <allencch at hotmail dot com>
 # Contributor: Indeed <fengjared at gmail dot com>
 
+# Note: Many a4 eu LIPSLX CARPS2 models are left out of the -bin version.
+
 # TODO: Add /usr/share/{doc,licenses}
 
 _opt_RPM=1 # Default 1
@@ -117,16 +119,17 @@ pkgname='cndrvcups-lb-bin'
 # http://gdlp01.c-wss.com/gds/8/0100007658/04/linux-UFRII-drv-v340-uken.tar.gz
 # http://gdlp01.c-wss.com/gds/8/0100002708/17/linux-UFRII-drv-v340-uken.tar.gz
 #pkgver='3.50'; _commonver='3.90'; _dl='0/0100009240/01'; _co='uk' # http://gdlp01.c-wss.com/gds/0/0100009240/01/linux-UFRII-drv-v350-uken.tar.gz c00324177a6f77f0a6deb4ecc6bee8150607dd4029bad3dfc1a521f84f811e7f
-pkgver='3.50'; _commonver='3.90'; _dl='8/0100007658/05'; _co='uk' # http://gdlp01.c-wss.com/gds/8/0100007658/05/linux-UFRII-drv-v350-uken.tar.gz c00324177a6f77f0a6deb4ecc6bee8150607dd4029bad3dfc1a521f84f811e7f
+#pkgver='3.50'; _commonver='3.90'; _dl='8/0100007658/05'; _co='uk' # http://gdlp01.c-wss.com/gds/8/0100007658/05/linux-UFRII-drv-v350-uken.tar.gz c00324177a6f77f0a6deb4ecc6bee8150607dd4029bad3dfc1a521f84f811e7f
+pkgver='3.60'; _commonver='4.00'; _dl='0/0100009240/02'; _co='uk' # http://gdlp01.c-wss.com/gds/0/0100009240/02/linux-UFRII-drv-v360-uken.tar.gz a5bf2c2d53049ad64acf2ed8b6dc954ff261c4b996ce1cc81471e5baaf5e40cd
 
 _pkgver="${pkgver}"
 pkgrel='1'
-pkgdesc='CUPS Canon UFR II LT driver for imageCLASS D Laser Shot LBP i-SENSYS MF imagePRESS iPR imageRUNNER iR ADVANCE iR-ADV FAX color copiers and printers, does not require PCL/PXL or PS dealer LMS license'
+pkgdesc='CUPS Canon UFR II LT LIPSLX driver for imageCLASS D Laser Shot LBP i-SENSYS MF imagePRESS iPR imageRUNNER iR ADVANCE iR-ADV FAX color copiers and printers, does not require PCL/PXL or PS dealer LMS license'
 # Not UFR II: PRO PC-D
 arch=('i686' 'x86_64')
 # Direct links to the download reference go bad on the next version. We want something that will persist for a while.
-url='https://www.canon.co.uk/for_work/products/office_print_copy_solutions/office_black_white/imagerunner_1730i/'
-#url='https://www.usa.canon.com/internet/portal/us/home/support/details/printers/black-and-white-laser/mf212w/imageclass-mf212w'
+url='https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx'
+#url='https://www.usa.canon.com/internet/portal/us/home/support/details/printers/black-and-white-laser/mf212w'
 license=('GPL' 'MIT' 'custom')
 _depsdual=('glibc' 'gcc-libs') # 'libpng12'
 depends=('bzip2' 'gnutls' 'icu' 'lz4' 'pcre' 'xz' 'avahi' 'gtk2' 'libglade' 'libpng' 'ghostscript' 'cups' 'libcups')
@@ -168,7 +171,7 @@ else
 fi
 unset _pkgverV
 source=("http://gdlp01.c-wss.com/gds/${_dl}/${_srcdir}.tar.gz")
-unset _dl0 _dl1 _dl2
+unset _dl
 if [ "${_inst_mix}" -ne 0 ]; then
   _pkgverA='3.20'
   pkgver="${_pkgver}.r${_pkgverA}"
@@ -188,7 +191,7 @@ if [ "${_inst_lb}" -ne 0 ] && [ "${_opt_debug_cnpkmoduleufr2}" -ne 0 ]; then
     'https://archive.archlinux.org/packages/l/lib32-glibc/lib32-glibc-2.23-5-x86_64.pkg.tar.xz'
   )
 fi
-sha256sums=('c00324177a6f77f0a6deb4ecc6bee8150607dd4029bad3dfc1a521f84f811e7f')
+sha256sums=('a5bf2c2d53049ad64acf2ed8b6dc954ff261c4b996ce1cc81471e5baaf5e40cd')
 #PKGEXT='.tar.gz'
 
 package() {
@@ -388,7 +391,7 @@ EOF
     # 4755 SUID seems not necessary for cnusb, USB, or Network
     chmod 755 'usr/bin/cnpkmoduleufr2'
 
-    # grep -he '^*ModelName:' 'usr/share/cups/model'/*.ppd > "${startdir}/models.${_pkgver}.txt"
+    # grep -he '^*ModelName:' 'usr/share/cups/model'/*.ppd | sort -u > "${startdir}/models.${_pkgver}.txt"
 
     gzip 'usr/share/cups/model'/*.ppd
   fi