diff -Naur hplip-3.21.8/base/password.py hplip-3.21.8-zorin/base/password.py --- hplip-3.21.8/base/password.py 2021-09-01 16:10:17.000000000 +0100 +++ hplip-3.21.8-zorin/base/password.py 2021-09-26 14:12:38.562291111 +0100 @@ -57,6 +57,7 @@ 'boss': 'su', 'lfs': 'su', 'manjarolinux': 'sudo', + 'zorin': 'sudo', } diff -Naur hplip-3.21.8/installer/distros.dat hplip-3.21.8-zorin/installer/distros.dat --- hplip-3.21.8/installer/distros.dat 2021-09-01 16:10:17.000000000 +0100 +++ hplip-3.21.8-zorin/installer/distros.dat 2021-09-26 17:48:37.080036035 +0100 @@ -94,7 +94,7 @@ # **************************************** [distros] -distros=unknown,mepis,debian,suse,mandriva,fedora,redhat,rhel,slackware,gentoo,redflag,ubuntu,xandros,freebsd,linspire,ark,pclinuxos,centos,igos,linuxmint,linpus,gos,boss,lfs,manjarolinux +distros=unknown,mepis,debian,suse,mandriva,fedora,redhat,rhel,slackware,gentoo,redflag,ubuntu,xandros,freebsd,linspire,ark,pclinuxos,centos,igos,linuxmint,linpus,gos,boss,lfs,manjarolinux,zorin # **************************************** @@ -17883,3 +17883,314 @@ packages=avahi # **************************************** +[zorin] +index=27 +versions=15,16 +display_name=Zorin OS +alt_names=zorin os,zorinos +display=1 +notes= +package_mgrs=dpkg,apt-get,synaptic,update-manager,adept,aptitude,adept-updater +package_mgr_cmd=sudo apt-get install --assume-yes $packages_to_install +pre_depend_cmd=sudo dpkg --configure -a,sudo apt-get install --yes --force-yes -f,sudo apt-get update +post_depend_cmd= +hp_libs_remove_cmd= sudo apt-get remove libhpmud0 libsane-hpaio printer-driver-postscript-hp +scanjet_depend_cmd=sudo apt-get install --assume-yes python-pip,sudo pip install --upgrade pip,sudo -H pip install setuptools,sudo pip install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-eng,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo apt-get install --assume-yes python-opencv,sudo apt-get install --assume-yes python-pypdf2,sudo -H pip install imutils,sudo apt-get install --assume-yes imagemagick*,sudo apt-get install --assume-yes graphicsmagick* ,sudo -H pip install pypdfocr,sudo -H pip install scikit-image,sudo -H pip install scipy +scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo -H pip3 install setuptools,sudo pip3 install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-eng,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo apt-get install --assume-yes imagemagick*,sudo apt-get install --assume-yes graphicsmagick*,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image,sudo -H pip3 install scipy +hplip_remove_cmd=sudo aptitude remove --assume-yes hplip hpijs +su_sudo=sudo +ppd_install=ppd +udev_mode_fix=1 +ppd_dir= +fix_ppd_symlink=0 +drv_dir=/usr/share/cups/drv/HP + +# **************************************** + +[zorin:15] +code_name=Bionic Beaver +packaged_version=3.17.10 +release_date=05/06/2019 +supported=1 +scan_supported=1 +fax_supported=1 +pcard_supported=1 +network_supported=1 +parallel_supported=1 +usb_supported=1 +notes=Enable the universe/multiverse repositories. Also be sure you are using the Ubuntu "Main" Repositories. See: https://help.ubuntu.com/community/Repositories/Ubuntu for more information. Disable the CD-ROM/DVD source if you do not have the Ubuntu installation media inserted in the drive. +ppd_install=drv +udev_mode_fix=1 +ppd_dir=/usr/share/ppd/HP +fix_ppd_symlink=0 +drv_dir=/usr/share/cups/drv/HP +ui_toolkit=qt4 +native_cups=1 +acl_rules=1 +#scanjet_depend_cmd=sudo apt-get install --assume-yes python2-pip,sudo pip2 install --upgrade pip,sudo -H pip2 install setuptools,sudo pip2 install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip2 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo apt-get install --assume-yes python-opencv,sudo apt-get install --assume-yes python-pypdf2,sudo -H pip2 install imutils,sudo -H pip2 install pypdfocr,sudo -H pip2 install scikit-image,sudo -H pip2 install scipy +#scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo -H pip3 install setuptools,sudo pip3 install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image,sudo -H pip3 install scipy + +libdir_path=/usr/lib/x86_64-linux-gnu + +[zorin:15:cups] +packages=libcups2 + +[zorin:15:cups-devel] +packages=libcups2-dev,cups-bsd,cups-client + +[zorin:15:gcc] +packages=build-essential + +[zorin:15:gs] +packages=ghostscript + +[zorin:15:libcrypto] +packages= +commands=sudo DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install openssl + +[zorin:15:libjpeg] +packages=libjpeg8-dev + +[zorin:15:libnetsnmp-devel] +packages= +commands=sudo DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install libsnmp-dev,sudo apt-get --assume-yes install snmp-mibs-downloader + +[zorin:15:libpthread] +packages=build-essential + +[zorin:15:libtool] +packages=libtool,libtool-bin + +[zorin:15:libusb] +packages=libusb-1.0.0-dev + +[zorin:15:make] +packages=build-essential + +#[zorin:15:pil] +#packages=python-imaging + +[zorin:15:ppdev] +packages= +commands=sudo modprobe ppdev,sudo cp -f /etc/modules /etc/modules.hplip,echo ppdev | sudo tee -a /etc/modules + +[zorin:15:reportlab] +packages=python-reportlab + +[zorin:15:sane] +packages=libsane + +[zorin:15:sane-devel] +packages=libsane-dev + +[zorin:15:scanimage] +packages=sane-utils + +[zorin:15:xsane] +packages=xsane + +[zorin:15:python-dbus] +packages=python-dbus,python-gobject + +[zorin:15:dbus] +packages=libdbus-1-dev + +[zorin:15:cups-image] +packages=libcupsimage2-dev + +[zorin:15:cups-ddk] +packages=cups,libcupsimage2-dev + +[zorin:15:policykit] +packages=policykit-1,policykit-1-gnome + +[zorin:15:python-notify] +packages=python-notify + +[zorin:15:network] +packages=wget + +[zorin:15:avahi-utils] +packages=avahi-utils + +[zorin:15:python3-pyqt5-dbus] +packages=python3-dbus.mainloop.pyqt5 + +[zorin:15:python3-pyqt5] +packages=python3-pyqt5,gtk2-engines-pixbuf + +[zorin:15:python3-dbus] +packages=python3-dbus,python3-gi + +[zorin:15:python3-xml] +packages=python3-lxml + +[zorin:15:python3-devel] +packages=python3-dev + +[zorin:15:python3-pil] +packages=python3-pil + +[zorin:15:python3-reportlab] +packages=python3-reportlab + +[zorin:15:python3-notify2] +packages=python3-notify2 + +[zorin:15:python3-pyqt4-dbus] +packages=python3-dbus.mainloop.qt + +[zorin:15:python3-pyqt4] +packages=python3-pyqt4,gtk2-engines-pixbuf + +[zorin:15:automake] +packages=automake1.11 + +[zorin:15:epm] +packages=epm + +[zorin:15:libavahi-dev] +packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev + +# **************************************** + +[zorin:16] +code_name=Focal Fossa +packaged_version=3.20.3 +release_date=17/08/2021 +supported=1 +scan_supported=1 +fax_supported=1 +pcard_supported=1 +network_supported=1 +parallel_supported=1 +usb_supported=1 +notes=Enable the universe/multiverse repositories. Also be sure you are using the Ubuntu "Main" Repositories. See: https://help.ubuntu.com/community/Repositories/Ubuntu for more information. Disable the CD-ROM/DVD source if you do not have the Ubuntu installation media inserted in the drive. +ppd_install=drv +udev_mode_fix=1 +ppd_dir=/usr/share/ppd/HP +fix_ppd_symlink=0 +drv_dir=/usr/share/cups/drv/HP +ui_toolkit=qt5 +native_cups=1 +acl_rules=1 +#scanjet_depend_cmd=sudo apt-get install --assume-yes python2-pip,sudo pip2 install --upgrade pip,sudo -H pip2 install setuptools,sudo pip2 install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip2 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo apt-get install --assume-yes python-opencv,sudo apt-get install --assume-yes python-pypdf2,sudo -H pip2 install imutils,sudo -H pip2 install pypdfocr,sudo -H pip2 install scikit-image,sudo -H pip2 install scipy +#scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo -H pip3 install setuptools,sudo pip3 install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image,sudo -H pip3 install scipy + +libdir_path=/usr/lib/x86_64-linux-gnu + +[zorin:16:cups] +packages=libcups2 + +[zorin:16:cups-devel] +packages=libcups2-dev,cups-bsd,cups-client + +[zorin:16:gcc] +packages=build-essential + +[zorin:16:gs] +packages=ghostscript + +[zorin:16:libcrypto] +packages= +commands=sudo DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install openssl + +[zorin:16:libjpeg] +packages=libjpeg8-dev + +[zorin:16:libnetsnmp-devel] +packages= +commands=sudo DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install libsnmp-dev,sudo apt-get --assume-yes install snmp-mibs-downloader + +[zorin:16:libpthread] +packages=build-essential + +[zorin:16:libtool] +packages=libtool,libtool-bin + +[zorin:16:libusb] +packages=libusb-1.0.0-dev + +[zorin:16:make] +packages=build-essential + +#[zorin:16:pil] +#packages=python-imaging + +[zorin:16:ppdev] +packages= +commands=sudo modprobe ppdev,sudo cp -f /etc/modules /etc/modules.hplip,echo ppdev | sudo tee -a /etc/modules + +[zorin:16:reportlab] +packages=python-reportlab + +[zorin:16:sane] +packages=libsane + +[zorin:16:sane-devel] +packages=libsane-dev + +[zorin:16:scanimage] +packages=sane-utils + +[zorin:16:xsane] +packages=xsane + +[zorin:16:python-dbus] +packages=python-dbus,python-gobject + +[zorin:16:dbus] +packages=libdbus-1-dev + +[zorin:16:cups-image] +packages=libcupsimage2-dev + +[zorin:16:cups-ddk] +packages=cups,libcupsimage2-dev + +[zorin:16:policykit] +packages=policykit-1,policykit-1-gnome + +[zorin:16:python-notify] +packages=python-notify + +[zorin:16:network] +packages=wget + +[zorin:16:avahi-utils] +packages=avahi-utils + +[zorin:16:python3-pyqt5-dbus] +packages=python3-dbus.mainloop.pyqt5 + +[zorin:16:python3-pyqt5] +packages=python3-pyqt5,gtk2-engines-pixbuf + +[zorin:16:python3-dbus] +packages=python3-dbus,python3-gi + +[zorin:16:python3-xml] +packages=python3-lxml + +[zorin:16:python3-devel] +packages=python3-dev + +[zorin:16:python3-pil] +packages=python3-pil + +[zorin:16:python3-reportlab] +packages=python3-reportlab + +[zorin:16:python3-notify2] +packages=python3-notify2 + +[zorin:16:automake] +packages=automake1.11 + +[zorin:16:epm] +packages=epm + +[zorin:16:libavahi-dev] +packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev + +# **************************************** diff -Naur hplip-3.21.8/installer/text_install.py hplip-3.21.8-zorin/installer/text_install.py --- hplip-3.21.8/installer/text_install.py 2021-09-01 16:10:17.000000000 +0100 +++ hplip-3.21.8-zorin/installer/text_install.py 2021-09-26 14:12:38.562291111 +0100 @@ -392,7 +392,7 @@ tui.title("Package Generation") bClassPkg = True - if core.distro_name in ['ubuntu', 'debian', 'linuxmint']: + if core.distro_name in ['ubuntu', 'debian', 'linuxmint', 'zorin']: ok, choice = tui.enter_choice( "Which package would you like to create('t'=tar*,'b'=deb,'q'=Quit) : ", ['t', 'b', 'q'], 't') if not ok or choice == 'q': @@ -654,7 +654,7 @@ # tui.title("Package Generation") # bClassPkg = True - # if core.distro_name in ['ubuntu', 'debian', 'linuxmint']: + # if core.distro_name in ['ubuntu', 'debian', 'linuxmint', 'zorin']: # ok, choice = tui.enter_choice("Which package would you like to create('t'=tar*,'b'=deb,'q'=Quit) : ",['t', 'b','q'], 't') # if not ok or choice=='q': # log.error("User Exit")