Updated to Kyodialog9

3 files changed, 18 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a71b8358bbec..91788da18f7f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kyocera_universal
 	pkgdesc = Kyocera Printing Package for many Kyocera printers (stripped of kdialog8).
-	pkgver = 8.0.0
+	pkgver = 9.0.0
 	pkgrel = 1
 	url = https://www.kyocera.com/
 	install = kyodialog-bin.install
@@ -19,8 +19,7 @@ pkgbase = kyocera_universal
 	depends = python-reportlab
 	depends = python-setuptools
 	depends = zlib
-	source = https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_20201222_tar_gz.download.gz
-	md5sums = 3b9819e9e1654cbd3ed837731d87039f
+	source = https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_20210527_tar_gz.download.gz
+	md5sums = 5079cb91b5a62e51817740187d12cad4
 
 pkgname = kyocera_universal
-
diff --git a/PKGBUILD b/PKGBUILD
index d294897edc4c..735fc835ab60 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,19 @@
 # Maintainer: Dominik Wetzel <dimonok@web.de>
 # Contributors: Julian Eckhardt <julian@eckhardt.fi>, Paulo Marcos <contato-myghi63@protonmail.com>
 pkgname=kyocera_universal
-pkgver=8.0.0
+pkgver=9.0.0
 pkgrel=1
-pkgdesc="Kyocera Printing Package for many Kyocera printers (stripped of kdialog8)."
+pkgdesc="Kyocera Printing Package for many Kyocera printers (stripped of kdialog9)."
 arch=('x86_64' 'i686')
 url="https://www.kyocera.com/"
 license=('other')
 depends=('cups-filters' 'dbus' 'gcc-libs' 'glibc' 'krb5' 'libcups' 'libgcrypt' 'python-reportlab' 'python-setuptools' 'zlib')
 makedepends=('unzip' 'wget')
 DLAGENTS=("https::/usr/bin/wget")
-toDwnld="KyoceraLinuxPackages_20201222_tar_gz.download.gz"
+toDwnld="KyoceraLinuxPackages_20210527_tar_gz.download.gz"
 source=("https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/${toDwnld}")
 install=kyodialog-bin.install
-md5sums=('3b9819e9e1654cbd3ed837731d87039f')
+md5sums=('5079cb91b5a62e51817740187d12cad4')
 
 if [ "$arch" == "x86_64" ]; then
   _arch="amd64"
@@ -41,7 +41,7 @@ package() {
   cd $srcdir
   rm -r usr/share/kyocera${major}/Python
   rm -r usr/share/applications
-  rm usr/share/kyocera${major}/appicon_G.png
+  rm usr/share/kyocera${major}/appicon_H.png
   rm usr/bin/kyodialog${major}
   install -D -m644 "usr/share/doc/kyodialog/copyright" "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT"
   rm -r ${srcdir}/usr/share/doc
diff --git a/kyodialog-bin.install b/kyodialog-bin.install
index 53f1fd524b4a..cb43f9dbe1eb 100755
--- a/kyodialog-bin.install
+++ b/kyodialog-bin.install
@@ -1,6 +1,6 @@
 pre_install() {
 
-	PHASE2_PPDS=/usr/share/cups/model/Kyocera/
+	PHASE2_PPDS=/usr/share/cups/model/kyocera/
 	PHASE3_PPDS=/usr/share/ppd/kyocera/
 
 
@@ -18,13 +18,13 @@ post_install() {
 
 	ALTERNATE_PPD_DIRECTORY=/usr/share/cups/model/kyocera
 	PRIMARY_PPD_DIRECTORY=/usr/share/ppd/kyocera/
-	INSTALLED_PPD_DIRECTORY=/usr/share/kyocera8/ppd8
+	INSTALLED_PPD_DIRECTORY=/usr/share/kyocera9/ppd9
 
 	mkdir -p $PRIMARY_PPD_DIRECTORY
 	cp -r $INSTALLED_PPD_DIRECTORY/* $PRIMARY_PPD_DIRECTORY
 
-	chmod 777 /usr/share/kyocera8
-	chmod 755 /usr/bin/kyoPPDWrite_G
+	chmod 777 /usr/share/kyocera9
+	chmod 755 /usr/bin/kyoPPDWrite_H
 
 	if [ ! -h $ALTERNATE_PPD_DIRECTORY ]; then
 	    ln -s $PRIMARY_PPD_DIRECTORY $ALTERNATE_PPD_DIRECTORY
@@ -51,10 +51,10 @@ post_upgrade() {
 post_remove() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 
-	KYOCERA_CONFIG="/usr/share/kyocera8"
+	KYOCERA_CONFIG="/usr/share/kyocera9"
 
 	uninstall_printers(){
-	    files=`grep -l "kyofilter_G\|kyofilter_ras_G\|kyofilter_pdf_G" /etc/cups/ppd/* 2>/dev/null`
+	    files=`grep -l "kyofilter_H\|kyofilter_ras_H\|kyofilter_pdf_H" /etc/cups/ppd/* 2>/dev/null`
 	    if [ ! -z "$files" ]; then
 	        for file in ${files}; do
 	            if matches $file .ppd; then
@@ -95,9 +95,9 @@ post_remove() {
 
 	uninstall_config_files(){
 	    #For each user, uninstall the config files in
-	    #/usr/share/kyocera8/<username> and ~/.cups/lpoptions
+	    #/usr/share/kyocera9/<username> and ~/.cups/lpoptions
 	    if [ -d $KYOCERA_CONFIG ]; then
-	        users=`ls $KYOCERA_CONFIG | grep -v 'ppd8\|appicon\|Python'`
+	        users=`ls $KYOCERA_CONFIG | grep -v 'ppd9\|appicon\|Python'`
 	        if [ ! -z "$users" ]; then
 	            for user in ${users}; do
 	                is_appicon=`matches $user appicon.png`
@@ -117,8 +117,8 @@ post_remove() {
 	    if [ -d /usr/share/ppd/kyocera ]; then
 	        rm -rf "/usr/share/ppd/kyocera"
 	    fi
-	    if [ -d /usr/share/kyocera8/Python ]; then
-	        rm -rf "/usr/share/kyocera8/Python"
+	    if [ -d /usr/share/kyocera9/Python ]; then
+	        rm -rf "/usr/share/kyocera9/Python"
 	    fi
 	}