| author | Mohana Rao Gorai <mohana.gorai@oracle.com> |
| Mon, 10 Jun 2013 02:27:16 -0700 | |
| branch | s11-update |
| changeset 2646 | 86bc0997bd5f |
| parent 2645 | 6d96b69920f6 |
| child 2647 | c72026b4ef46 |
--- a/components/hplip/Makefile Wed Jun 05 06:47:13 2013 -0700 +++ b/components/hplip/Makefile Mon Jun 10 02:27:16 2013 -0700 @@ -19,17 +19,17 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk COMPONENT_NAME= hplip -COMPONENT_VERSION= 3.10.9 +COMPONENT_VERSION= 3.12.4 COMPONENT_PROJECT_URL= http://hplipopensource.com/hplip-web/ COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:1d34630084eccfcc80c08065becdf9313fd8f5a09a4cf523dbd9d3ec724206b9 + sha256:350375c78d79adf635a59a448b27b3fe9ab7ac622637c47125fe5f7d8a537fff COMPONENT_ARCHIVE_URL= http://sourceforge.net/projects/hplip/files/hplip/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= utility/hplip @@ -39,7 +39,7 @@ # We need to be able to return from void functions CC += $(studio_FEATURES_EXTENSIONS) -CXX += $(studio_FEATURES_EXTENSIONS) $(studio_NORUNPATH) $(studio_LIBRARY_NONE) +CXX += $(studio_FEATURES_EXTENSIONS) $(studio_NORUNPATH) $(studio_CXXLIB_CSTD) ROOTPPDCACHE = $(PROTO_DIR)/usr/lib/lp/caches/SUNWhpijs.cache
--- a/components/hplip/hplip.p5m Wed Jun 05 06:47:13 2013 -0700 +++ b/components/hplip/hplip.p5m Mon Jun 10 02:27:16 2013 -0700 @@ -59,14 +59,17 @@ # Common files dir path=usr/share/doc -dir path=usr/share/doc/hplip-3.10.9 -dir path=usr/share/doc/hplip-3.10.9/images -dir path=usr/share/doc/hplip-3.10.9/styles -dir path=usr/share/doc/hplip-3.10.9/styles +dir path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION) +dir path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/images +dir path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/styles +dir path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/styles dir path=usr/share/ppd group=lp dir path=usr/share/ppd/SUNWhpijs dir path=usr/share/ppd/SUNWhpijs/HP +# Component Logging +dir group=lp path=var/log/hp + # HPLIP support for CUPS file path=usr/bin/hp-mkuri @@ -77,6 +80,7 @@ file path=usr/lib/cups/filter/hpcups mode=0555 file path=usr/lib/cups/filter/hpcupsfax mode=0555 file path=usr/lib/cups/filter/hplipjs mode=0555 +file path=usr/lib/cups/filter/hpps mode=0555 file path=usr/lib/cups/filter/pstotiff mode=0555 \ pkg.depend.bypass-generate=.*/os.py.* pkg.depend.bypass-generate=.*/os.so \ pkg.depend.bypass-generate=.*/os/__init__.py \ @@ -137,6 +141,7 @@ file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_9500_mfp-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm1015-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm1017-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm4540_mfp-ps.ppd.gz file \ path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm1312_mfp-ps.ppd.gz file \ @@ -176,7 +181,9 @@ file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp5225-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp5225dn-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp5225n-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp5520_series-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp6015-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-designjet_4000ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-designjet_4020ps-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-designjet_4500mfp.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-designjet_4500ps.ppd.gz @@ -186,10 +193,22 @@ file path=usr/share/cups/model/SUNWhplip/hp-designjet_t1100ps_44in-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-designjet_t1120ps_24in-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-designjet_t1120ps_44in-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-designjet_t1300_postscript-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-designjet_t2300_postscript-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-designjet_t7100ps-ps.ppd.gz +file \ + path=usr/share/cups/model/SUNWhplip/hp-designjet_t7100ps_monochrome-ps.ppd.gz file \ path=usr/share/cups/model/SUNWhplip/hp-designjet_t1200_postscript-ps.ppd.gz file \ path=usr/share/cups/model/SUNWhplip/hp-designjet_t770_postscript-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-designjet_t790ps_24in-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-designjet_t790ps_44in-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-designjet_z6100ps_42in_photo-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-designjet_z6100ps_60in_photo-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-designjet_z6200_42in_photo-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-designjet_z6200_60in_photo-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-laserjet_100_color_mfp_m175-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-designjet_t770ps_24in-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1200-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1200n-ps.ppd.gz @@ -203,6 +222,7 @@ file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1320n-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1320nw-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1320tn-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-laserjet_200_colormfp_m275-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2100-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2100_series-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2200-ps.ppd.gz @@ -239,6 +259,7 @@ file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4v-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5000-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5000_series-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-laserjet_500_color_m551-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5100_series-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5200-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5200l-ps.ppd.gz @@ -247,6 +268,7 @@ file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5p-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5si-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5si_mopier-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-laserjet_600_m601_m602_m603-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_6mp-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_6p-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_8000-ps.ppd.gz @@ -262,83 +284,71 @@ file path=usr/share/cups/model/SUNWhplip/hp-laserjet_9050_mfp-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_9055mfp-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_9065mfp-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-laserjet_cm1410_series-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-laserjet_cp1520_series-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m1522_mfp-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m1522n_mfp-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m1522nf_mfp-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m2727_mfp-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m2727nf_mfp-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m2727nfs_mfp-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m1530_mfp_series-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m2727_mfp_series-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m3027_mfp-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m3035_mfp-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m4345_mfp-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m4349_mfp-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m4555_mfp-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m5025_mfp-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m5035_mfp-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m9040_mfp-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m9050_mfp-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m9059_mfp-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2015_series-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2015dn_series-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2015n_series-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2015x_series-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2055-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2055d-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2055dn-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2055x-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2055_series-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p3004-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p3005-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p3010_series-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4014-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4014dn-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4014n-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4015-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4015dn-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4015n-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4015tn-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4015x-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4515-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4515n-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4515tn-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4515x-ps.ppd.gz -file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4515xm-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4010_series-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-lj_300_400_color_m351_m451-ps.ppd.gz +file path=usr/share/cups/model/SUNWhplip/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-mopier_240-ps.ppd.gz file path=usr/share/cups/model/SUNWhplip/hp-mopier_320-ps.ppd.gz +file \ + path=usr/share/cups/model/SUNWhplip/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz # Common files -file path=usr/share/doc/hplip-3.10.9/COPYING -file path=usr/share/doc/hplip-3.10.9/README_LIBJPG -file path=usr/share/doc/hplip-3.10.9/commandline.html -file path=usr/share/doc/hplip-3.10.9/copying.html -file path=usr/share/doc/hplip-3.10.9/copyright -file path=usr/share/doc/hplip-3.10.9/devicemanager.html -file path=usr/share/doc/hplip-3.10.9/faxtrouble.html -file path=usr/share/doc/hplip-3.10.9/gettinghelp.html -file path=usr/share/doc/hplip-3.10.9/hpscan.html -file path=usr/share/doc/hplip-3.10.9/images/favicon.ico -file path=usr/share/doc/hplip-3.10.9/images/print.png -file path=usr/share/doc/hplip-3.10.9/images/toolbox_actions.png -file path=usr/share/doc/hplip-3.10.9/images/toolbox_fax.png -file path=usr/share/doc/hplip-3.10.9/images/toolbox_print_control.png -file path=usr/share/doc/hplip-3.10.9/images/toolbox_print_settings.png -file path=usr/share/doc/hplip-3.10.9/images/toolbox_status.png -file path=usr/share/doc/hplip-3.10.9/images/toolbox_supplies.png -file path=usr/share/doc/hplip-3.10.9/images/xsane.png -file path=usr/share/doc/hplip-3.10.9/index.html -file path=usr/share/doc/hplip-3.10.9/mainttask.html -file path=usr/share/doc/hplip-3.10.9/plugins.html -file path=usr/share/doc/hplip-3.10.9/print.html -file path=usr/share/doc/hplip-3.10.9/printing.html -file path=usr/share/doc/hplip-3.10.9/printoptions.html -file path=usr/share/doc/hplip-3.10.9/printtroubleshooting.html -file path=usr/share/doc/hplip-3.10.9/scanning.html -file path=usr/share/doc/hplip-3.10.9/scantrouble.html -file path=usr/share/doc/hplip-3.10.9/sendfax.html -file path=usr/share/doc/hplip-3.10.9/setup.html -file path=usr/share/doc/hplip-3.10.9/styles/css.css -file path=usr/share/doc/hplip-3.10.9/systray.html -file path=usr/share/doc/hplip-3.10.9/troubleshooting.html -file path=usr/share/doc/hplip-3.10.9/uninstalling.html -file path=usr/share/doc/hplip-3.10.9/upgrading.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/COPYING +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/README_LIBJPG +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/commandline.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/copying.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/copyright +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/devicemanager.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/faxtrouble.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/gettinghelp.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/hpscan.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/images/favicon.ico +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/images/print.png +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/images/toolbox_actions.png +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/images/toolbox_fax.png +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/images/toolbox_print_control.png +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/images/toolbox_print_settings.png +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/images/toolbox_status.png +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/images/toolbox_supplies.png +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/images/xsane.png +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/index.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/mainttask.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/plugins.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/print.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/printing.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/printoptions.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/printtroubleshooting.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/scanning.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/scantrouble.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/sendfax.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/setup.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/styles/css.css +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/systray.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/troubleshooting.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/uninstalling.html +file path=usr/share/doc/hplip-$(IPS_COMPONENT_VERSION)/upgrading.html file path=usr/share/ppd/SUNWhpijs/HP/hp-2000c-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-2500c-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-910-hpijs.ppd.gz @@ -453,6 +463,8 @@ file \ path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm3530_mfp-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm4540_mfp-hpijs-pcl3.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm4540_mfp-ps.ppd.gz file \ path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm4730_mfp-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm4730_mfp-ps.ppd.gz @@ -464,6 +476,7 @@ file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm6049_mfp-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp1215-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp1217-hpijs.ppd.gz file \ path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp1514n-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp1514n-ps.ppd.gz @@ -509,10 +522,13 @@ file \ path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp5225n-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp5520_series-hpijs-pcl3.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp5520_series-ps.ppd.gz file \ path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp6015-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-cp1160-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_4000ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_4020ps-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_4500mfp.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_4500ps.ppd.gz @@ -523,8 +539,18 @@ file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t1120ps_24in-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t1120ps_44in-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t1200_postscript-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t1300_postscript-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t2300_postscript-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t7100ps-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t7100ps_monochrome-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t770_postscript-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t770ps_24in-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t790ps_24in-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t790ps_44in-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_z6100ps_42in_photo-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_z6100ps_60in_photo-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_z6200_42in_photo-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_z6200_60in_photo-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1000_j110_series-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1050_j410_series-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1100-hpijs.ppd.gz @@ -540,6 +566,8 @@ file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_2050_j510_series-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3000_j310_series-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3050_j610_series-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3050a_j611_series-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3070_b611_series-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3320-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3325-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3420-hpijs.ppd.gz @@ -680,6 +708,8 @@ file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f4400_series-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f4500_series-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f735-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_ink_adv_2010_k010-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_ink_adv_2060_k110-hpijs.ppd.gz file \ path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz file \ @@ -687,8 +717,10 @@ file path=usr/share/ppd/SUNWhpijs/HP/hp-dj350-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-dj450-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-envy_100_d410_series-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-envy_110_series-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1000-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1005_series-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_100_color_mfp_m175-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1010-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1012-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1015-hpijs.ppd.gz @@ -730,6 +762,7 @@ file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320nw-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320tn-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320tn-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_200_colormfp_m275-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2100-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2100-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz @@ -811,6 +844,7 @@ file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5000-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5000_series-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_500_color_m551-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5100_series-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5200-hpijs-pcl3.ppd.gz @@ -828,6 +862,7 @@ file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5si-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5si_mopier-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_600_m601_m602_m603-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_6l-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_6mp-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_6mp-ps.ppd.gz @@ -860,6 +895,20 @@ file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9055mfp-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9065mfp-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_cm1410_series-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_cm1411fn-hpijs-pcl3.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_cm1412fn-hpijs-pcl3.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_cm1413fn-hpijs-pcl3.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_cm1415fn-hpijs-pcl3.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_cm1415fnw-hpijs-pcl3.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_cm1416fnw-hpijs-pcl3.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_cm1417fnw-hpijs-pcl3.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_cp1025-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_cp1025nw-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_cp1520_series-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_cp_1025-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_cp_1025nw-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1005-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1120_mfp-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1120n_mfp-hpijs.ppd.gz @@ -868,10 +917,13 @@ file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1522n_mfp-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1522nf_mfp-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1530_mfp_series-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1536dnf_mfp-hpijs-pcl3.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m2727_mfp-hpijs-pcl3.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m2727_mfp-ps.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m2727nf_mfp-ps.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m2727nfs_mfp-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m2727_mfp_series-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m3027_mfp-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz @@ -880,6 +932,7 @@ file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m4345_mfp-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m4349_mfp-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m4555_mfp-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m5025_mfp-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m5025_mfp-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz @@ -908,23 +961,17 @@ file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015_series-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015d_series-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015dn_series-hpijs.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015dn_series-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015n_series-hpijs.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015n_series-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015x_series-hpijs.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015x_series-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2035-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2035-hpijs-zjs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2035n-hpijs-zjs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055-hpijs-pcl3.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055_series-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055d-hpijs-pcl3.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055d-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055dn-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055x-hpijs-pcl3.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055x-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p3004-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p3004-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p3005-hpijs-pcl3.ppd.gz @@ -932,32 +979,20 @@ file \ path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p3010_series-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p3010_series-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4010_series-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4014-hpijs.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4014-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4014dn-hpijs.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4014dn-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4014n-hpijs.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4014n-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015-hpijs.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015dn-hpijs.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015dn-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015n-hpijs.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015n-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015tn-hpijs.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015tn-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015x-hpijs.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015x-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515-hpijs.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515n-hpijs.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515n-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515tn-hpijs.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515tn-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515x-hpijs.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515x-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515xm-hpijs.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515xm-ps.ppd.gz file \ path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz file \ @@ -965,8 +1000,16 @@ file \ path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz file \ + path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz +file \ + path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz +file \ + path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1216nfh_mfp-hpijs.ppd.gz +file \ path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz file \ + path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1219nf_mfp-hpijs.ppd.gz +file \ path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_p1102-hpijs.ppd.gz file \ path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_p1102w-hpijs.ppd.gz @@ -974,12 +1017,18 @@ path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_p1566-hpijs.ppd.gz file \ path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_p1606dn-hpijs.ppd.gz +file \ + path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_p_1102w-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-lj_300_400_color_m351_m451-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_p1106-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_p1108-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-mopier_240-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-mopier_240-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-mopier_320-hpijs-pcl3.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-mopier_320-ps.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet-hpijs.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_150_mobile_l511-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_100_mobile_l411-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4000_k210-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4100_series-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4105-hpijs.ppd.gz @@ -1000,6 +1049,7 @@ file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_5600_series-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6000_e609a-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6000_e609n-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6100-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6100_series-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6150_series-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6200_series-hpijs.ppd.gz @@ -1008,6 +1058,8 @@ file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6500_e709n-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6500_e710a-f-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6500_e710n-z-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6600-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6700-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7000_e809a-hpijs.ppd.gz file \ path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7000_e809a_series-hpijs.ppd.gz @@ -1043,10 +1095,14 @@ file \ path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_1170c_series-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8000_a809-hpijs.ppd.gz +file \ + path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8100-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8500_a909a-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8500_a909g-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8500_a909n-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8500_a910-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8600-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_k5300-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_k5400-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_k550-hpijs.ppd.gz @@ -1069,7 +1125,6 @@ file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_320-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_330-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_350-hpijs.ppd.gz -file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_500-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_520-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_570-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_580-hpijs.ppd.gz @@ -1107,11 +1162,15 @@ file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_380_series-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_420_series-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_470_series-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_5510_series-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_5510d_series-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_6510_series-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7150-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7200_series-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7345-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7350-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7400_series-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7510_series-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7550-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7600_series-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7700_series-hpijs.ppd.gz @@ -1173,6 +1232,7 @@ file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d7500_series-hpijs.ppd.gz file \ path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_estn_c510_series-hpijs.ppd.gz +file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_ink_adv_k510-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_p1000-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_p1100-hpijs.ppd.gz file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_plus_b209a-m-hpijs.ppd.gz
--- a/components/hplip/patches/01-build.patch Wed Jun 05 06:47:13 2013 -0700 +++ b/components/hplip/patches/01-build.patch Mon Jun 10 02:27:16 2013 -0700 @@ -1,5 +1,5 @@ ---- hplip-3.10.9-orig/scan/sane/scl.c Tue Aug 4 16:36:06 2009 -+++ hplip-3.10.9/scan/sane/scl.c Fri Sep 4 01:06:47 2009 +--- a/scan/sane/scl.c Tue Aug 4 16:36:06 2009 ++++ b/scan/sane/scl.c Fri Sep 4 01:06:47 2009 @@ -160,7 +160,7 @@ } @@ -36,8 +36,8 @@ { char rbuf[256]; int len, stat; ---- hplip-3.10.9-orig/scan/sane/xml.c Tue Aug 4 16:36:06 2009 -+++ hplip-3.10.9/scan/sane/xml.c Fri Sep 4 01:07:00 2009 +--- a/scan/sane/xml.c Tue Aug 4 16:36:06 2009 ++++ b/scan/sane/xml.c Fri Sep 4 01:07:00 2009 @@ -32,7 +32,7 @@ #include <string.h> #include <stdlib.h> @@ -65,8 +65,8 @@ { int i=0, j=0, dd=0, lf=0; ---- hplip-3.10.9-orig/scan/sane/mfpdtf.h Tue Aug 4 16:36:06 2009 -+++ hplip-3.10.9/scan/sane/mfpdtf.h Fri Sep 4 01:05:54 2009 +--- a/scan/sane/mfpdtf.h Tue Aug 4 16:36:06 2009 ++++ b/scan/sane/mfpdtf.h Fri Sep 4 01:05:54 2009 @@ -243,18 +243,18 @@ } __attribute__(( packed) ) array; } __attribute__(( packed) ); @@ -106,8 +106,8 @@ +int read_mfpdtf_block(int device, int channel, char *buf, int bufSize, int timeout); #endif // _MFPDTF_H ---- hplip-3.10.9-orig/scan/sane/io.c Tue Aug 4 16:36:06 2009 -+++ hplip-3.10.9/scan/sane/io.c Fri Sep 4 01:04:50 2009 +--- a/scan/sane/io.c Tue Aug 4 16:36:06 2009 ++++ b/scan/sane/io.c Fri Sep 4 01:04:50 2009 @@ -43,7 +43,7 @@ DBusError dbus_err; DBusConnection * dbus_conn; @@ -149,9 +149,9 @@ { int n, len, size, total=0; enum HPMUD_RESULT stat; ---- hplip-3.10.9-orig/scan/sane/common.c Tue Aug 4 16:36:06 2009 -+++ hplip-3.10.9/scan/sane/common.c Fri Sep 4 01:04:05 2009 -@@ -35,7 +35,7 @@ +--- a/scan/sane/common.c Tue Aug 4 16:36:06 2009 ++++ b/scan/sane/common.c Fri Sep 4 01:04:05 2009 +@@ -36,7 +36,7 @@ #define DEBUG_NOT_STATIC #include "sanei_debug.h" @@ -160,7 +160,7 @@ { char buf[256]; va_list args; -@@ -50,7 +50,7 @@ +@@ -51,7 +51,7 @@ return n; } @@ -169,7 +169,7 @@ { /* Dump size bytes of *data. Output looks like: * [0000] 75 6E 6B 6E 6F 77 6E 20 30 FF 00 00 00 00 39 00 unknown 0.....9. -@@ -97,7 +97,7 @@ +@@ -98,7 +98,7 @@ } } @@ -178,7 +178,7 @@ { /* Dump size bytes of *data. Output looks like: * [0000] 75 6E 6B 6E 6F 77 6E 20 30 FF 00 00 00 00 39 00 unknown 0.....9. -@@ -144,7 +144,7 @@ +@@ -145,7 +145,7 @@ } } @@ -187,7 +187,7 @@ { va_list args; int n; -@@ -159,7 +159,7 @@ +@@ -160,7 +160,7 @@ return buf; } @@ -196,7 +196,7 @@ unsigned long numerator1, unsigned long numerator2, unsigned long denominator, -@@ -182,12 +182,12 @@ +@@ -183,12 +183,12 @@ return result; } @@ -211,7 +211,7 @@ { int i; for( i = 1; i < MAX_LIST_SIZE; i++ ) -@@ -200,7 +200,7 @@ +@@ -201,7 +201,7 @@ return 0; } @@ -220,7 +220,7 @@ { if( NumListIsInList( list, n ) ) { -@@ -215,12 +215,12 @@ +@@ -216,12 +216,12 @@ return 1; } @@ -235,7 +235,7 @@ { int n = list[0]; if( n > 0 ) -@@ -230,12 +230,12 @@ +@@ -231,12 +231,12 @@ return n; } @@ -250,7 +250,7 @@ { while( *list ) { -@@ -248,7 +248,7 @@ +@@ -249,7 +249,7 @@ return 0; } @@ -259,8 +259,17 @@ { int i; for( i = 0; i < MAX_LIST_SIZE - 1; i++ ) ---- hplip-3.10.9-orig/scan/sane/pml.c Tue Aug 4 16:36:06 2009 -+++ hplip-3.10.9/scan/sane/pml.c Fri Sep 4 01:06:11 2009 +@@ -267,7 +267,7 @@ + return 0; + } + +-char* __attribute__ ((visibility ("hidden"))) itoa(int value, char* str, int radix) ++char* itoa(int value, char* str, int radix) + { + static char dig[] = "0123456789""abcdefghijklmnopqrstuvwxyz"; + int n = 0, neg = 0; +--- a/scan/sane/pml.c Tue Aug 4 16:36:06 2009 ++++ b/scan/sane/pml.c Fri Sep 4 01:06:11 2009 @@ -36,7 +36,7 @@ #define DEBUG_DECLARE_ONLY #include "sanei_debug.h" @@ -363,9 +372,9 @@ { int oldStuff = (hpaio->preDenali || hpaio->fromDenali || hpaio->denali) ? 1 : 0; ---- hplip-3.10.9-orig/scan/sane/hpaio.c Tue Aug 4 16:36:06 2009 -+++ hplip-3.10.9/scan/sane/hpaio.c Fri Sep 4 01:04:29 2009 -@@ -324,7 +324,7 @@ +--- a/scan/sane/hpaio.c Tue Aug 4 16:36:06 2009 ++++ b/scan/sane/hpaio.c Fri Sep 4 01:04:29 2009 +@@ -326,7 +326,7 @@ return NULL; } @@ -374,7 +383,7 @@ { SANE_Status retcode; -@@ -438,7 +438,7 @@ +@@ -440,7 +440,7 @@ } @@ -383,8 +392,8 @@ { //BREAKPOINT; ---- hplip-3.10.9-orig/scan/sane/xml.h Tue Aug 4 16:36:06 2009 -+++ hplip-3.10.9/scan/sane/xml.h Fri Sep 4 01:07:05 2009 +--- a/scan/sane/xml.h Tue Aug 4 16:36:06 2009 ++++ b/scan/sane/xml.h Fri Sep 4 01:07:05 2009 @@ -27,10 +27,10 @@ #ifndef _MXML_H #define _MXML_H @@ -399,8 +408,8 @@ +int get_tag(const char *buf, int buf_size, char *tag, int tag_size, char **tail); #endif // _MXML_H ---- hplip-3.10.9-orig/scan/sane/scl.h Tue Aug 4 16:36:06 2009 -+++ hplip-3.10.9/scan/sane/scl.h Fri Sep 4 01:06:54 2009 +--- a/scan/sane/scl.h Tue Aug 4 16:36:06 2009 ++++ b/scan/sane/scl.h Fri Sep 4 01:06:54 2009 @@ -176,8 +176,8 @@ //#define LEN_SCL_BUFFER 1024 #define LEN_SCL_BUFFER 256 /* Increase if reading binary data. */ @@ -423,9 +432,9 @@ #endif ---- hplip-3.10.9-orig/scan/sane/hpaio.h Tue Aug 4 16:36:06 2009 -+++ hplip-3.10.9/scan/sane/hpaio.h Fri Sep 4 01:04:35 2009 -@@ -271,8 +271,8 @@ +--- a/scan/sane/hpaio.h Tue Aug 4 16:36:06 2009 ++++ b/scan/sane/hpaio.h Fri Sep 4 01:04:35 2009 +@@ -270,8 +270,8 @@ } \ } while(0) @@ -436,8 +445,8 @@ void sane_hpaio_cancel(SANE_Handle handle); #endif ---- hplip-3.10.9-orig/scan/sane/mfpdtf.c Tue Aug 4 16:36:06 2009 -+++ hplip-3.10.9/scan/sane/mfpdtf.c Fri Sep 4 01:05:16 2009 +--- a/scan/sane/mfpdtf.c Tue Aug 4 16:36:06 2009 ++++ b/scan/sane/mfpdtf.c Fri Sep 4 01:05:16 2009 @@ -56,7 +56,7 @@ return seconds; } @@ -549,8 +558,8 @@ { MFPDTF_FIXED_HEADER *phd = (MFPDTF_FIXED_HEADER *)buf; int size, bsize=0, len; ---- hplip-3.10.9-orig/scan/sane/io.h Tue Aug 4 16:36:06 2009 -+++ hplip-3.10.9/scan/sane/io.h Fri Sep 4 01:04:55 2009 +--- a/scan/sane/io.h Tue Aug 4 16:36:06 2009 ++++ b/scan/sane/io.h Fri Sep 4 01:04:55 2009 @@ -31,9 +31,9 @@ #include "sane.h" #include "hpmud.h" @@ -564,9 +573,9 @@ #define EVENT_START_SCAN_JOB 2000 #define EVENT_END_SCAN_JOB 2001 ---- hplip-3.10.9-orig/scan/sane/common.h Tue Aug 4 16:36:06 2009 -+++ hplip-3.10.9/scan/sane/common.h Fri Sep 4 01:04:21 2009 -@@ -169,19 +169,19 @@ +--- a/scan/sane/common.h Tue Aug 4 16:36:06 2009 ++++ b/scan/sane/common.h Fri Sep 4 01:04:21 2009 +@@ -170,19 +170,19 @@ pXform++; \ } while(0) @@ -589,6 +598,7 @@ -void __attribute__ ((visibility ("hidden"))) StrListClear( const char ** list ); -int __attribute__ ((visibility ("hidden"))) StrListIsInList( const char ** list, char * s ); -int __attribute__ ((visibility ("hidden"))) StrListAdd( const char ** list, char * s ); +-char* __attribute__ ((visibility ("hidden"))) itoa(int value, char* str, int radix); +void NumListClear( int * list ); +int NumListIsInList( int * list, int n ); +int NumListAdd( int * list, int n ); @@ -597,10 +607,10 @@ +void StrListClear( const char ** list ); +int StrListIsInList( const char ** list, char * s ); +int StrListAdd( const char ** list, char * s ); - ++char* itoa(int value, char* str, int radix); #endif ---- hplip-3.10.9-orig/scan/sane/pml.h Tue Aug 4 16:36:06 2009 -+++ hplip-3.10.9/scan/sane/pml.h Fri Sep 4 01:06:24 2009 +--- a/scan/sane/pml.h Tue Aug 4 16:36:06 2009 ++++ b/scan/sane/pml.h Fri Sep 4 01:06:24 2009 @@ -159,15 +159,15 @@ unsigned char y[4]; } __attribute__(( packed)); @@ -638,8 +648,8 @@ +int pml_cancel(struct hpaioScanner_s *hpaio); #endif // _PML_H ---- hplip-3.10.9-orig/io/hpmud/pp.h Tue Aug 4 16:37:25 2009 -+++ hplip-3.10.9/io/hpmud/pp.h Fri Sep 4 00:51:13 2009 +--- a/io/hpmud/pp.h Tue Aug 4 16:37:25 2009 ++++ b/io/hpmud/pp.h Fri Sep 4 00:51:13 2009 @@ -76,25 +76,25 @@ struct _mud_device; struct _mud_channel; @@ -682,9 +692,9 @@ #endif // _PP_H ---- hplip-3.10.9-orig/io/hpmud/jd.c Tue Aug 4 16:37:25 2009 -+++ hplip-3.10.9/io/hpmud/jd.c Fri Sep 4 00:55:15 2009 -@@ -34,7 +34,7 @@ +--- a/io/hpmud/jd.c Tue Aug 4 16:37:25 2009 ++++ b/io/hpmud/jd.c Fri Sep 4 00:55:15 2009 +@@ -35,7 +35,7 @@ #include "hpmud.h" #include "hpmudi.h" @@ -693,7 +703,7 @@ { .open = jd_open, .close = jd_close, -@@ -60,7 +60,7 @@ +@@ -61,7 +61,7 @@ static const int ScanPort1[] = { 0, 8290, 0, 0 }; /* hack for CLJ28xx */ static const int GenericPort1[] = { 0, 8292, 0, 0 }; /* hack for CLJ28xx (fax) */ @@ -702,7 +712,7 @@ static int ReadReply(mud_channel *pc) { -@@ -146,7 +146,7 @@ +@@ -147,7 +147,7 @@ * JetDirect mud_device functions. */ @@ -711,7 +721,7 @@ { char uri_model[128]; char model[128]; -@@ -198,7 +198,7 @@ +@@ -199,7 +199,7 @@ return stat; } @@ -720,7 +730,7 @@ { enum HPMUD_RESULT stat = HPMUD_R_OK; -@@ -209,7 +209,7 @@ +@@ -210,7 +210,7 @@ return stat; } @@ -729,7 +739,7 @@ { enum HPMUD_RESULT stat = HPMUD_R_IO_ERROR; -@@ -229,13 +229,13 @@ +@@ -230,13 +230,13 @@ return stat; } @@ -745,7 +755,7 @@ { enum HPMUD_RESULT stat; -@@ -245,7 +245,7 @@ +@@ -246,7 +246,7 @@ return stat; } @@ -754,7 +764,7 @@ { enum HPMUD_RESULT stat; -@@ -261,7 +261,7 @@ +@@ -262,7 +262,7 @@ return stat; } @@ -763,7 +773,7 @@ { int index; enum HPMUD_RESULT stat; -@@ -290,7 +290,7 @@ +@@ -291,7 +291,7 @@ return stat; } @@ -772,7 +782,7 @@ { enum HPMUD_RESULT stat = HPMUD_R_OK; -@@ -306,7 +306,7 @@ +@@ -307,7 +307,7 @@ * JetDirect channel functions. */ @@ -781,7 +791,7 @@ { mud_device *pd = &msp->device[pc->dindex]; struct sockaddr_in pin; -@@ -480,7 +480,7 @@ +@@ -510,7 +510,7 @@ return stat; } @@ -790,7 +800,7 @@ { if (pc->socket >= 0) { -@@ -495,7 +495,7 @@ +@@ -525,7 +525,7 @@ return HPMUD_R_OK; } @@ -799,7 +809,7 @@ { mud_device *pd = &msp->device[pc->dindex]; int len, size, total=0; -@@ -555,7 +555,7 @@ +@@ -585,7 +585,7 @@ * Channel_read() tries to read "length" bytes from the peripheral. The returned read count may be zero * (timeout, no data available), less than "length" or equal "length". */ @@ -808,8 +818,8 @@ { mud_device *pd = &msp->device[pc->dindex]; int len=0; ---- hplip-3.10.9-orig/io/hpmud/dot4.c Tue Aug 4 16:37:25 2009 -+++ hplip-3.10.9/io/hpmud/dot4.c Fri Sep 4 00:48:13 2009 +--- a/io/hpmud/dot4.c Tue Aug 4 16:37:25 2009 ++++ b/io/hpmud/dot4.c Fri Sep 4 00:48:13 2009 @@ -150,7 +150,7 @@ } @@ -900,8 +910,8 @@ { mud_device *pd = &msp->device[pc->dindex]; unsigned char buf[HPMUD_BUFFER_SIZE]; ---- hplip-3.10.9-orig/io/hpmud/pml.c Tue Aug 4 16:37:25 2009 -+++ hplip-3.10.9/io/hpmud/pml.c Fri Sep 4 00:54:19 2009 +--- a/io/hpmud/pml.c Tue Aug 4 16:37:25 2009 ++++ b/io/hpmud/pml.c Fri Sep 4 00:54:19 2009 @@ -210,7 +210,7 @@ return len; } @@ -927,9 +937,9 @@ { BUG("no JetDirect support enabled\n"); return 0; ---- hplip-3.10.9-orig/io/hpmud/musb.c Tue Aug 4 16:37:25 2009 -+++ hplip-3.10.9/io/hpmud/musb.c Fri Sep 4 00:54:08 2009 -@@ -27,7 +27,7 @@ +--- a/io/hpmud/musb.c Tue Aug 4 16:37:25 2009 ++++ b/io/hpmud/musb.c Fri Sep 4 00:54:08 2009 +@@ -28,7 +28,7 @@ #include "hpmud.h" #include "hpmudi.h" @@ -938,7 +948,7 @@ { .read = musb_read, .write = musb_write, -@@ -841,7 +841,7 @@ +@@ -856,7 +856,7 @@ * Power up printer if necessary. Most all-in-ones have no power down state (ie: OJ K80), so they are already powered up. * Newer single function printers power-up with the print job. May be called by other mud_device. */ @@ -947,7 +957,7 @@ { const char *pSf; -@@ -955,7 +955,7 @@ +@@ -977,7 +977,7 @@ * USB mud_device functions. */ @@ -956,7 +966,7 @@ { int len=-EIO; -@@ -1030,7 +1030,7 @@ +@@ -1052,7 +1052,7 @@ return len; } @@ -965,7 +975,7 @@ { struct timeval t1, t2; int total_usec, tmo_usec=usec; -@@ -1089,7 +1089,7 @@ +@@ -1111,7 +1111,7 @@ return len; } @@ -974,7 +984,7 @@ { int len=0, fd=0; enum HPMUD_RESULT stat = HPMUD_R_IO_ERROR; -@@ -1138,7 +1138,7 @@ +@@ -1161,7 +1161,7 @@ return stat; } @@ -983,7 +993,7 @@ { int i; enum HPMUD_RESULT stat = HPMUD_R_OK; -@@ -1158,7 +1158,7 @@ +@@ -1181,7 +1181,7 @@ return stat; } @@ -992,7 +1002,7 @@ { int i, fd=FD_NA; enum HPMUD_RESULT stat = HPMUD_R_DEVICE_BUSY; -@@ -1214,7 +1214,7 @@ +@@ -1237,7 +1237,7 @@ return stat; } @@ -1001,7 +1011,7 @@ { int i, fd=FD_NA; enum HPMUD_RESULT stat = HPMUD_R_DEVICE_BUSY; -@@ -1263,7 +1263,7 @@ +@@ -1286,7 +1286,7 @@ return stat; } @@ -1010,7 +1020,7 @@ { enum HPMUD_RESULT stat; -@@ -1273,7 +1273,7 @@ +@@ -1296,7 +1296,7 @@ return stat; } @@ -1019,7 +1029,7 @@ { enum HPMUD_RESULT stat; -@@ -1292,7 +1292,7 @@ +@@ -1315,7 +1315,7 @@ return stat; } @@ -1028,7 +1038,7 @@ { int index; enum HPMUD_RESULT stat; -@@ -1321,7 +1321,7 @@ +@@ -1344,7 +1344,7 @@ return stat; } @@ -1037,7 +1047,7 @@ { enum HPMUD_RESULT stat = HPMUD_R_OK; -@@ -1337,7 +1337,7 @@ +@@ -1360,7 +1360,7 @@ * USB raw_channel functions. */ @@ -1046,7 +1056,7 @@ { int fd = FD_7_1_2; enum HPMUD_RESULT stat = HPMUD_R_DEVICE_BUSY; -@@ -1355,7 +1355,7 @@ +@@ -1378,7 +1378,7 @@ return stat; } @@ -1055,7 +1065,7 @@ { int fd = pc->fd; -@@ -1366,7 +1366,7 @@ +@@ -1401,7 +1401,7 @@ return HPMUD_R_OK; } @@ -1064,7 +1074,7 @@ { int len, size, total=0; enum HPMUD_RESULT stat = HPMUD_R_IO_ERROR; -@@ -1404,7 +1404,7 @@ +@@ -1439,7 +1439,7 @@ * Channel_read() tries to read "length" bytes from the peripheral. The returned read count may be zero * (timeout, no data available), less than "length" or equal "length". */ @@ -1073,7 +1083,7 @@ { int len=0, usec; enum HPMUD_RESULT stat = HPMUD_R_IO_ERROR; -@@ -1441,7 +1441,7 @@ +@@ -1476,7 +1476,7 @@ * USB comp_channel functions. */ @@ -1082,7 +1092,7 @@ { int fd; enum HPMUD_RESULT stat = HPMUD_R_DEVICE_BUSY; -@@ -1490,7 +1490,7 @@ +@@ -1534,7 +1534,7 @@ * USB mlc_channel functions. */ @@ -1091,7 +1101,7 @@ { mud_device *pd = &msp->device[pc->dindex]; enum FD_ID fd; -@@ -1558,7 +1558,7 @@ +@@ -1602,7 +1602,7 @@ return stat; } @@ -1100,7 +1110,7 @@ { mud_device *pd = &msp->device[pc->dindex]; unsigned char nullByte=0; -@@ -1596,7 +1596,7 @@ +@@ -1640,7 +1640,7 @@ return stat; } @@ -1109,7 +1119,7 @@ { mud_device *pd = &msp->device[pc->dindex]; int ret, len, size, dlen, total=0; -@@ -1669,7 +1669,7 @@ +@@ -1713,7 +1713,7 @@ * Note, if a "timeout" occurs one peripheral to host credit is left outstanding. Which means the peripheral * can send unsolicited data later. */ @@ -1118,7 +1128,7 @@ { mud_device *pd = &msp->device[pc->dindex]; enum HPMUD_RESULT stat = HPMUD_R_IO_ERROR; -@@ -1710,7 +1710,7 @@ +@@ -1754,7 +1754,7 @@ * USB dot4_channel functions. */ @@ -1127,7 +1137,7 @@ { mud_device *pd = &msp->device[pc->dindex]; enum FD_ID fd; -@@ -1799,7 +1799,7 @@ +@@ -1843,7 +1843,7 @@ return stat; } @@ -1136,7 +1146,7 @@ { mud_device *pd = &msp->device[pc->dindex]; enum HPMUD_RESULT stat = HPMUD_R_OK; -@@ -1842,7 +1842,7 @@ +@@ -1886,7 +1886,7 @@ return stat; } @@ -1145,7 +1155,7 @@ { mud_device *pd = &msp->device[pc->dindex]; int ret, len, size, dlen, total=0, cnt=0; -@@ -1919,7 +1919,7 @@ +@@ -1963,7 +1963,7 @@ * Note, if a "timeout" occurs one peripheral to host credit is left outstanding. Which means the peripheral * can send unsolicited data later. */ @@ -1154,7 +1164,7 @@ { mud_device *pd = &msp->device[pc->dindex]; enum HPMUD_RESULT stat = HPMUD_R_IO_ERROR; -@@ -1960,7 +1960,7 @@ +@@ -2004,7 +2004,7 @@ * USB probe devices, walk the USB bus(s) looking for HP products. */ @@ -1163,9 +1173,9 @@ { struct usb_bus *bus; struct usb_device *dev; ---- hplip-3.10.9-orig/io/hpmud/hpmud.c Tue Aug 4 16:37:25 2009 -+++ hplip-3.10.9/io/hpmud/hpmud.c Fri Sep 4 00:59:28 2009 -@@ -27,13 +27,13 @@ +--- a/io/hpmud/hpmud.c Tue Aug 4 16:37:25 2009 ++++ b/io/hpmud/hpmud.c Fri Sep 4 00:59:28 2009 +@@ -29,13 +29,13 @@ #include "hpmudi.h" /* Client data. */ @@ -1182,7 +1192,7 @@ { /* Dump size bytes of *data. Output looks like: * [0000] 75 6E 6B 6E 6F 77 6E 20 30 FF 00 00 00 00 39 00 unknown 0.....9. -@@ -81,7 +81,7 @@ +@@ -83,7 +83,7 @@ } /* Given the IEEE 1284 device id string, determine if this is a HP product. */ @@ -1191,7 +1201,7 @@ { char *pMf; -@@ -100,7 +100,7 @@ +@@ -102,7 +102,7 @@ return 0; } @@ -1200,7 +1210,7 @@ { const char *pMd=sz; int i, j, dd=0; -@@ -132,7 +132,7 @@ +@@ -134,7 +134,7 @@ return j; /* length does not include zero termination */ } @@ -1209,7 +1219,7 @@ { const char *pMd=sz; int i, j; -@@ -152,7 +152,7 @@ +@@ -154,7 +154,7 @@ } /* Parse serial number from uri string. */ @@ -1218,7 +1228,7 @@ { char *p; int i; -@@ -172,7 +172,7 @@ +@@ -174,7 +174,7 @@ return i; } @@ -1227,8 +1237,8 @@ { enum HPMUD_RESULT stat; ---- hplip-3.10.9-orig/io/hpmud/mlc.h Tue Aug 4 16:37:25 2009 -+++ hplip-3.10.9/io/hpmud/mlc.h Fri Sep 4 00:57:55 2009 +--- a/io/hpmud/mlc.h Tue Aug 4 16:37:25 2009 ++++ b/io/hpmud/mlc.h Fri Sep 4 00:57:55 2009 @@ -134,17 +134,17 @@ struct _mud_device; struct _mud_channel; @@ -1258,9 +1268,9 @@ #endif // _MLC_H ---- hplip-3.10.9-orig/io/hpmud/hpmudi.h Tue Aug 4 16:37:25 2009 -+++ hplip-3.10.9/io/hpmud/hpmudi.h Fri Sep 4 00:59:05 2009 -@@ -190,18 +190,18 @@ +--- a/io/hpmud/hpmudi.h Tue Aug 4 16:37:25 2009 ++++ b/io/hpmud/hpmudi.h Fri Sep 4 00:59:05 2009 +@@ -195,18 +195,18 @@ pthread_mutex_t mutex; } mud_session; @@ -1290,8 +1300,8 @@ #endif // _HPMUDI_H ---- hplip-3.10.9-orig/io/hpmud/dot4.h Tue Aug 4 16:37:25 2009 -+++ hplip-3.10.9/io/hpmud/dot4.h Fri Sep 4 00:50:05 2009 +--- a/io/hpmud/dot4.h Tue Aug 4 16:37:25 2009 ++++ b/io/hpmud/dot4.h Fri Sep 4 00:50:05 2009 @@ -172,16 +172,16 @@ typedef DOT4CloseChannelReply DOT4CreditReply; typedef DOT4Exit DOT4GetSocket; @@ -1319,8 +1329,8 @@ #endif // _DOT4_H ---- hplip-3.10.9-orig/io/hpmud/pp.c Tue Aug 4 16:37:25 2009 -+++ hplip-3.10.9/io/hpmud/pp.c Fri Sep 4 00:51:58 2009 +--- a/io/hpmud/pp.c Tue Aug 4 16:37:25 2009 ++++ b/io/hpmud/pp.c Fri Sep 4 00:51:58 2009 @@ -29,7 +29,7 @@ #include "hpmud.h" #include "hpmudi.h" @@ -1465,8 +1475,8 @@ { struct hpmud_model_attributes ma; char dev[HPMUD_LINE_SIZE]; ---- hplip-3.10.9-orig/io/hpmud/jd.h Tue Aug 4 16:37:25 2009 -+++ hplip-3.10.9/io/hpmud/jd.h Fri Sep 4 00:58:24 2009 +--- a/io/hpmud/jd.h Tue Aug 4 16:37:25 2009 ++++ b/io/hpmud/jd.h Fri Sep 4 00:58:24 2009 @@ -34,23 +34,23 @@ struct _mud_device; struct _mud_channel; @@ -1505,8 +1515,8 @@ #endif // _JD_H ---- hplip-3.10.9-orig/io/hpmud/mlc.c Tue Aug 4 16:37:25 2009 -+++ hplip-3.10.9/io/hpmud/mlc.c Fri Sep 4 00:55:47 2009 +--- a/io/hpmud/mlc.c Tue Aug 4 16:37:25 2009 ++++ b/io/hpmud/mlc.c Fri Sep 4 00:55:47 2009 @@ -26,7 +26,7 @@ #include "hpmud.h" #include "hpmudi.h" @@ -1606,8 +1616,8 @@ { mud_device *pd = &msp->device[pc->dindex]; unsigned char buf[HPMUD_BUFFER_SIZE]; ---- hplip-3.10.9-orig/io/hpmud/pml.h Tue Aug 4 16:37:25 2009 -+++ hplip-3.10.9/io/hpmud/pml.h Fri Sep 4 00:53:19 2009 +--- a/io/hpmud/pml.h Tue Aug 4 16:37:25 2009 ++++ b/io/hpmud/pml.h Fri Sep 4 00:53:19 2009 @@ -71,7 +71,7 @@ PML_DT_UNKNOWN = 0xff }; @@ -1617,9 +1627,9 @@ #endif // _PML_H ---- hplip-3.10.9-orig/io/hpmud/musb.h Tue Aug 4 16:37:25 2009 -+++ hplip-3.10.9/io/hpmud/musb.h Fri Sep 4 00:53:13 2009 -@@ -80,38 +80,38 @@ +--- a/io/hpmud/musb.h Tue Aug 4 16:37:25 2009 ++++ b/io/hpmud/musb.h Fri Sep 4 00:53:13 2009 +@@ -84,38 +84,38 @@ struct _mud_device; struct _mud_channel; @@ -1684,8 +1694,8 @@ #endif // _MUSB_H ---- hplip-3.10.9/prnt/hpijs/hpijsfax.cpp.orig Thu Oct 1 14:09:21 2009 -+++ hplip-3.10.9/prnt/hpijs/hpijsfax.cpp Thu Oct 1 14:09:39 2009 +--- a/prnt/hpijs/hpijsfax.cpp Thu Oct 1 14:09:21 2009 ++++ b/prnt/hpijs/hpijsfax.cpp Thu Oct 1 14:09:39 2009 @@ -587,7 +587,7 @@ ijs_server_done (ctx); } @@ -1695,3 +1705,31 @@ } // GrayLevel = (5/16)R + (9/16)G + (2/16)B +--- a/Makefile.in Tue Apr 10 01:38:51 2012 ++++ b/Makefile.in Tue Dec 18 23:23:01 2012 +@@ -8598,10 +8598,8 @@ + + install-dist_hplip_LogDATA: + @FULL_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) +-@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) + @FULL_BUILD_TRUE@ chmod 774 $(DESTDIR)$(hplip_Logdir) + @HPLIP_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) +-@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) + @HPLIP_BUILD_TRUE@ chmod 774 $(DESTDIR)$(hplip_Logdir) + + install-data-hook: +--- a/Makefile.am Tue Apr 10 01:35:14 2012 ++++ b/Makefile.am Tue Dec 18 23:21:59 2012 +@@ -509,12 +509,10 @@ + install-dist_hplip_LogDATA: + if FULL_BUILD + test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) +- chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) + chmod 774 $(DESTDIR)$(hplip_Logdir) + endif #FULL_BUILD + if HPLIP_BUILD + test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) +- chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) + chmod 774 $(DESTDIR)$(hplip_Logdir) + endif #FULL_BUILD +
--- a/components/hplip/patches/02_HPCupsFilter.cpp.patch Wed Jun 05 06:47:13 2013 -0700 +++ b/components/hplip/patches/02_HPCupsFilter.cpp.patch Mon Jun 10 02:27:16 2013 -0700 @@ -1,11 +1,11 @@ ---- hplip-3.10.9-orig/prnt/hpcups/HPCupsFilter.cpp Tue Dec 21 02:30:42 2010 -+++ hplip-3.10.9/prnt/hpcups/HPCupsFilter.cpp Tue Dec 21 02:31:05 2010 -@@ -35,6 +35,8 @@ - #include <time.h> - #include <sys/timeb.h> - +--- a/prnt/hpcups/HPCupsFilter.cpp Tue Dec 21 02:30:42 2010 ++++ b/prnt/hpcups/HPCupsFilter.cpp Tue Dec 21 02:31:05 2010 +@@ -36,6 +36,8 @@ + #include <sys/utsname.h> + #include <time.h> + #include <sys/timeb.h> ++ +extern "C" int getdomainname(char*, int); -+ - #define HP_FILE_VERSION_STR "03.09.08.0" - - static HPCupsFilter filter; + + #define HP_FILE_VERSION_STR "03.09.08.0" +
--- a/components/hplip/patches/03_ErnieFilter.cpp.patch Wed Jun 05 06:47:13 2013 -0700 +++ b/components/hplip/patches/03_ErnieFilter.cpp.patch Mon Jun 10 02:27:16 2013 -0700 @@ -1,5 +1,5 @@ ---- hplip-3.10.9/prnt/hpcups/ErnieFilter.cpp.orig Mon Dec 27 00:02:08 2010 -+++ hplip-3.10.9/prnt/hpcups/ErnieFilter.cpp Mon Dec 27 00:03:19 2010 +--- a/prnt/hpcups/ErnieFilter.cpp Mon Dec 27 00:02:08 2010 ++++ b/prnt/hpcups/ErnieFilter.cpp Mon Dec 27 00:03:19 2010 @@ -50,6 +50,8 @@ #include "ErnieFilter.h"
--- a/components/hplip/patches/04_pstotiff.patch Wed Jun 05 06:47:13 2013 -0700 +++ b/components/hplip/patches/04_pstotiff.patch Mon Jun 10 02:27:16 2013 -0700 @@ -1,5 +1,5 @@ ---- hplip-3.10.9/fax/filters/pstotiff.orig Fri Mar 25 03:39:05 2011 -+++ hplip-3.10.9/fax/filters/pstotiff Fri Mar 25 03:42:38 2011 +--- a/fax/filters/pstotiff.orig Fri Mar 25 03:39:05 2011 ++++ b/fax/filters/pstotiff Fri Mar 25 03:42:38 2011 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2.6