diff options
1765 files changed, 2468 insertions, 1527 deletions
diff --git a/Makefile.am b/Makefile.am index 060ee7e83..dec8927b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,6 +10,7 @@ CXXFLAGS+= -DCONFDIR=\"$(hplip_confdir)\" hplipdir = $(datadir)/hplip docdir = $(hpdocdir) +htmldir = $(hphtmldir) doc_DATA = COPYING copyright prnt/hpijs/README_LIBJPG EXTRA_DIST = prnt/hpijs/gdevijs-krgb-1.5-gs8.61.patch prnt/hpijs/README_LIBJPG copyright @@ -24,11 +25,11 @@ include cups_drv.inc if DOC_BUILD wwwsrc = doc -www0dir = $(docdir) +www0dir = $(htmldir) dist_www0_DATA = $(wwwsrc)/index.html $(wwwsrc)/commandline.html $(wwwsrc)/copying.html $(wwwsrc)/devicemanager.html $(wwwsrc)/faxtrouble.html $(wwwsrc)/gettinghelp.html $(wwwsrc)/hpscan.html $(wwwsrc)/mainttask.html $(wwwsrc)/plugins.html $(wwwsrc)/print.html $(wwwsrc)/printing.html $(wwwsrc)/printoptions.html $(wwwsrc)/printtroubleshooting.html $(wwwsrc)/scanning.html $(wwwsrc)/scantrouble.html $(wwwsrc)/sendfax.html $(wwwsrc)/setup.html $(wwwsrc)/systray.html $(wwwsrc)/troubleshooting.html $(wwwsrc)/uninstalling.html $(wwwsrc)/upgrading.html -www3dir = $(docdir)/styles +www3dir = $(htmldir)/styles dist_www3_DATA = $(wwwsrc)/styles/* -www4dir = $(docdir)/images +www4dir = $(htmldir)/images dist_www4_DATA = $(wwwsrc)/images/* endif @@ -102,12 +103,6 @@ libhpip_la_SOURCES = ip/xconvolve.c ip/xfax.c ip/xgrayout.c ip/xjpg_dct.c ip/xjp ip/xbi2gray.c ip/xcolrspc.c ip/xfakemono.c ip/xgray2bi.c ip/xinvert.c ip/xjpg_enc.c ip/xmatrix.c ip/xpnm.c ip/xscale.c ip/xthumb.c ip/xyxtract.c \ ip/hpip.h ip/ipdefs.h ip/xform.h ip/xjpg_dct.h ip/xjpg_huf.h ip/xjpg_mrk.h -# hp-mkuri. -hp_mkuridir = $(bindir) -hp_mkuri_PROGRAMS = hp-mkuri -hp_mkuri_SOURCES = io/hpmud/hp-mkuri.c -hp_mkuri_LDADD = -ldl libhpmud.la -hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" #hpmud rules data dir rulessystemdir=/usr/lib/systemd/system @@ -136,10 +131,6 @@ pstotiff_SCRIPTS = fax/filters/pstotiff hplip_statedir = /var/lib/hp dist_hplip_state_DATA = -# Log Files -hplip_Logdir=/var/log/hp -hplip_tmpdir=/var/log/hp/tmp - if FULL_BUILD dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py @@ -215,8 +206,6 @@ postscriptdir = $(hplipdir)/data/ps localzdir = $(hplipdir)/data/localization dist_postscript_DATA = data/ps/testpage.ps.gz data/ps/clean_page.pdf.gz dist_models_DATA = data/models/models.dat -dist_hplip_Log_DATA= -dist_hplip_tmp_DATA= if GUI_BUILD dist_images_16x16_DATA = data/images/16x16/* @@ -532,31 +521,6 @@ cupsdrv2dir = $(drvdir) cupsdrv2_DATA = $(cups_drv) endif - -install-dist_hplip_LogDATA: -if FULL_BUILD - test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) - chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) - chmod 775 $(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 775 $(DESTDIR)$(hplip_Logdir) -endif #FULL_BUILD - -install-dist_hplip_tmpDATA: -if FULL_BUILD - test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir) - chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) - chmod 0775 $(DESTDIR)$(hplip_tmpdir) -endif #FULL_BUILD -if HPLIP_BUILD - test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir) - chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) - chmod 0775 $(DESTDIR)$(hplip_tmpdir) -endif #FULL_BUILD - install-data-hook: if HPLIP_BUILD # If scanner build, add hpaio entry to sane dll.conf. diff --git a/Makefile.in b/Makefile.in index 6c313f5f2..785560ed9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -68,8 +68,7 @@ DIST_COMMON = $(am__configure_deps) $(am__dist_base_DATA_DIST) \ $(am__dist_scan_DATA_DIST) $(am__dist_ui4_DATA_DIST) \ $(am__dist_ui_DATA_DIST) $(am__dist_www0_DATA_DIST) \ $(am__dist_www3_DATA_DIST) $(am__dist_www4_DATA_DIST) \ - $(dist_hplip_Log_DATA) $(dist_hplip_state_DATA) \ - $(dist_hplip_tmp_DATA) $(dist_plugins4_SCRIPTS) \ + $(dist_hplip_state_DATA) $(dist_plugins4_SCRIPTS) \ $(dist_unrel_DATA) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/cups_drv.inc $(srcdir)/foomatic_drv.inc \ $(srcdir)/hplip-systray.desktop.in $(srcdir)/hplip.conf.in \ @@ -86,7 +85,6 @@ DIST_COMMON = $(am__configure_deps) $(am__dist_base_DATA_DIST) \ @HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am__append_2 = -l$(SNMPLIB) -lcrypto @HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@am__append_3 = -lusb @HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_4 = -lusb-1.0 -@HPLIP_BUILD_TRUE@hp_mkuri_PROGRAMS = hp-mkuri$(EXEEXT) @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_5 = \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ scan/sane/hpaio.desc \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ prnt/drv/hpijs.drv.in.template \ @@ -157,18 +155,17 @@ am__installdirs = "$(DESTDIR)$(cupsextdir)" "$(DESTDIR)$(hpmudextdir)" \ "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libsane_hpaiodir)" \ "$(DESTDIR)$(pcardextdir)" "$(DESTDIR)$(scanextdir)" \ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(hpdir)" \ - "$(DESTDIR)$(hp_mkuridir)" "$(DESTDIR)$(hpcupsdir)" \ - "$(DESTDIR)$(hpcupsfaxdir)" "$(DESTDIR)$(cmddir)" \ - "$(DESTDIR)$(findir)" "$(DESTDIR)$(hpfaxdir)" \ - "$(DESTDIR)$(hplipdir)" "$(DESTDIR)$(plugins4dir)" \ - "$(DESTDIR)$(ripdir)" "$(DESTDIR)$(pstotiffdir)" \ - "$(DESTDIR)$(cupsdrvdir)" "$(DESTDIR)$(cupsdrv2dir)" \ - "$(DESTDIR)$(basedir)" "$(DESTDIR)$(copierdir)" \ - "$(DESTDIR)$(faxdir)" "$(DESTDIR)$(fax_filtersdir)" \ - "$(DESTDIR)$(halpredir)" "$(DESTDIR)$(homedir)" \ - "$(DESTDIR)$(hpcupsfaxppddir)" "$(DESTDIR)$(hpijsfaxppddir)" \ - "$(DESTDIR)$(hplip_Logdir)" "$(DESTDIR)$(hplip_statedir)" \ - "$(DESTDIR)$(hplip_tmpdir)" "$(DESTDIR)$(images_128x128dir)" \ + "$(DESTDIR)$(hpcupsdir)" "$(DESTDIR)$(hpcupsfaxdir)" \ + "$(DESTDIR)$(cmddir)" "$(DESTDIR)$(findir)" \ + "$(DESTDIR)$(hpfaxdir)" "$(DESTDIR)$(hplipdir)" \ + "$(DESTDIR)$(plugins4dir)" "$(DESTDIR)$(ripdir)" \ + "$(DESTDIR)$(pstotiffdir)" "$(DESTDIR)$(cupsdrvdir)" \ + "$(DESTDIR)$(cupsdrv2dir)" "$(DESTDIR)$(basedir)" \ + "$(DESTDIR)$(copierdir)" "$(DESTDIR)$(faxdir)" \ + "$(DESTDIR)$(fax_filtersdir)" "$(DESTDIR)$(halpredir)" \ + "$(DESTDIR)$(homedir)" "$(DESTDIR)$(hpcupsfaxppddir)" \ + "$(DESTDIR)$(hpijsfaxppddir)" "$(DESTDIR)$(hplip_statedir)" \ + "$(DESTDIR)$(images_128x128dir)" \ "$(DESTDIR)$(images_16x16dir)" "$(DESTDIR)$(images_24x24dir)" \ "$(DESTDIR)$(images_256x256dir)" \ "$(DESTDIR)$(images_32x32dir)" "$(DESTDIR)$(images_64x64dir)" \ @@ -375,8 +372,8 @@ scanext_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ $(scanextdir) @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__EXEEXT_1 = ptest$(EXEEXT) \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ hppgsz$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) $(hp_PROGRAMS) $(hp_mkuri_PROGRAMS) \ - $(hpcups_PROGRAMS) $(hpcupsfax_PROGRAMS) $(noinst_PROGRAMS) +PROGRAMS = $(bin_PROGRAMS) $(hp_PROGRAMS) $(hpcups_PROGRAMS) \ + $(hpcupsfax_PROGRAMS) $(noinst_PROGRAMS) am__hp_SOURCES_DIST = prnt/backend/hp.c @HPLIP_BUILD_TRUE@am_hp_OBJECTS = hp-hp.$(OBJEXT) hp_OBJECTS = $(am_hp_OBJECTS) @@ -384,13 +381,6 @@ hp_OBJECTS = $(am_hp_OBJECTS) hp_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(hp_CFLAGS) $(CFLAGS) $(hp_LDFLAGS) \ $(LDFLAGS) -o $@ -am__hp_mkuri_SOURCES_DIST = io/hpmud/hp-mkuri.c -@HPLIP_BUILD_TRUE@am_hp_mkuri_OBJECTS = hp_mkuri-hp-mkuri.$(OBJEXT) -hp_mkuri_OBJECTS = $(am_hp_mkuri_OBJECTS) -@HPLIP_BUILD_TRUE@hp_mkuri_DEPENDENCIES = libhpmud.la -hp_mkuri_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(hp_mkuri_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ am__hpcups_SOURCES_DIST = prnt/hpcups/HPCupsFilter.cpp \ prnt/hpcups/HPCupsFilter.h prnt/hpcups/dbuscomm.cpp \ prnt/hpcups/dbuscomm.h prnt/hpcups/Compressor.cpp \ @@ -581,17 +571,16 @@ SOURCES = $(cupsext_la_SOURCES) $(hpmudext_la_SOURCES) \ $(libapdk_la_SOURCES) $(libhpip_la_SOURCES) \ $(libhpmud_la_SOURCES) $(libsane_hpaio_la_SOURCES) \ $(pcardext_la_SOURCES) $(scanext_la_SOURCES) $(hp_SOURCES) \ - $(hp_mkuri_SOURCES) $(hpcups_SOURCES) $(hpcupsfax_SOURCES) \ - $(hpijs_SOURCES) $(hppgsz_SOURCES) $(ptest_SOURCES) + $(hpcups_SOURCES) $(hpcupsfax_SOURCES) $(hpijs_SOURCES) \ + $(hppgsz_SOURCES) $(ptest_SOURCES) DIST_SOURCES = $(am__cupsext_la_SOURCES_DIST) \ $(am__hpmudext_la_SOURCES_DIST) $(libapdk_la_SOURCES) \ $(am__libhpip_la_SOURCES_DIST) $(am__libhpmud_la_SOURCES_DIST) \ $(am__libsane_hpaio_la_SOURCES_DIST) \ $(am__pcardext_la_SOURCES_DIST) $(am__scanext_la_SOURCES_DIST) \ - $(am__hp_SOURCES_DIST) $(am__hp_mkuri_SOURCES_DIST) \ - $(am__hpcups_SOURCES_DIST) $(am__hpcupsfax_SOURCES_DIST) \ - $(am__hpijs_SOURCES_DIST) $(am__hppgsz_SOURCES_DIST) \ - $(am__ptest_SOURCES_DIST) + $(am__hp_SOURCES_DIST) $(am__hpcups_SOURCES_DIST) \ + $(am__hpcupsfax_SOURCES_DIST) $(am__hpijs_SOURCES_DIST) \ + $(am__hppgsz_SOURCES_DIST) $(am__ptest_SOURCES_DIST) am__dist_base_DATA_DIST = base/maint.py base/codes.py base/g.py \ base/pml.py base/status.py base/__init__.py base/mfpdtf.py \ base/utils.py base/wifi.py base/LedmWifi.py base/device.py \ @@ -689,6 +678,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm6049_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_m1522_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz \ + prnt/ps/hp-designjet_t2500-postscript.ppd.gz \ prnt/ps/hp-color_laserjet_9500-ps.ppd.gz \ prnt/ps/hp-laserjet_400_mfp_m425-ps.ppd.gz \ prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.gz \ @@ -735,11 +725,13 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-laserjet_3200m-ps.ppd.gz \ prnt/ps/hp-laserjet_1320-ps.ppd.gz \ prnt/ps/hp-designjet_z5400-postscript.ppd.gz \ + prnt/ps/hp-laserjet_m806-ps.ppd.gz \ prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz \ prnt/ps/hp-designjet_4500ps.ppd.gz \ prnt/ps/hp-laserjet_4240-ps.ppd.gz \ prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz \ + prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2840-ps.ppd.gz \ prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2250-ps.ppd.gz \ @@ -815,6 +807,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-laserjet_2300-ps.ppd.gz \ prnt/ps/hp-laserjet_9000_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2830-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz \ prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz \ prnt/ps/hp-laserjet_4000_series-ps.ppd.gz \ prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz \ @@ -896,11 +889,13 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-laserjet_5200l-ps.ppd.gz \ prnt/ps/hp-mopier_240-ps.ppd.gz \ prnt/ps/hp-laserjet_9050_mfp-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m750-ps.ppd.gz \ prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz \ prnt/ps/hp-laserjet_1200n-ps.ppd.gz \ prnt/ps/hp-laserjet_3390-ps.ppd.gz \ prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz \ prnt/ps/hp-designjet_4500mfp.ppd.gz \ + prnt/ps/hp-color_laserjet_m855-ps.ppd.gz \ prnt/ps/hp-laserjet_400_m401-ps.ppd.gz \ ppd/hpijs/hp-officejet_7400_series-hpijs.ppd.gz \ ppd/hpijs/hp-psc_1358_series-hpijs.ppd.gz \ @@ -983,6 +978,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-deskjet_1600c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_cp1025nw-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_1000_j110_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m127fn-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_d7100_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_600-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz \ @@ -1048,6 +1044,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-psc_2100_series-hpijs.ppd.gz \ ppd/hpijs/hp-business_inkjet_1200-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p1006-hpijs.ppd.gz \ + ppd/hpijs/hp-color_laserjet_pro_mfp_m176n-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1005_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_d6100_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_672c-hpijs.ppd.gz \ @@ -1242,10 +1239,12 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-photosmart_estn_c510_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_855c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4340_series-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_2620_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-envy_4500_series-hpijs.ppd.gz \ ppd/hpijs/hp-psc_1200_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_pro_b8800_series-hpijs.ppd.gz \ + ppd/hpijs/hp-color_laserjet_pro_mfp_m177fw-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_series_710-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_f4213_series-hpijs.ppd.gz \ @@ -1454,6 +1453,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-laserjet_3100-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_700-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_7345-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m127fw-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_d1300_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3420-hpijs.ppd.gz \ @@ -1481,6 +1481,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-officejet_t_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_6500_e709a-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_2640_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_pro_8600-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4300-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_1115-hpijs.ppd.gz \ @@ -1705,6 +1706,8 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpcups/hp-color_laserjet_cp5225n-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz \ + ppd/hpcups/hp-color_laserjet_pro_mfp_m176n.ppd.gz \ + ppd/hpcups/hp-color_laserjet_pro_mfp_m177fw.ppd.gz \ ppd/hpcups/hp-cp1160.ppd.gz \ ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz \ ppd/hpcups/hp-deskjet_1010_series.ppd.gz \ @@ -1725,6 +1728,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpcups/hp-deskjet_2510_series.ppd.gz \ ppd/hpcups/hp-deskjet_2520_series.ppd.gz \ ppd/hpcups/hp-deskjet_2540_series.ppd.gz \ + ppd/hpcups/hp-deskjet_2640_series.ppd.gz \ ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz \ ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz \ ppd/hpcups/hp-deskjet_3050a_j611_series.ppd.gz \ @@ -2060,6 +2064,8 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpcups/hp-laserjet_p4515tn.ppd.gz \ ppd/hpcups/hp-laserjet_p4515x.ppd.gz \ ppd/hpcups/hp-laserjet_p4515xm.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz \ ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_professional_m1137_mfp.ppd.gz \ @@ -2099,6 +2105,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpcups/hp-officejet.ppd.gz \ ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz \ ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz \ + ppd/hpcups/hp-officejet_2620_series.ppd.gz \ ppd/hpcups/hp-officejet_4000_k210.ppd.gz \ ppd/hpcups/hp-officejet_4100_series.ppd.gz \ ppd/hpcups/hp-officejet_4105.ppd.gz \ @@ -2405,8 +2412,7 @@ DATA = $(cupsdrv_DATA) $(cupsdrv2_DATA) $(dist_base_DATA) \ $(dist_copier_DATA) $(dist_fax_DATA) $(dist_fax_filters_DATA) \ $(dist_halpre_DATA) $(dist_home_DATA) \ $(dist_hpcupsfaxppd_DATA) $(dist_hpijsfaxppd_DATA) \ - $(dist_hplip_Log_DATA) $(dist_hplip_state_DATA) \ - $(dist_hplip_tmp_DATA) $(dist_images_128x128_DATA) \ + $(dist_hplip_state_DATA) $(dist_images_128x128_DATA) \ $(dist_images_16x16_DATA) $(dist_images_24x24_DATA) \ $(dist_images_256x256_DATA) $(dist_images_32x32_DATA) \ $(dist_images_64x64_DATA) $(dist_images_devices_DATA) \ @@ -2518,6 +2524,7 @@ abs_datadir = @abs_datadir@ abs_docdir = @abs_docdir@ abs_drvdir = @abs_drvdir@ abs_hpppddir = @abs_hpppddir@ +abs_htmldir = @abs_htmldir@ abs_mimedir = @abs_mimedir@ abs_ppddir = @abs_ppddir@ abs_sbindir = @abs_sbindir@ @@ -2582,10 +2589,11 @@ host_vendor = @host_vendor@ hpcups_install = @hpcups_install@ hpcups_only_build = @hpcups_only_build@ hpdocdir = @hpdocdir@ +hphtmldir = @hphtmldir@ hpijs_install = @hpijs_install@ hpijs_only_build = @hpijs_only_build@ hpppddir = @hpppddir@ -htmldir = @htmldir@ +htmldir = $(hphtmldir) icondir = @icondir@ includedir = @includedir@ infodir = @infodir@ @@ -2724,6 +2732,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_1600c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_cp1025nw-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_1000_j110_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m127fn-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_d7100_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_600-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz \ @@ -2789,6 +2798,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-psc_2100_series-hpijs.ppd.gz \ ppd/hpijs/hp-business_inkjet_1200-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p1006-hpijs.ppd.gz \ + ppd/hpijs/hp-color_laserjet_pro_mfp_m176n-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1005_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_d6100_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_672c-hpijs.ppd.gz \ @@ -2983,10 +2993,12 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-photosmart_estn_c510_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_855c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4340_series-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_2620_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-envy_4500_series-hpijs.ppd.gz \ ppd/hpijs/hp-psc_1200_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_pro_b8800_series-hpijs.ppd.gz \ + ppd/hpijs/hp-color_laserjet_pro_mfp_m177fw-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_series_710-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_f4213_series-hpijs.ppd.gz \ @@ -3195,6 +3207,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_3100-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_700-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_7345-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m127fw-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_d1300_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3420-hpijs.ppd.gz \ @@ -3222,6 +3235,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_t_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_6500_e709a-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_2640_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_pro_8600-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4300-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_1115-hpijs.ppd.gz \ @@ -3376,6 +3390,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_cm6049_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_m1522_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz \ + prnt/ps/hp-designjet_t2500-postscript.ppd.gz \ prnt/ps/hp-color_laserjet_9500-ps.ppd.gz \ prnt/ps/hp-laserjet_400_mfp_m425-ps.ppd.gz \ prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.gz \ @@ -3422,11 +3437,13 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_3200m-ps.ppd.gz \ prnt/ps/hp-laserjet_1320-ps.ppd.gz \ prnt/ps/hp-designjet_z5400-postscript.ppd.gz \ + prnt/ps/hp-laserjet_m806-ps.ppd.gz \ prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz \ prnt/ps/hp-designjet_4500ps.ppd.gz \ prnt/ps/hp-laserjet_4240-ps.ppd.gz \ prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz \ + prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2840-ps.ppd.gz \ prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2250-ps.ppd.gz \ @@ -3502,6 +3519,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_2300-ps.ppd.gz \ prnt/ps/hp-laserjet_9000_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2830-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz \ prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz \ prnt/ps/hp-laserjet_4000_series-ps.ppd.gz \ prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz \ @@ -3583,11 +3601,13 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_5200l-ps.ppd.gz \ prnt/ps/hp-mopier_240-ps.ppd.gz \ prnt/ps/hp-laserjet_9050_mfp-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m750-ps.ppd.gz \ prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz \ prnt/ps/hp-laserjet_1200n-ps.ppd.gz \ prnt/ps/hp-laserjet_3390-ps.ppd.gz \ prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz \ prnt/ps/hp-designjet_4500mfp.ppd.gz \ + prnt/ps/hp-color_laserjet_m855-ps.ppd.gz \ prnt/ps/hp-laserjet_400_m401-ps.ppd.gz foomatic_drv = prnt/drv/hpijs.drv @@ -3679,6 +3699,8 @@ cups_ppd_printers = \ ppd/hpcups/hp-color_laserjet_cp5225n-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz \ + ppd/hpcups/hp-color_laserjet_pro_mfp_m176n.ppd.gz \ + ppd/hpcups/hp-color_laserjet_pro_mfp_m177fw.ppd.gz \ ppd/hpcups/hp-cp1160.ppd.gz \ ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz \ ppd/hpcups/hp-deskjet_1010_series.ppd.gz \ @@ -3699,6 +3721,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-deskjet_2510_series.ppd.gz \ ppd/hpcups/hp-deskjet_2520_series.ppd.gz \ ppd/hpcups/hp-deskjet_2540_series.ppd.gz \ + ppd/hpcups/hp-deskjet_2640_series.ppd.gz \ ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz \ ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz \ ppd/hpcups/hp-deskjet_3050a_j611_series.ppd.gz \ @@ -4035,6 +4058,8 @@ cups_ppd_printers = \ ppd/hpcups/hp-laserjet_p4515tn.ppd.gz \ ppd/hpcups/hp-laserjet_p4515x.ppd.gz \ ppd/hpcups/hp-laserjet_p4515xm.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz \ ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_professional_m1137_mfp.ppd.gz \ @@ -4074,6 +4099,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-officejet.ppd.gz \ ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz \ ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz \ + ppd/hpcups/hp-officejet_2620_series.ppd.gz \ ppd/hpcups/hp-officejet_4000_k210.ppd.gz \ ppd/hpcups/hp-officejet_4100_series.ppd.gz \ ppd/hpcups/hp-officejet_4105.ppd.gz \ @@ -4328,11 +4354,11 @@ cups_ppd_printers = \ cups_drv = prnt/drv/hpcups.drv @DOC_BUILD_TRUE@wwwsrc = doc -@DOC_BUILD_TRUE@www0dir = $(docdir) +@DOC_BUILD_TRUE@www0dir = $(htmldir) @DOC_BUILD_TRUE@dist_www0_DATA = $(wwwsrc)/index.html $(wwwsrc)/commandline.html $(wwwsrc)/copying.html $(wwwsrc)/devicemanager.html $(wwwsrc)/faxtrouble.html $(wwwsrc)/gettinghelp.html $(wwwsrc)/hpscan.html $(wwwsrc)/mainttask.html $(wwwsrc)/plugins.html $(wwwsrc)/print.html $(wwwsrc)/printing.html $(wwwsrc)/printoptions.html $(wwwsrc)/printtroubleshooting.html $(wwwsrc)/scanning.html $(wwwsrc)/scantrouble.html $(wwwsrc)/sendfax.html $(wwwsrc)/setup.html $(wwwsrc)/systray.html $(wwwsrc)/troubleshooting.html $(wwwsrc)/uninstalling.html $(wwwsrc)/upgrading.html -@DOC_BUILD_TRUE@www3dir = $(docdir)/styles +@DOC_BUILD_TRUE@www3dir = $(htmldir)/styles @DOC_BUILD_TRUE@dist_www3_DATA = $(wwwsrc)/styles/* -@DOC_BUILD_TRUE@www4dir = $(docdir)/images +@DOC_BUILD_TRUE@www4dir = $(htmldir)/images @DOC_BUILD_TRUE@dist_www4_DATA = $(wwwsrc)/images/* # hp backend. @@ -4384,12 +4410,6 @@ cups_drv = prnt/drv/hpcups.drv @HPLIP_BUILD_TRUE@ ip/hpip.h ip/ipdefs.h ip/xform.h ip/xjpg_dct.h ip/xjpg_huf.h ip/xjpg_mrk.h -# hp-mkuri. -@HPLIP_BUILD_TRUE@hp_mkuridir = $(bindir) -@HPLIP_BUILD_TRUE@hp_mkuri_SOURCES = io/hpmud/hp-mkuri.c -@HPLIP_BUILD_TRUE@hp_mkuri_LDADD = -ldl libhpmud.la -@HPLIP_BUILD_TRUE@hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" - #hpmud rules data dir @HPLIP_BUILD_TRUE@rulessystemdir = /usr/lib/systemd/system @HPLIP_BUILD_TRUE@dist_rulessystem_DATA = data/rules/hplip-printer@.service @@ -4412,10 +4432,6 @@ cups_drv = prnt/drv/hpcups.drv # hplip.state @HPLIP_BUILD_TRUE@hplip_statedir = /var/lib/hp @HPLIP_BUILD_TRUE@dist_hplip_state_DATA = - -# Log Files -@HPLIP_BUILD_TRUE@hplip_Logdir = /var/log/hp -@HPLIP_BUILD_TRUE@hplip_tmpdir = /var/log/hp/tmp @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@cmddir = $(hplipdir) @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_cmd_SCRIPTS = align.py info.py print.py toolbox.py clean.py colorcal.py unload.py testpage.py makeuri.py check.py fab.py levels.py \ @@ -4477,8 +4493,6 @@ cups_drv = prnt/drv/hpcups.drv @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@localzdir = $(hplipdir)/data/localization @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_postscript_DATA = data/ps/testpage.ps.gz data/ps/clean_page.pdf.gz @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_models_DATA = data/models/models.dat -@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_hplip_Log_DATA = -@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_hplip_tmp_DATA = @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_images_16x16_DATA = data/images/16x16/* @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_images_24x24_DATA = data/images/24x24/* @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_images_32x32_DATA = data/images/32x32/* @@ -5072,49 +5086,6 @@ clean-hpPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -install-hp_mkuriPROGRAMS: $(hp_mkuri_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(hp_mkuridir)" || $(MKDIR_P) "$(DESTDIR)$(hp_mkuridir)" - @list='$(hp_mkuri_PROGRAMS)'; test -n "$(hp_mkuridir)" || list=; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(hp_mkuridir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(hp_mkuridir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-hp_mkuriPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(hp_mkuri_PROGRAMS)'; test -n "$(hp_mkuridir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(hp_mkuridir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(hp_mkuridir)" && rm -f $$files - -clean-hp_mkuriPROGRAMS: - @list='$(hp_mkuri_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list install-hpcupsPROGRAMS: $(hpcups_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(hpcupsdir)" || $(MKDIR_P) "$(DESTDIR)$(hpcupsdir)" @@ -5213,9 +5184,6 @@ clean-noinstPROGRAMS: hp$(EXEEXT): $(hp_OBJECTS) $(hp_DEPENDENCIES) @rm -f hp$(EXEEXT) $(hp_LINK) $(hp_OBJECTS) $(hp_LDADD) $(LIBS) -hp-mkuri$(EXEEXT): $(hp_mkuri_OBJECTS) $(hp_mkuri_DEPENDENCIES) - @rm -f hp-mkuri$(EXEEXT) - $(hp_mkuri_LINK) $(hp_mkuri_OBJECTS) $(hp_mkuri_LDADD) $(LIBS) hpcups$(EXEEXT): $(hpcups_OBJECTS) $(hpcups_DEPENDENCIES) @rm -f hpcups$(EXEEXT) $(hpcups_LINK) $(hpcups_OBJECTS) $(hpcups_LDADD) $(LIBS) @@ -5479,7 +5447,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cupsext_la-cupsext.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hp-hp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hp_mkuri-hp-mkuri.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hpcups-BreakTables.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hpcups-ColorMatcher.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hpcups-Compressor.Po@am__quote@ @@ -6153,20 +6120,6 @@ hp-hp.obj: prnt/backend/hp.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hp_CFLAGS) $(CFLAGS) -c -o hp-hp.obj `if test -f 'prnt/backend/hp.c'; then $(CYGPATH_W) 'prnt/backend/hp.c'; else $(CYGPATH_W) '$(srcdir)/prnt/backend/hp.c'; fi` -hp_mkuri-hp-mkuri.o: io/hpmud/hp-mkuri.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hp_mkuri_CFLAGS) $(CFLAGS) -MT hp_mkuri-hp-mkuri.o -MD -MP -MF $(DEPDIR)/hp_mkuri-hp-mkuri.Tpo -c -o hp_mkuri-hp-mkuri.o `test -f 'io/hpmud/hp-mkuri.c' || echo '$(srcdir)/'`io/hpmud/hp-mkuri.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/hp_mkuri-hp-mkuri.Tpo $(DEPDIR)/hp_mkuri-hp-mkuri.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='io/hpmud/hp-mkuri.c' object='hp_mkuri-hp-mkuri.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hp_mkuri_CFLAGS) $(CFLAGS) -c -o hp_mkuri-hp-mkuri.o `test -f 'io/hpmud/hp-mkuri.c' || echo '$(srcdir)/'`io/hpmud/hp-mkuri.c - -hp_mkuri-hp-mkuri.obj: io/hpmud/hp-mkuri.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hp_mkuri_CFLAGS) $(CFLAGS) -MT hp_mkuri-hp-mkuri.obj -MD -MP -MF $(DEPDIR)/hp_mkuri-hp-mkuri.Tpo -c -o hp_mkuri-hp-mkuri.obj `if test -f 'io/hpmud/hp-mkuri.c'; then $(CYGPATH_W) 'io/hpmud/hp-mkuri.c'; else $(CYGPATH_W) '$(srcdir)/io/hpmud/hp-mkuri.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/hp_mkuri-hp-mkuri.Tpo $(DEPDIR)/hp_mkuri-hp-mkuri.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='io/hpmud/hp-mkuri.c' object='hp_mkuri-hp-mkuri.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hp_mkuri_CFLAGS) $(CFLAGS) -c -o hp_mkuri-hp-mkuri.obj `if test -f 'io/hpmud/hp-mkuri.c'; then $(CYGPATH_W) 'io/hpmud/hp-mkuri.c'; else $(CYGPATH_W) '$(srcdir)/io/hpmud/hp-mkuri.c'; fi` - jccolor.o: prnt/hpcups/jccolor.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jccolor.o -MD -MP -MF $(DEPDIR)/jccolor.Tpo -c -o jccolor.o `test -f 'prnt/hpcups/jccolor.c' || echo '$(srcdir)/'`prnt/hpcups/jccolor.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/jccolor.Tpo $(DEPDIR)/jccolor.Po @@ -7684,14 +7637,6 @@ uninstall-dist_hpijsfaxppdDATA: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(hpijsfaxppddir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(hpijsfaxppddir)" && rm -f $$files - -uninstall-dist_hplip_LogDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_hplip_Log_DATA)'; test -n "$(hplip_Logdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(hplip_Logdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(hplip_Logdir)" && rm -f $$files install-dist_hplip_stateDATA: $(dist_hplip_state_DATA) @$(NORMAL_INSTALL) test -z "$(hplip_statedir)" || $(MKDIR_P) "$(DESTDIR)$(hplip_statedir)" @@ -7712,14 +7657,6 @@ uninstall-dist_hplip_stateDATA: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(hplip_statedir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(hplip_statedir)" && rm -f $$files - -uninstall-dist_hplip_tmpDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_hplip_tmp_DATA)'; test -n "$(hplip_tmpdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(hplip_tmpdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(hplip_tmpdir)" && rm -f $$files install-dist_images_128x128DATA: $(dist_images_128x128_DATA) @$(NORMAL_INSTALL) test -z "$(images_128x128dir)" || $(MKDIR_P) "$(DESTDIR)$(images_128x128dir)" @@ -8606,7 +8543,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) install-binPROGRAMS: install-libLTLIBRARIES installdirs: - for dir in "$(DESTDIR)$(cupsextdir)" "$(DESTDIR)$(hpmudextdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libsane_hpaiodir)" "$(DESTDIR)$(pcardextdir)" "$(DESTDIR)$(scanextdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(hpdir)" "$(DESTDIR)$(hp_mkuridir)" "$(DESTDIR)$(hpcupsdir)" "$(DESTDIR)$(hpcupsfaxdir)" "$(DESTDIR)$(cmddir)" "$(DESTDIR)$(findir)" "$(DESTDIR)$(hpfaxdir)" "$(DESTDIR)$(hplipdir)" "$(DESTDIR)$(plugins4dir)" "$(DESTDIR)$(ripdir)" "$(DESTDIR)$(pstotiffdir)" "$(DESTDIR)$(cupsdrvdir)" "$(DESTDIR)$(cupsdrv2dir)" "$(DESTDIR)$(basedir)" "$(DESTDIR)$(copierdir)" "$(DESTDIR)$(faxdir)" "$(DESTDIR)$(fax_filtersdir)" "$(DESTDIR)$(halpredir)" "$(DESTDIR)$(homedir)" "$(DESTDIR)$(hpcupsfaxppddir)" "$(DESTDIR)$(hpijsfaxppddir)" "$(DESTDIR)$(hplip_Logdir)" "$(DESTDIR)$(hplip_statedir)" "$(DESTDIR)$(hplip_tmpdir)" "$(DESTDIR)$(images_128x128dir)" "$(DESTDIR)$(images_16x16dir)" "$(DESTDIR)$(images_24x24dir)" "$(DESTDIR)$(images_256x256dir)" "$(DESTDIR)$(images_32x32dir)" "$(DESTDIR)$(images_64x64dir)" "$(DESTDIR)$(images_devicesdir)" "$(DESTDIR)$(images_otherdir)" "$(DESTDIR)$(installdir)" "$(DESTDIR)$(ldldir)" "$(DESTDIR)$(localzdir)" "$(DESTDIR)$(modelsdir)" "$(DESTDIR)$(pcarddir)" "$(DESTDIR)$(pcldir)" "$(DESTDIR)$(pluginsdir)" "$(DESTDIR)$(policykit_dbus_etcdir)" "$(DESTDIR)$(policykit_dbus_sharedir)" "$(DESTDIR)$(policykit_policydir)" "$(DESTDIR)$(postscriptdir)" "$(DESTDIR)$(ppddir)" "$(DESTDIR)$(prntdir)" "$(DESTDIR)$(rulesdir)" "$(DESTDIR)$(rulessystemdir)" "$(DESTDIR)$(scandir)" "$(DESTDIR)$(uidir)" "$(DESTDIR)$(ui4dir)" "$(DESTDIR)$(unreldir)" "$(DESTDIR)$(www0dir)" "$(DESTDIR)$(www3dir)" "$(DESTDIR)$(www4dir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(hplip_confdir)" "$(DESTDIR)$(hplip_desktopdir)" "$(DESTDIR)$(hplip_systraydir)"; do \ + for dir in "$(DESTDIR)$(cupsextdir)" "$(DESTDIR)$(hpmudextdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libsane_hpaiodir)" "$(DESTDIR)$(pcardextdir)" "$(DESTDIR)$(scanextdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(hpdir)" "$(DESTDIR)$(hpcupsdir)" "$(DESTDIR)$(hpcupsfaxdir)" "$(DESTDIR)$(cmddir)" "$(DESTDIR)$(findir)" "$(DESTDIR)$(hpfaxdir)" "$(DESTDIR)$(hplipdir)" "$(DESTDIR)$(plugins4dir)" "$(DESTDIR)$(ripdir)" "$(DESTDIR)$(pstotiffdir)" "$(DESTDIR)$(cupsdrvdir)" "$(DESTDIR)$(cupsdrv2dir)" "$(DESTDIR)$(basedir)" "$(DESTDIR)$(copierdir)" "$(DESTDIR)$(faxdir)" "$(DESTDIR)$(fax_filtersdir)" "$(DESTDIR)$(halpredir)" "$(DESTDIR)$(homedir)" "$(DESTDIR)$(hpcupsfaxppddir)" "$(DESTDIR)$(hpijsfaxppddir)" "$(DESTDIR)$(hplip_statedir)" "$(DESTDIR)$(images_128x128dir)" "$(DESTDIR)$(images_16x16dir)" "$(DESTDIR)$(images_24x24dir)" "$(DESTDIR)$(images_256x256dir)" "$(DESTDIR)$(images_32x32dir)" "$(DESTDIR)$(images_64x64dir)" "$(DESTDIR)$(images_devicesdir)" "$(DESTDIR)$(images_otherdir)" "$(DESTDIR)$(installdir)" "$(DESTDIR)$(ldldir)" "$(DESTDIR)$(localzdir)" "$(DESTDIR)$(modelsdir)" "$(DESTDIR)$(pcarddir)" "$(DESTDIR)$(pcldir)" "$(DESTDIR)$(pluginsdir)" "$(DESTDIR)$(policykit_dbus_etcdir)" "$(DESTDIR)$(policykit_dbus_sharedir)" "$(DESTDIR)$(policykit_policydir)" "$(DESTDIR)$(postscriptdir)" "$(DESTDIR)$(ppddir)" "$(DESTDIR)$(prntdir)" "$(DESTDIR)$(rulesdir)" "$(DESTDIR)$(rulessystemdir)" "$(DESTDIR)$(scandir)" "$(DESTDIR)$(uidir)" "$(DESTDIR)$(ui4dir)" "$(DESTDIR)$(unreldir)" "$(DESTDIR)$(www0dir)" "$(DESTDIR)$(www3dir)" "$(DESTDIR)$(www4dir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(hplip_confdir)" "$(DESTDIR)$(hplip_desktopdir)" "$(DESTDIR)$(hplip_systraydir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -8637,10 +8574,10 @@ maintainer-clean-generic: clean: clean-am clean-am: clean-binPROGRAMS clean-cupsextLTLIBRARIES clean-generic \ - clean-hpPROGRAMS clean-hp_mkuriPROGRAMS clean-hpcupsPROGRAMS \ - clean-hpcupsfaxPROGRAMS clean-hpmudextLTLIBRARIES \ - clean-libLTLIBRARIES clean-libsane_hpaioLTLIBRARIES \ - clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ + clean-hpPROGRAMS clean-hpcupsPROGRAMS clean-hpcupsfaxPROGRAMS \ + clean-hpmudextLTLIBRARIES clean-libLTLIBRARIES \ + clean-libsane_hpaioLTLIBRARIES clean-libtool \ + clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ clean-pcardextLTLIBRARIES clean-scanextLTLIBRARIES \ mostlyclean-am @@ -8670,8 +8607,7 @@ install-data-am: install-cupsdrv2DATA install-cupsdrvDATA \ install-dist_finSCRIPTS install-dist_halpreDATA \ install-dist_homeDATA install-dist_hpcupsfaxppdDATA \ install-dist_hpfaxSCRIPTS install-dist_hpijsfaxppdDATA \ - install-dist_hplipSCRIPTS install-dist_hplip_LogDATA \ - install-dist_hplip_stateDATA install-dist_hplip_tmpDATA \ + install-dist_hplipSCRIPTS install-dist_hplip_stateDATA \ install-dist_images_128x128DATA install-dist_images_16x16DATA \ install-dist_images_24x24DATA install-dist_images_256x256DATA \ install-dist_images_32x32DATA install-dist_images_64x64DATA \ @@ -8689,12 +8625,12 @@ install-data-am: install-cupsdrv2DATA install-cupsdrvDATA \ install-dist_ui4DATA install-dist_uiDATA \ install-dist_unrelDATA install-dist_www0DATA \ install-dist_www3DATA install-dist_www4DATA install-docDATA \ - install-hpPROGRAMS install-hp_mkuriPROGRAMS \ - install-hpcupsPROGRAMS install-hpcupsfaxPROGRAMS \ - install-hplip_confDATA install-hplip_desktopDATA \ - install-hplip_systrayDATA install-hpmudextLTLIBRARIES \ - install-libsane_hpaioLTLIBRARIES install-pcardextLTLIBRARIES \ - install-pstotiffSCRIPTS install-scanextLTLIBRARIES + install-hpPROGRAMS install-hpcupsPROGRAMS \ + install-hpcupsfaxPROGRAMS install-hplip_confDATA \ + install-hplip_desktopDATA install-hplip_systrayDATA \ + install-hpmudextLTLIBRARIES install-libsane_hpaioLTLIBRARIES \ + install-pcardextLTLIBRARIES install-pstotiffSCRIPTS \ + install-scanextLTLIBRARIES @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-am @@ -8751,8 +8687,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsdrv2DATA \ uninstall-dist_halpreDATA uninstall-dist_homeDATA \ uninstall-dist_hpcupsfaxppdDATA uninstall-dist_hpfaxSCRIPTS \ uninstall-dist_hpijsfaxppdDATA uninstall-dist_hplipSCRIPTS \ - uninstall-dist_hplip_LogDATA uninstall-dist_hplip_stateDATA \ - uninstall-dist_hplip_tmpDATA uninstall-dist_images_128x128DATA \ + uninstall-dist_hplip_stateDATA \ + uninstall-dist_images_128x128DATA \ uninstall-dist_images_16x16DATA \ uninstall-dist_images_24x24DATA \ uninstall-dist_images_256x256DATA \ @@ -8774,11 +8710,10 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsdrv2DATA \ uninstall-dist_uiDATA uninstall-dist_unrelDATA \ uninstall-dist_www0DATA uninstall-dist_www3DATA \ uninstall-dist_www4DATA uninstall-docDATA uninstall-hpPROGRAMS \ - uninstall-hp_mkuriPROGRAMS uninstall-hpcupsPROGRAMS \ - uninstall-hpcupsfaxPROGRAMS uninstall-hplip_confDATA \ - uninstall-hplip_desktopDATA uninstall-hplip_systrayDATA \ - uninstall-hpmudextLTLIBRARIES uninstall-libLTLIBRARIES \ - uninstall-libsane_hpaioLTLIBRARIES \ + uninstall-hpcupsPROGRAMS uninstall-hpcupsfaxPROGRAMS \ + uninstall-hplip_confDATA uninstall-hplip_desktopDATA \ + uninstall-hplip_systrayDATA uninstall-hpmudextLTLIBRARIES \ + uninstall-libLTLIBRARIES uninstall-libsane_hpaioLTLIBRARIES \ uninstall-pcardextLTLIBRARIES uninstall-pstotiffSCRIPTS \ uninstall-scanextLTLIBRARIES @$(NORMAL_INSTALL) @@ -8787,10 +8722,10 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsdrv2DATA \ .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ clean-binPROGRAMS clean-cupsextLTLIBRARIES clean-generic \ - clean-hpPROGRAMS clean-hp_mkuriPROGRAMS clean-hpcupsPROGRAMS \ - clean-hpcupsfaxPROGRAMS clean-hpmudextLTLIBRARIES \ - clean-libLTLIBRARIES clean-libsane_hpaioLTLIBRARIES \ - clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ + clean-hpPROGRAMS clean-hpcupsPROGRAMS clean-hpcupsfaxPROGRAMS \ + clean-hpmudextLTLIBRARIES clean-libLTLIBRARIES \ + clean-libsane_hpaioLTLIBRARIES clean-libtool \ + clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ clean-pcardextLTLIBRARIES clean-scanextLTLIBRARIES ctags dist \ dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \ dist-xz dist-zip distcheck distclean distclean-compile \ @@ -8805,8 +8740,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsdrv2DATA \ install-dist_finSCRIPTS install-dist_halpreDATA \ install-dist_homeDATA install-dist_hpcupsfaxppdDATA \ install-dist_hpfaxSCRIPTS install-dist_hpijsfaxppdDATA \ - install-dist_hplipSCRIPTS install-dist_hplip_LogDATA \ - install-dist_hplip_stateDATA install-dist_hplip_tmpDATA \ + install-dist_hplipSCRIPTS install-dist_hplip_stateDATA \ install-dist_images_128x128DATA install-dist_images_16x16DATA \ install-dist_images_24x24DATA install-dist_images_256x256DATA \ install-dist_images_32x32DATA install-dist_images_64x64DATA \ @@ -8825,29 +8759,28 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsdrv2DATA \ install-dist_unrelDATA install-dist_www0DATA \ install-dist_www3DATA install-dist_www4DATA install-docDATA \ install-dvi install-dvi-am install-exec install-exec-am \ - install-hpPROGRAMS install-hp_mkuriPROGRAMS \ - install-hpcupsPROGRAMS install-hpcupsfaxPROGRAMS \ - install-hplip_confDATA install-hplip_desktopDATA \ - install-hplip_systrayDATA install-hpmudextLTLIBRARIES \ - install-html install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-libsane_hpaioLTLIBRARIES \ - install-man install-pcardextLTLIBRARIES install-pdf \ - install-pdf-am install-ps install-ps-am \ - install-pstotiffSCRIPTS install-scanextLTLIBRARIES \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-cupsdrv2DATA \ - uninstall-cupsdrvDATA uninstall-cupsextLTLIBRARIES \ - uninstall-dist_baseDATA uninstall-dist_cmdSCRIPTS \ - uninstall-dist_copierDATA uninstall-dist_faxDATA \ - uninstall-dist_fax_filtersDATA uninstall-dist_finSCRIPTS \ - uninstall-dist_halpreDATA uninstall-dist_homeDATA \ - uninstall-dist_hpcupsfaxppdDATA uninstall-dist_hpfaxSCRIPTS \ - uninstall-dist_hpijsfaxppdDATA uninstall-dist_hplipSCRIPTS \ - uninstall-dist_hplip_LogDATA uninstall-dist_hplip_stateDATA \ - uninstall-dist_hplip_tmpDATA uninstall-dist_images_128x128DATA \ + install-hpPROGRAMS install-hpcupsPROGRAMS \ + install-hpcupsfaxPROGRAMS install-hplip_confDATA \ + install-hplip_desktopDATA install-hplip_systrayDATA \ + install-hpmudextLTLIBRARIES install-html install-html-am \ + install-info install-info-am install-libLTLIBRARIES \ + install-libsane_hpaioLTLIBRARIES install-man \ + install-pcardextLTLIBRARIES install-pdf install-pdf-am \ + install-ps install-ps-am install-pstotiffSCRIPTS \ + install-scanextLTLIBRARIES install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-cupsdrv2DATA uninstall-cupsdrvDATA \ + uninstall-cupsextLTLIBRARIES uninstall-dist_baseDATA \ + uninstall-dist_cmdSCRIPTS uninstall-dist_copierDATA \ + uninstall-dist_faxDATA uninstall-dist_fax_filtersDATA \ + uninstall-dist_finSCRIPTS uninstall-dist_halpreDATA \ + uninstall-dist_homeDATA uninstall-dist_hpcupsfaxppdDATA \ + uninstall-dist_hpfaxSCRIPTS uninstall-dist_hpijsfaxppdDATA \ + uninstall-dist_hplipSCRIPTS uninstall-dist_hplip_stateDATA \ + uninstall-dist_images_128x128DATA \ uninstall-dist_images_16x16DATA \ uninstall-dist_images_24x24DATA \ uninstall-dist_images_256x256DATA \ @@ -8869,31 +8802,15 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsdrv2DATA \ uninstall-dist_uiDATA uninstall-dist_unrelDATA \ uninstall-dist_www0DATA uninstall-dist_www3DATA \ uninstall-dist_www4DATA uninstall-docDATA uninstall-hook \ - uninstall-hpPROGRAMS uninstall-hp_mkuriPROGRAMS \ - uninstall-hpcupsPROGRAMS uninstall-hpcupsfaxPROGRAMS \ - uninstall-hplip_confDATA uninstall-hplip_desktopDATA \ - uninstall-hplip_systrayDATA uninstall-hpmudextLTLIBRARIES \ - uninstall-libLTLIBRARIES uninstall-libsane_hpaioLTLIBRARIES \ + uninstall-hpPROGRAMS uninstall-hpcupsPROGRAMS \ + uninstall-hpcupsfaxPROGRAMS uninstall-hplip_confDATA \ + uninstall-hplip_desktopDATA uninstall-hplip_systrayDATA \ + uninstall-hpmudextLTLIBRARIES uninstall-libLTLIBRARIES \ + uninstall-libsane_hpaioLTLIBRARIES \ uninstall-pcardextLTLIBRARIES uninstall-pstotiffSCRIPTS \ uninstall-scanextLTLIBRARIES -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 775 $(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 775 $(DESTDIR)$(hplip_Logdir) - -install-dist_hplip_tmpDATA: -@FULL_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir) -@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) -@FULL_BUILD_TRUE@ chmod 0775 $(DESTDIR)$(hplip_tmpdir) -@HPLIP_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir) -@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) -@HPLIP_BUILD_TRUE@ chmod 0775 $(DESTDIR)$(hplip_tmpdir) - install-data-hook: # If scanner build, add hpaio entry to sane dll.conf. @HPLIP_BUILD_TRUE@ if [ "$(scan_build)" = "yes" ]; then \ @@ -159,15 +159,15 @@ class State(ConfigBase): class UserConfig(ConfigBase): def __init__(self): - if not os.geteuid() == 0: - prop.user_dir = os.path.expanduser('~/.hplip') - try: - if not os.path.exists(prop.user_dir): - os.makedirs(prop.user_dir) - except OSError: - pass # This is sometimes OK, if running hpfax: for example + prop.user_dir = os.path.expanduser('~/.hplip') + try: + if not os.path.exists(prop.user_dir): + os.makedirs(prop.user_dir) + except OSError: + log.error("Failed to create %s directory. User preferences and collection of debug logs can't be supported."%(prop.user_dir)) + if not os.geteuid() == 0: prop.user_config_file = os.path.join(prop.user_dir, 'hplip.conf') if not os.path.exists(prop.user_config_file): @@ -182,7 +182,6 @@ class UserConfig(ConfigBase): else: # If running as root, conf file is None - prop.user_dir = None prop.user_config_file = None ConfigBase.__init__(self, None) @@ -293,6 +292,7 @@ def cleanup_spinner(): sys.stdout.flush() + # Internal/messaging errors ERROR_STRINGS = { diff --git a/base/logger.py b/base/logger.py index f08930add..6ed22b2ff 100644 --- a/base/logger.py +++ b/base/logger.py @@ -296,7 +296,7 @@ class Logger(object): def warn(self, message): if self._level <= Logger.LOG_LEVEL_WARN: - txt = "warning: %s" % message.encode('utf-8') + txt = "warning: %s" % message self.log(self.color(txt, 'fuscia'), Logger.LOG_LEVEL_WARN) syslog.syslog(syslog.LOG_WARNING, "%s[%d]: %s" % (self.module, self.pid, txt)) @@ -322,7 +322,7 @@ class Logger(object): def error(self, message): if self._level <= Logger.LOG_LEVEL_ERROR: - txt = "error: %s" % message.encode("utf-8") + txt = "error: %s" % message self.log(self.color(txt, 'red'), Logger.LOG_LEVEL_ERROR) syslog.syslog(syslog.LOG_ALERT, "%s[%d]: %s" % (self.module, self.pid, txt)) @@ -334,7 +334,7 @@ class Logger(object): def fatal(self, message): if self._level <= Logger.LOG_LEVEL_FATAL: - txt = "fatal error: :%s" % self.module.encode('utf-8') + txt = "fatal error: :%s" % self self.log(self.color(txt, 'red'), Logger.LOG_LEVEL_DEBUG) syslog.syslog(syslog.LOG_ALERT, "%s[%d]: %s" % (self.module, self.pid, txt)) diff --git a/base/models.py b/base/models.py index c531500d9..6bdd267f6 100644 --- a/base/models.py +++ b/base/models.py @@ -108,6 +108,7 @@ TECH_CLASSES = [ "Python11", "Saipan", "PyramidPlus", + "Hbpl1", "Kapan", "MimasTDR", ] @@ -166,6 +167,7 @@ TECH_CLASS_PDLS = { "Copperhead" : 'pcl3', "Copperhead12" : 'pcl3', "Ampere" : 'pcl3', + "Hbpl1" : 'hbpl1', "Kapan" : 'pcl3', "MimasTDR" : 'pcl3' } diff --git a/base/password.py b/base/password.py index 1e6041b11..bfd244055 100644 --- a/base/password.py +++ b/base/password.py @@ -24,7 +24,7 @@ import cStringIO import time import string -from base import utils, tui +from base import utils, tui, os_utils from base.g import * import pexpect @@ -56,6 +56,19 @@ AUTH_TYPES ={'mepis':'su', } +# This function promts for the username and password and returns (username,password) +def showPasswordPrompt(prompt): + import getpass + print "" + print "" + print log.bold(prompt) + username = raw_input("Username: ") + password = getpass.getpass("Password: ") + + return (username, password) + + + #TBD this function shoud be removed once distro class implemented def get_distro_name(): os_name = None; @@ -85,6 +98,13 @@ class Password(object): self.__mode = Mode self.__readAuthType() #self.__authType self.__expectList =[] + + if not utils.to_bool(sys_conf.get('configure','qt4', '0')) and utils.to_bool(sys_conf.get('configure','qt3', '0')): + self.__ui_toolkit = 'qt3' + else: + self.__ui_toolkit = 'qt4' + + for s in utils.EXPECT_WORD_LIST: try: p = re.compile(s, re.I) @@ -100,11 +120,13 @@ class Password(object): #TBD: Getting distro name should get distro class distro_name = get_distro_name().lower() - try: - self.__authType = AUTH_TYPES[distro_name] - except KeyError: - log.warn("%s distro is not found in AUTH_TYPES"%distro_name) - self.__authType = 'su' + self.__authType = user_conf.get('authentication', 'su_sudo', '') + if self.__authType != "su" and self.__authType != "sudo": + try: + self.__authType = AUTH_TYPES[distro_name] + except KeyError: + log.warn("%s distro is not found in AUTH_TYPES"%distro_name) + self.__authType = 'su' def __getPasswordDisplayString(self): if self.__authType == "su": @@ -118,6 +140,7 @@ class Password(object): self.__authType = "su" else: self.__authType = "sudo" + user_conf.set('authentication', 'su_sudo', self.__authType) def __get_password(self,pswd_msg=''): @@ -131,19 +154,20 @@ class Password(object): - def __get_password_ui(self,pswd_msg='', qt="qt4"): + def __get_password_ui(self,pswd_msg='', user ="root"): if pswd_msg == '': pswd_msg = "Your HP Device requires to install HP proprietary plugin\nPlease enter root/superuser password to continue" - #TBD: currently takes only username as root, need to handle for other users also. - if qt == "qt4": - from ui4.setupdialog import showPasswordUI - username, password = showPasswordUI(pswd_msg, "root", False) - - if qt == "qt3": + if self.__ui_toolkit == "qt3": from ui.setupform import showPasswordUI - username, password = showPasswordUI(pswd_msg, "root", False) + username, password = showPasswordUI(pswd_msg, user, False) + else: #self.__ui_toolkit == "qt4" --> default qt4 + from ui4.setupdialog import showPasswordUI + username, password = showPasswordUI(pswd_msg, user, False) + if username == "" and password == "": + raise Exception("User Cancel") + return password @@ -201,21 +225,14 @@ class Password(object): def __validatePassword(self ,pswd_msg): x = 1 - qt = "" while True: if self.__mode == INTERACTIVE_MODE: self.__password = self.__get_password(pswd_msg) else: if self.getAuthType() == 'su': - if not utils.to_bool(sys_conf.get('configure', 'qt4', '0')) and utils.to_bool(sys_conf.get('configure', 'qt3', '0')) : - qt = "qt3" #ifqt4 is enabled, gives more preferrence to qt4. - else: - qt = "qt4" - - self.__password = self.__get_password_ui(pswd_msg, qt) + self.__password = self.__get_password_ui(pswd_msg, "root") else: - # Other password utils (i.e. kdesu, gnomesu, gksu) just validates the password but won't return password. - break + self.__password = self.__get_password_ui(pswd_msg, os.getenv("USER")) cmd = self.getAuthCmd() % "true" log.debug(cmd) @@ -223,23 +240,30 @@ class Password(object): status, output = self.__password_check(cmd) log.debug("status = %s output=%s "%(status,output)) + if self.__mode == GUI_MODE: + if self.__ui_toolkit == "qt4": + from ui4.setupdialog import FailureMessageUI + if self.__ui_toolkit == "qt3": + from ui.setupform import FailureMessageUI + + if status == 0: self.__passwordValidated = True break elif "not in the sudoers file" in output: - log.error("User is not in the sudoers file.") - break - #TBD.. IF user dosn't have sudo permissions, needs to change to "su" type and query for password -# self.__changeAuthType() + #TBD.. IF user doesn't have sudo permissions, needs to change to "su" type and query for password + self.__changeAuthType() + msg = "User doesn't have sudo permissions.\nChanging Authentication Type. Try again." + if self.__mode == GUI_MODE: + FailureMessageUI(msg) + else: + log.error(msg) + raise Exception("User is not in the sudoers file.") + else: self.__password = "" x += 1 if self.__mode == GUI_MODE: - if qt == "qt4": - from ui4.setupdialog import FailureMessageUI - if qt == "qt3": - from ui.setupform import FailureMessageUI - if x > PASSWORD_RETRY_COUNT: FailureMessageUI("Password incorrect. ") return @@ -264,11 +288,13 @@ class Password(object): def __get_password_utils_ui(self): distro_name = get_distro_name().lower() - if distro_name == 'rhel': + if self.__authType == "sudo": + AuthType, AuthCmd = 'sudo', 'sudo %s' + elif distro_name == 'rhel': AuthType, AuthCmd = 'su', 'su -c "%s"' else: AuthType, AuthCmd = 'su', 'su - -c "%s"' - + ''' if utils.which('kdesu'): AuthType, AuthCmd = 'kdesu', 'kdesu -- %s' elif utils.which('kdesudo'): @@ -277,9 +303,8 @@ class Password(object): AuthType, AuthCmd = 'gnomesu', 'gnomesu -c "%s"' elif utils.which('gksu'): AuthType, AuthCmd = 'gksu' , 'gksu "%s"' - -#Uncomment ::: For testing -# AuthType, AuthCmd = 'su' ,'su - -c "%s"' + ''' + return AuthType, AuthCmd @@ -290,7 +315,7 @@ class Password(object): self.__password ="" self.__passwordValidated = False if self.__authType == 'sudo': - utils.run("sudo -K") + os_utils.execute("sudo -K") def getAuthType(self): diff --git a/base/pkit.py b/base/pkit.py index 0acc1247f..37a72c6e2 100644 --- a/base/pkit.py +++ b/base/pkit.py @@ -176,15 +176,10 @@ class PolicyKitService(dbus.service.Object): "/org/freedesktop/PolicyKit1/Authority", "org.freedesktop.PolicyKit1.Authority") policy_kit = dbus.Interface(obj, "org.freedesktop.PolicyKit1.Authority") - info = dbus.Interface(connection.get_object("org.freedesktop.DBus", - "/org/freedesktop/DBus/Bus", - False), - "org.freedesktop.DBus") - pid = info.GetConnectionUnixProcessID(sender) - + subject = ( - 'unix-process', - { 'pid' : dbus.UInt32(pid, variant_level = 1) } + 'system-bus-name', + { 'name' : dbus.String(sender, variant_level = 1) } ) details = { '' : '' } flags = dbus.UInt32(1) # AllowUserInteraction = 0x00000001 @@ -198,6 +193,7 @@ class PolicyKitService(dbus.service.Object): cancel_id) if not ok: log.error("Session not authorized by PolicyKit version 1") + raise AccessDeniedException("Session not authorized by PolicyKit") return ok diff --git a/base/queues.py b/base/queues.py index 10ec5e7b0..c19e3883f 100755 --- a/base/queues.py +++ b/base/queues.py @@ -66,49 +66,6 @@ class DetectedDevice: ##### METHODS ##### -# Checks 'lp' group is added o not -def check_user_groups(): - result = False - sts,output = utils.run('groups') - if sts != 0: - log.error("Failed to get groups") - else: - output = output.rstrip('\r\n') - log.debug("groups =%s "%output) - grp_list= output.split(' ') - cnt = 0 - while cnt < len(grp_list) : - if grp_list[cnt] == 'lp': - result = True - break - cnt += 1 - - return result - -# This function adds the groups ('lp') to user -def add_group(core, mode, passwordObj): - result = False - add_user_to_group = core.get_distro_ver_data('add_user_to_group', '') - if add_user_to_group: - usermod = os.path.join(utils.which("usermod"), "usermod") + " %s %s" % (add_user_to_group, prop.username) - else: - usermod = os.path.join(utils.which("usermod"), "usermod") + " %s -a %s" % ("-Glp", prop.username) - - if passwordObj == None: - passwordObj = password.Password(mode) - - cmd =passwordObj.getAuthCmd() % usermod - log.info("cmd = %s" %cmd) - - pswd_msg = "Enter root/superuser password to add 'lp' group" - sts, output = utils.run(cmd, passwordObj, pswd_msg) - if sts == 0: - result = True - - return result - - - #Add Printer info to dictionary def addToDeviceList(Key, printer_name, device_uri,back_end, ppd_fileType,PPDFileError, Is_Print_Q_Enabled): if ppd_fileType != None: @@ -264,12 +221,16 @@ def reconfigure_Queue(que, mode, dialog= None,app=None): log.debug("User Exit") sys.exit(1) elif value == True: - cups.delPrinter(que.PrinterName) - log.info("' %s' removed successfully.\nRe-configuring this printer by hp-setup..."%que.PrinterName) - path = utils.which('hp-setup') - if path: - cmd = 'hp-setup -i' - os_utils.execute(cmd) + status, status_str = cups.cups_operation(cups.delPrinter, INTERACTIVE_MODE, '', None, que.PrinterName) + + if status != cups.IPP_OK: + log.error("Failed to remove '%s' queue.\nRemove using hp-toolbox."%que.PrinterName) + else: + log.info("' %s' removed successfully.\nRe-configuring this printer by hp-setup..."%que.PrinterName) + if utils.which('hp-setup'): + cmd = 'hp-setup -i' + os_utils.execute(cmd) + elif que.IsEnabled == False: Error_Found = True responce, value =tui.enter_yes_no("'%s Queue is paused. Do you want to enable queue?"%(que.PrinterName)) @@ -340,7 +301,7 @@ def parseDeviceURI(device_uri): return back_end, is_hp, bus, model, serial, dev_file, host, zc, port -def main_function(passwordObj = None, mode = GUI_MODE, ui_toolkit= UI_TOOLKIT_QT4, quiet_mode = False, check_grps= False,DEVICE_URI=None): +def main_function(passwordObj = None, mode = GUI_MODE, ui_toolkit= UI_TOOLKIT_QT4, quiet_mode = False, DEVICE_URI=None): global Error_Found try: from base import device, pml @@ -350,14 +311,13 @@ def main_function(passwordObj = None, mode = GUI_MODE, ui_toolkit= UI_TOOLKIT_QT sys.exit(1) if mode == INTERACTIVE_MODE: - if check_grps and check_user_groups() is False: - core = core_install.CoreInstall(core_install.MODE_CHECK) - core.init() - if add_group(core, mode, passwordObj) is False: - Error_Found = True - log.error("Failed to add lp group to user[%s]. Manually add 'lp' group to usergroups. And reboot system."%prop.username) - else: - log.info("Groups added successfully and reboot is required. Please reboot system to take effect.") + try: + from base import password + except ImportError: + log.warn("Failed to import password object") + else: + cups.setPasswordCallback(password.showPasswordPrompt) + mapofDevices = parseQueues(mode) if mapofDevices.items() == 0: log.debug("No queues found.") @@ -384,9 +344,10 @@ def main_function(passwordObj = None, mode = GUI_MODE, ui_toolkit= UI_TOOLKIT_QT if len(mapofDevices) == 0: log.warn("No Queue(s) configured.") else: -# log.info(log.green("Queue(s) configured correctly using HPLIP.")) log.info("Queue(s) configured correctly using HPLIP.") + cups.releaseCupsInstance() + elif mode == GUI_MODE: # Only Qt4 is supported. if ui_toolkit == 'qt3': @@ -396,20 +357,14 @@ def main_function(passwordObj = None, mode = GUI_MODE, ui_toolkit= UI_TOOLKIT_QT try: from PyQt4.QtGui import QApplication, QMessageBox from ui4.queuesconf import QueuesDiagnose + from ui4 import setupdialog except ImportError: log.error("Unable to load Qt4 support. Is it installed?") sys.exit(1) app = QApplication(sys.argv) dialog = QueuesDiagnose(None, "","",QUEUES_MSG_SENDING,passwordObj) - if check_grps and check_user_groups() is False: - core = core_install.CoreInstall(core_install.MODE_CHECK) - core.init() - if add_group(core, mode, passwordObj) is False: - Error_Found = True - dialog.showMessage("User must be part of 'lp' group.\nManually add 'lp' group to '%s' user. " %prop.username) - else: - dialog.showSuccessMessage("Groups added successfully and reboot is required. Please reboot system to take effect.") + cups.setPasswordCallback(setupdialog.showPasswordUI) mapofDevices = parseQueues(mode) if mapofDevices.items() == 0: log.debug("No queues found.") @@ -421,12 +376,12 @@ def main_function(passwordObj = None, mode = GUI_MODE, ui_toolkit= UI_TOOLKIT_QT Error_Found = True dialog.showMessage("%d queues of same device %s is configured.\nRemove unwanted queues."%(len(val),val[0].PrinterName)) for que in val: - reconfigure_Queue(que, mode,dialog,app) + reconfigure_Queue(que, mode, dialog,app) else: log.debug("") log.debug("Single print queue is configured for '%s'. " %val[0].PrinterName) - reconfigure_Queue(val[0], mode,dialog, app) + reconfigure_Queue(val[0], mode, dialog, app) SI_sts = smart_install.disable(mode, ui_toolkit, dialog, app, passwordObj) if SI_sts != smart_install.SIH_NO_SI_DEVICES: @@ -439,3 +394,5 @@ def main_function(passwordObj = None, mode = GUI_MODE, ui_toolkit= UI_TOOLKIT_QT else: msg= "Queue(s) configured correctly using HPLIP." dialog.showSuccessMessage(msg) + + cups.releaseCupsInstance() diff --git a/base/services.py b/base/services.py index 332601353..952b7f6a9 100644 --- a/base/services.py +++ b/base/services.py @@ -76,7 +76,7 @@ def restart(passwordObj): if shutdown and passwordObj: cmd = "%s -r now" % (os.path.join(shutdown, "shutdown")) cmd = passwordObj.getAuthCmd() % cmd - status, output = utils.run(cmd, passwordObj) + status, output = utils.run(cmd, passwordObj, "Need authentication to restart system") ok = (status == 0) return ok @@ -89,7 +89,7 @@ def run_open_mdns_port(core, passwordObj, callback=None): x = 1 for cmd in open_mdns_port_cmd: cmd = passwordObj.getAuthCmd() % cmd - status, output = utils.run(cmd, passwordObj) + status, output = utils.run(cmd, passwordObj,"Need authentication to open mdns port [%s]"%cmd) if status != 0: log.warn("An error occurred running '%s'" % cmd) @@ -126,7 +126,7 @@ def run_hp_tools_with_auth(cmd, passwordObj): hpCommand = passwordObj.getAuthCmd() % hpCommand log.debug(hpCommand) - status, output = utils.run(hpCommand, passwordObj) + status, output = utils.run(hpCommand, passwordObj, "Need authentication to run %s command"%cmd) return status == 0 else: log.error("Command not found or password object is not valid") @@ -148,12 +148,12 @@ def start_service( service_name, passwordObj): if utils.which('systemctl'): cmd_status = passwordObj.getAuthCmd()%("systemctl status %s.service"%service_name) log.debug(cmd_status) - sts,out = utils.run(cmd_status, passwordObj) + sts,out = utils.run(cmd_status, passwordObj, "Need authentication to get %s service status"%service_name) if sts ==0: if 'stop' in out or 'inactive' in out: cmd_start = passwordObj.getAuthCmd()%("systemctl start %s.service"%service_name) log.debug("cmd_start=%s"%cmd_start) - sts,out = utils.run(cmd_start, passwordObj) + sts,out = utils.run(cmd_start, passwordObj, "Need authentication to start/restart %s service"%service_name) if sts ==0: ret_Val = True else: @@ -164,12 +164,12 @@ def start_service( service_name, passwordObj): elif utils.which('service'): cmd_status = passwordObj.getAuthCmd()%("service %s status"%service_name) log.debug(cmd_status) - sts,out = utils.run(cmd_status, passwordObj) + sts,out = utils.run(cmd_status, passwordObj, "Need authentication to get %s service status"%service_name) if sts ==0: if 'stop' in out or 'inactive' in out: cmd_start = passwordObj.getAuthCmd()%("service %s start"%service_name) log.debug("cmd_start=%s"%cmd_start) - sts,out = utils.run(cmd_start, passwordObj) + sts,out = utils.run(cmd_start, passwordObj,"Need authentication to start/restart %s service"%service_name) if sts ==0: ret_Val = True elif 'unrecognized service' in out: @@ -182,12 +182,12 @@ def start_service( service_name, passwordObj): elif os.path.exists('/etc/init.d/%s'%service_name): cmd_status = passwordObj.getAuthCmd()%('/etc/init.d/%s status'%service_name) log.debug(cmd_status) - sts,out = utils.run(cmd_status, passwordObj) + sts,out = utils.run(cmd_status, passwordObj, "Need authentication to get %s service status"%service_name) if sts ==0: if 'stop' in out or 'inactive' in out: cmd_start = passwordObj.getAuthCmd()%('/etc/init.d/%s start'%service_name) log.debug("cmd_start=%s"%cmd_start) - sts,out = utils.run(cmd_start, passwordObj) + sts,out = utils.run(cmd_start, passwordObj, "Need authentication to start/restart %s service"%service_name) if sts ==0: ret_Val = True else: @@ -197,7 +197,7 @@ def start_service( service_name, passwordObj): else: if service_name == 'cups': cmd = 'lpstat -r' - sts,out = utils.run(cmd, passwordObj) + sts,out = utils.run(cmd, passwordObj, "Need authentication to get %s service status"%service_name) if sts ==0 and 'is running' in out: ret_Val = True else: diff --git a/base/utils.py b/base/utils.py index 106929df7..205c175bb 100644 --- a/base/utils.py +++ b/base/utils.py @@ -713,6 +713,7 @@ def checkPyQtImport(): # qt3 # PyQt try: import qt + import ui except ImportError: if os.getenv('DISPLAY') and os.getenv('STARTED_FROM_MENU'): no_qt_message_gtk() @@ -762,7 +763,9 @@ def checkPyQtImport(): # qt3 def checkPyQtImport4(): try: import PyQt4 + import ui4 except ImportError: + log.error("HPLIP is not installed properly or is installed without graphical support. Please reinstall HPLIP") return False else: return True @@ -1967,7 +1970,7 @@ def download_from_network(weburl, outputFile = None, useURLLIB=False): return False, "" if not os.path.exists(outputFile): - log.error("Failed to get hplip version/ %s file not found."%hplip_version_file) + log.error("Failed to download %s file."%outputFile) return False, "" return True, outputFile diff --git a/check-plugin.py b/check-plugin.py index dc870b489..7c959cea2 100755 --- a/check-plugin.py +++ b/check-plugin.py @@ -45,7 +45,7 @@ from installer import pluginhandler username = "" device_uri = "" printer_name = "" -LOG_FILE = "/var/log/hp/hplip_ac.log" +LOG_FILE = "%s/hplip_ac.log"%prop.user_dir DBUS_SERVICE='com.hplip.StatusService' ##### METHODS ##### @@ -234,15 +234,6 @@ if os.path.exists(LOG_FILE): log.set_logfile(LOG_FILE) log.set_where(log.LOG_TO_CONSOLE_AND_FILE) -cmd="chmod 664 "+LOG_FILE -sts,output = utils.run(cmd) -if sts != 0: - log.debug("Failed to change log file permissions: %s" %output) - -cmd="chgrp lp "+LOG_FILE -sts,output = utils.run(cmd) -if sts != 0: - log.debug("Failed to change log file group permissions: %s" %output) log.debug(" hp-check-plugin started") @@ -182,7 +182,7 @@ class DependenciesCheck(CoreInstall): self.num_errors = 0 self.num_warns = 0 - self.missing_user_grps = '' +# self.missing_user_grps = '' self.disable_selinux = False self.req_deps_to_be_installed = [] self.opt_deps_to_be_installed =[] @@ -275,8 +275,8 @@ class DependenciesCheck(CoreInstall): return self.comm_error_devices - def get_missing_user_grps(self): - return self.missing_user_grps +# def get_missing_user_grps(self): +# return self.missing_user_grps def get_user_grp_cmd(self): @@ -295,7 +295,6 @@ class DependenciesCheck(CoreInstall): ############ Variables ####################### cups_ddk_not_req = False hpmudext_avail = False - add_user_to_group = None ui_toolkit = sys_conf.get('configure','ui-toolkit') org_log_location = log.get_where() @@ -648,15 +647,14 @@ class DependenciesCheck(CoreInstall): log.warn("No queues found.") tui.header("PERMISSION") - sts,avl_grps_out =utils.run('groups') - self.user_grps_cmd = self.get_distro_ver_data('add_user_to_group', '',supported_distro_vrs) - sts, out = utils.check_user_groups(self.user_grps_cmd, avl_grps_out) - if sts: - log.info("%-15s %-30s %-15s %-8s %-8s %-8s %s"%("groups", "user-groups","Required", "-","-", "OK",avl_grps_out)) - else: - log.info(log.red("error: %-8s %-30s %-15s %-8s %-8s %-8s %s"%("groups", "user-groups", "Required","-", "-", "MISSING", out))) - self.num_errors += 1 - self.missing_user_grps = out +# sts,avl_grps_out =utils.run('groups') +# sts, out = utils.check_user_groups(self.user_grps_cmd, avl_grps_out) +# if sts: +# log.info("%-15s %-30s %-15s %-8s %-8s %-8s %s"%("groups", "user-groups","Required", "-","-", "OK",avl_grps_out)) +# else: +# log.info(log.red("error: %-8s %-30s %-15s %-8s %-8s %-8s %s"%("groups", "user-groups", "Required","-", "-", "MISSING", out))) +# self.num_errors += 1 +# self.missing_user_grps = out if hpmudext_avail: lsusb = utils.which('lsusb') @@ -799,11 +797,11 @@ class DependenciesCheck(CoreInstall): log.info(log.bold('-'*len("SELINUX"))) log.error("SELINUX need to be disabled") - if self.missing_user_grps: - log.info("") - log.info(log.bold("USER GROUPS")) - log.info(log.bold('-'*len("USER GROUPS"))) - log.error("%s groups need to be added for %s user"%(self.missing_user_grps,prop.username)) +# if self.missing_user_grps: +# log.info("") +# log.info(log.bold("USER GROUPS")) +# log.info(log.bold('-'*len("USER GROUPS"))) +# log.error("%s groups need to be added for %s user"%(self.missing_user_grps,prop.username)) if self.smart_install_devices: log.info("") @@ -818,7 +816,8 @@ class DependenciesCheck(CoreInstall): log.info("Total Errors: %d" % self.num_errors) log.info("Total Warnings: %d" % self.num_warns) log.info() - if self.disable_selinux or self.missing_user_grps or (self.plugin_status == PLUGIN_VERSION_MISMATCH) or (self.plugin_status == PLUGIN_NOT_INSTALLED) or len(self.req_deps_to_be_installed) or len(self.opt_deps_to_be_installed): +# if self.disable_selinux or self.missing_user_grps or (self.plugin_status == PLUGIN_VERSION_MISMATCH) or (self.plugin_status == PLUGIN_NOT_INSTALLED) or len(self.req_deps_to_be_installed) or len(self.opt_deps_to_be_installed): + if self.disable_selinux or (self.plugin_status == PLUGIN_VERSION_MISMATCH) or (self.plugin_status == PLUGIN_NOT_INSTALLED) or len(self.req_deps_to_be_installed) or len(self.opt_deps_to_be_installed): log.info("Run 'hp-doctor' command to prompt and fix the issues. ") @@ -879,7 +878,11 @@ if __name__ == "__main__": log.info(log.bold("Saving output in log file: %s" % log_file)) if os.path.exists(log_file): - os.remove(log_file) + try: + os.remove(log_file) + except OSError: + log.info("Failed to remove %s file"%log_file) + pass log.set_logfile(log_file) if not is_quiet_mode: diff --git a/common/utils.c b/common/utils.c index d3a2fbdbb..c8f8b10c8 100644 --- a/common/utils.c +++ b/common/utils.c @@ -3,6 +3,7 @@ #include <dlfcn.h> #include <sys/stat.h> #include <errno.h> +#include <stdlib.h> extern int errno; @@ -221,10 +222,7 @@ void unload_library(void *pLibHandler) int createTempFile(char* szFileName, FILE** pFilePtr) { - char* pFilePos = NULL; - char szFolderName[64]={0,}; - struct stat st; - int iFD; + int iFD = -1; if (szFileName == NULL || szFileName[0] == '\0' || pFilePtr == NULL) { @@ -235,26 +233,14 @@ int createTempFile(char* szFileName, FILE** pFilePtr) if (strstr(szFileName,"XXXXXX") == NULL) strcat(szFileName,"_XXXXXX"); - pFilePos = strrchr(szFileName, '/'); - if (pFilePos) + iFD = mkstemp(szFileName); + if(-1 == iFD) { - strncpy(szFolderName, szFileName, (pFilePos - szFileName)); - if(stat(szFolderName,&st) == 0) - { - if(st.st_mode & S_IFDIR != 0) - { - iFD = mkstemp(szFileName); - *pFilePtr = fdopen(iFD,"w+"); - } - else - BUG("Insufficient directory [%s] permissions\n",szFolderName); - } - else - BUG("Failed to check directory [%s] errno[%d]\n",szFolderName, errno); + BUG("Failed to create the temp file Name[%s] errno[%d : %s]\n",szFileName,errno,strerror(errno)); + return 0; } else { - iFD = mkstemp(szFileName); *pFilePtr = fdopen(iFD,"w+"); } diff --git a/common/utils.h b/common/utils.h index 2cd6a541a..89d9700e8 100644 --- a/common/utils.h +++ b/common/utils.h @@ -20,6 +20,7 @@ #define SCAN_PLUGIN_SOAPHT "bb_soapht.so" #define HPLIP_PLUGIN_STATE "/var/lib/hp/hplip.state" +#define CUPS_TMP_DIR getenv("TMPDIR") ? : getenv("HOME") ?:"/tmp" enum UTILS_CONF_RESULT { diff --git a/config_usb_printer.py b/config_usb_printer.py index 0b0ded9dc..368c0655d 100755 --- a/config_usb_printer.py +++ b/config_usb_printer.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- # # (c) Copyright 2011-2014 Hewlett-Packard Development Company, L.P. @@ -23,7 +23,7 @@ __version__ = '1.1' __title__ = 'HP device setup using USB' __mod__ = 'hp-config_usb_printer' -__doc__ = "Detects HP printers connected using USB and installs HPLIP printers and faxes in the CUPS spooler. Tries to automatically determine the correct PPD file to use." +__doc__ = "Udev invokes this tool. Tool configures the USB connected devices (if not configured), detects the plugin, queues issues and notifies to logged-in user." # Std Lib import sys @@ -35,7 +35,7 @@ import time # Local from base.g import * -from base import device,utils, tui, models,module, services +from base import device,utils, tui, models,module, services, os_utils from prnt import cups from installer import pluginhandler @@ -48,40 +48,44 @@ DBUS_AVIALABLE=False ##### METHODS ##### -# Returns already existing print queues for this printer. -def get_already_added_queues(udev_MDL, udev_serial_no, udev_back_end,remove_non_hp_config): - status, output = utils.run('lpstat -v') +# remove queues using cups API +def remove_queues(arg_queues_list): + for queue_name in arg_queues_list: + cups.delPrinter(queue_name) + - same_printer_queues = [] +#Function: get_queues +# Returns the HP, Non HP configured queuese list for a given device serial No and backend +def get_queues(arg_serial_no, arg_back_end): + status, output = utils.run('lpstat -v') + hp_conf_queues = [] + non_hp_conf_queues = [] for p in output.splitlines(): try: match = LPSTAT_PAT.search(p) printer_name = match.group(1) device_uri = match.group(2) - if device_uri.startswith("cups-pdf:/"): - continue - if not USB_PATTERN.search(device_uri): - continue + if device_uri.startswith("cups-pdf:/") or not USB_PATTERN.search(device_uri): + continue back_end = BACK_END_PATTERN.search(device_uri).group(1) serial = USB_PATTERN.search(device_uri).group(1) if USB_SERIAL_INTERFACE.search(serial): serial = USB_SERIAL_INTERFACE.search(serial).group(1) - log.debug("udev_serial_no[%s] serial[%s] udev_back_end[%s] back_end[%s]"%(udev_serial_no, serial, udev_back_end, back_end)) - if udev_serial_no == serial and (udev_back_end == back_end or back_end == 'usb'): - if remove_non_hp_config and printer_name.find('_') == -1 and printer_name.find('-') != -1: - log.debug("Removed %s Queue"%printer_name) - # remove queues using cups API - cups.delPrinter(printer_name) + log.debug("arg_serial_no[%s] serial[%s] arg_back_end[%s] back_end[%s]"%(arg_serial_no, serial, arg_back_end, back_end)) + if arg_serial_no == serial and (arg_back_end == back_end or back_end == 'usb'): + if printer_name.find('_') == -1 and printer_name.find('-') != -1: + non_hp_conf_queues.append(printer_name) else: - same_printer_queues.append(printer_name) + hp_conf_queues.append(printer_name) except AttributeError: pass - log.debug(same_printer_queues) - return same_printer_queues + log.debug( "serial No [%s] HP Configured Queues [%s] Non HP Configured Queues [%s]"%(arg_serial_no, hp_conf_queues,non_hp_conf_queues)) + return hp_conf_queues, non_hp_conf_queues + def check_cups_process(): cups_running_sts = False @@ -158,7 +162,7 @@ USAGE = [ (__doc__, "", "name", True), mod = module.Module(__mod__, __title__, __version__, __doc__, USAGE, (INTERACTIVE_MODE,), None, run_as_root_ok=True, quiet=True) opts, device_uri, printer_name, mode, ui_toolkit, loc = mod.parseStdOpts('gh',['time-out=', 'timeout='],handle_device_printer=False) -LOG_FILE = "/var/log/hp/hplip_config_usb_printer.log" +LOG_FILE = "%s/hplip_config_usb_printer.log"%prop.user_dir if os.path.exists(LOG_FILE): try: os.remove(LOG_FILE) @@ -167,15 +171,6 @@ if os.path.exists(LOG_FILE): log.set_logfile(LOG_FILE) log.set_where(log.LOG_TO_CONSOLE_AND_FILE) -cmd="chmod 664 "+LOG_FILE -sts,output = utils.run(cmd) -if sts != 0: - log.debug("Failed to change log file permissions: %s" %output) - -cmd="chgrp lp "+LOG_FILE -sts,output = utils.run(cmd) -if sts != 0: - log.debug("Failed to change log file group permissions: %s" %output) try: import dbus @@ -224,16 +219,17 @@ try: # ******************************* RUNNING HP-SETUP, IF QUEUE IS NOT ADDED time.sleep(1) norm_model = models.normalizeModelName(model).lower() - remove_non_hp_config =True if not mq.get('fax-type', FAX_TYPE_NONE) in (FAX_TYPE_NONE, FAX_TYPE_NOT_SUPPORTED): - fax_config_list = get_already_added_queues(norm_model, serial, 'hpfax',remove_non_hp_config) + fax_queues_list, fax_config_list_non_hp_conf = get_queues(serial, 'hpfax') + remove_queues(fax_config_list_non_hp_conf) - printer_config_list = get_already_added_queues(norm_model, serial, back_end, remove_non_hp_config) - if len(printer_config_list) ==0: + print_queues_list, print_queues_list_non_hp_conf = get_queues(serial, back_end) + remove_queues(print_queues_list_non_hp_conf) # Removing Queues which are not configured by HPLIP + if len(print_queues_list) ==0: if "SMART_INSTALL_ENABLED" not in device_uri: cmd ="hp-setup -i -x -a -q %s"%param log.debug("%s"%cmd) - utils.run(cmd) + os_utils.execute(cmd) if start_systray(): if "SMART_INSTALL_ENABLED" in device_uri: @@ -272,8 +268,12 @@ try: i =0 while i <12: time.sleep(2) - get_already_added_queues(norm_model, serial, 'hpfax',remove_non_hp_config) - get_already_added_queues(norm_model, serial, 'hp',remove_non_hp_config) + fax_queues_list, fax_queues_list_non_hp_conf = get_queues(serial, 'hpfax') + remove_queues(fax_queues_list_non_hp_conf) # Removing Queues which are not configured by HPLIP + + print_queues_list, print_queues_list_non_hp_conf = get_queues(serial, 'hp') + remove_queues(print_queues_list_non_hp_conf) # Removing Queues which are not configured by HPLIP + if i == 0: send_message( device_uri, printer_name, EVENT_DIAGNOSE_PRINTQUEUE, username, job_id,"") i += 1 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.13.9. +# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.13.11. # -# Report bugs to <3.13.9>. +# Report bugs to <3.13.11>. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -246,7 +246,7 @@ fi $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and 3.13.9 about your + $as_echo "$0: Please tell bug-autoconf@gnu.org and 3.13.11 about your $0: system, including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." @@ -569,9 +569,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='HP Linux Imaging and Printing' PACKAGE_TARNAME='hplip' -PACKAGE_VERSION='3.13.9' -PACKAGE_STRING='HP Linux Imaging and Printing 3.13.9' -PACKAGE_BUGREPORT='3.13.9' +PACKAGE_VERSION='3.13.11' +PACKAGE_STRING='HP Linux Imaging and Printing 3.13.11' +PACKAGE_BUGREPORT='3.13.11' PACKAGE_URL='' # Factoring default headers for most tests. @@ -662,6 +662,7 @@ gui_build pp_build network_build drvdir +hphtmldir hpdocdir hpppddir cupsfilterdir @@ -672,6 +673,7 @@ mimedir abs_mimedir abs_drvdir abs_ppddir +abs_htmldir abs_docdir abs_hpppddir abs_sbindir @@ -893,6 +895,7 @@ with_systraydir with_hpppddir with_mimedir with_docdir +with_htmldir enable_foomatic_ppd_install with_drvdir enable_foomatic_drv_install @@ -1465,7 +1468,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures HP Linux Imaging and Printing 3.13.9 to adapt to many kinds of systems. +\`configure' configures HP Linux Imaging and Printing 3.13.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1535,7 +1538,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.13.9:";; + short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.13.11:";; esac cat <<\_ACEOF @@ -1600,6 +1603,8 @@ Optional Packages: --with-mimedir=DIR set cups mime.types location [default=abs_mimedir] --with-docdir=DIR set hplip documentation directory [default=datadir/doc] + --with-htmldir=DIR set hplip html documentation directory + [default=datadir/doc] --with-drvdir=DIR set cups drv install directory [default=datadir/cups/drv/hp] @@ -1629,7 +1634,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <3.13.9>. +Report bugs to <3.13.11>. _ACEOF ac_status=$? fi @@ -1692,7 +1697,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HP Linux Imaging and Printing configure 3.13.9 +HP Linux Imaging and Printing configure 3.13.11 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2158,9 +2163,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## --------------------- ## -## Report this to 3.13.9 ## -## --------------------- ##" +( $as_echo "## ---------------------- ## +## Report this to 3.13.11 ## +## ---------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -2236,7 +2241,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by HP Linux Imaging and Printing $as_me 3.13.9, which was +It was created by HP Linux Imaging and Printing $as_me 3.13.11, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3052,7 +3057,7 @@ fi # Define the identity of the package. PACKAGE='hplip' - VERSION='3.13.9' + VERSION='3.13.11' cat >>confdefs.h <<_ACEOF @@ -16257,6 +16262,14 @@ else fi + +# Check whether --with-htmldir was given. +if test "${with_htmldir+set}" = set; then : + withval=$with_htmldir; hphtmldir=$withval +else + hphtmldir="$datadir/doc/hplip-$VERSION" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for foomatic ppd install" >&5 $as_echo_n "checking for foomatic ppd install... " >&6; } # Check whether --enable-foomatic_ppd_install was given. @@ -17479,6 +17492,17 @@ fi test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE + + prefix_NONE= + exec_prefix_NONE= + test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix + eval ac_define_dir="\"$hphtmldir\"" + eval ac_define_dir="\"$ac_define_dir\"" + abs_htmldir="$ac_define_dir" + test "$prefix_NONE" && prefix=NONE + test "$exec_prefix_NONE" && exec_prefix=NONE + abs_ppddir=${abs_hpppddir%/*} prefix_NONE= @@ -17556,6 +17580,8 @@ abs_ppddir=${abs_hpppddir%/*} + + ac_config_files="$ac_config_files Makefile hplip.conf hplip.desktop hplip-systray.desktop prnt/drv/hpijs.drv prnt/drv/hpcups.drv hplip.list data/policykit/com.hp.hplip.service" cat >confcache <<\_ACEOF @@ -18237,7 +18263,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by HP Linux Imaging and Printing $as_me 3.13.9, which was +This file was extended by HP Linux Imaging and Printing $as_me 3.13.11, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18288,13 +18314,13 @@ $config_files Configuration commands: $config_commands -Report bugs to <3.13.9>." +Report bugs to <3.13.11>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -HP Linux Imaging and Printing config.status 3.13.9 +HP Linux Imaging and Printing config.status 3.13.11 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index e97522ced..783f51ec9 100755 --- a/configure.in +++ b/configure.in @@ -26,7 +26,7 @@ # 104 = no libdl #AC_PREREQ(2.59) -AC_INIT([HP Linux Imaging and Printing], [3.13.9], [3.13.9], [hplip]) +AC_INIT([HP Linux Imaging and Printing], [3.13.11], [3.13.11], [hplip]) #AM_INIT_AUTOMAKE([1.9 foreign]) AM_INIT_AUTOMAKE AC_DISABLE_STATIC @@ -350,6 +350,8 @@ AC_ARG_WITH(mimedir, AC_HELP_STRING([--with-mimedir=DIR], [set cups mime.types l AC_ARG_WITH(docdir, AC_HELP_STRING([--with-docdir=DIR], [set hplip documentation directory [default=datadir/doc]]), hpdocdir=$withval, hpdocdir="$datadir/doc/hplip-$VERSION") +AC_ARG_WITH(htmldir, AC_HELP_STRING([--with-htmldir=DIR], [set hplip html documentation directory [default=datadir/doc]]), + hphtmldir=$withval, hphtmldir="$datadir/doc/hplip-$VERSION") AC_MSG_CHECKING([for foomatic ppd install]) AC_ARG_ENABLE(foomatic_ppd_install, [ --enable-foomatic-ppd-install enable foomatic static ppd install (default=no), uses hpppddir], @@ -579,6 +581,7 @@ AC_DEFINE_DIR([abs_datadir], [datadir]) AC_DEFINE_DIR([abs_sbindir], [sbindir]) AC_DEFINE_DIR([abs_hpppddir], [hpppddir]) AC_DEFINE_DIR([abs_docdir], [hpdocdir]) +AC_DEFINE_DIR([abs_htmldir], [hphtmldir]) abs_ppddir=${abs_hpppddir%/*} AC_DEFINE_DIR([abs_drvdir], [drvdir]) @@ -586,6 +589,7 @@ AC_SUBST(abs_datadir) AC_SUBST(abs_sbindir) AC_SUBST(abs_hpppddir) AC_SUBST(abs_docdir) +AC_SUBST(abs_htmldir) AC_SUBST(abs_ppddir) AC_SUBST(abs_drvdir) AC_SUBST(abs_mimedir) @@ -596,6 +600,7 @@ AC_SUBST(cupsbackenddir) AC_SUBST(cupsfilterdir) AC_SUBST(hpppddir) AC_SUBST(hpdocdir) +AC_SUBST(hphtmldir) AC_SUBST(drvdir) AC_SUBST(network_build) AC_SUBST(pp_build) diff --git a/cups_drv.inc b/cups_drv.inc index fb1a96eb3..c50eccfe7 100644 --- a/cups_drv.inc +++ b/cups_drv.inc @@ -84,6 +84,8 @@ cups_ppd_printers = \ ppd/hpcups/hp-color_laserjet_cp5225n-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz \ + ppd/hpcups/hp-color_laserjet_pro_mfp_m176n.ppd.gz \ + ppd/hpcups/hp-color_laserjet_pro_mfp_m177fw.ppd.gz \ ppd/hpcups/hp-cp1160.ppd.gz \ ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz \ ppd/hpcups/hp-deskjet_1010_series.ppd.gz \ @@ -104,6 +106,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-deskjet_2510_series.ppd.gz \ ppd/hpcups/hp-deskjet_2520_series.ppd.gz \ ppd/hpcups/hp-deskjet_2540_series.ppd.gz \ + ppd/hpcups/hp-deskjet_2640_series.ppd.gz \ ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz \ ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz \ ppd/hpcups/hp-deskjet_3050a_j611_series.ppd.gz \ @@ -440,6 +443,8 @@ cups_ppd_printers = \ ppd/hpcups/hp-laserjet_p4515tn.ppd.gz \ ppd/hpcups/hp-laserjet_p4515x.ppd.gz \ ppd/hpcups/hp-laserjet_p4515xm.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz \ ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_professional_m1137_mfp.ppd.gz \ @@ -479,6 +484,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-officejet.ppd.gz \ ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz \ ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz \ + ppd/hpcups/hp-officejet_2620_series.ppd.gz \ ppd/hpcups/hp-officejet_4000_k210.ppd.gz \ ppd/hpcups/hp-officejet_4100_series.ppd.gz \ ppd/hpcups/hp-officejet_4105.ppd.gz \ diff --git a/data/models/models.dat b/data/models/models.dat index 73e9874e0..4c96334cf 100644 --- a/data/models/models.dat +++ b/data/models/models.dat @@ -20,7 +20,7 @@ # This file automatically generated by the HPLIP model editor (model_editor.py). # Please do NOT hand edit this file. # -# Last written on Sat, 13 Jul 2013 02:45:13 by kodu. +# Last written on Thu, 10 Oct 2013 14:59:33 by kodu. # Model editor version 10.2 (Qt4). @@ -3984,6 +3984,89 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[hp_laserjet_pro_mfp_m127fn] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=7 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Pro MFP M127fn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=65 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE285A +r0-agent1-type=1 +scan-src=3 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.13.11 +tech-class=Hbpl1 +tech-subclass=Mono +tech-type=3 +usb-pid=322a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_pro_mfp_m127fw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=7 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Pro MFP M127fw +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=65 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE285A +r0-agent1-type=1 +scan-src=3 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.13.11 +tech-class=Hbpl1 +tech-subclass=Mono +tech-type=3 +usb-pid=322a +usb-vid=3f0 +wifi-config=3 [photosmart_130] align-type=1 clean-type=1 @@ -4221,6 +4304,108 @@ usb-pid=4912 usb-vid=3f0 wifi-config=0 +[hp_color_laserjet_pro_mfp_m176n] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color LaserJet Pro MPF M176n +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=65 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE311A +r0-agent1-type=4 +r0-agent2-kind=4 +r0-agent2-sku=CE310A +r0-agent2-type=1 +r0-agent3-kind=4 +r0-agent3-sku=CE313A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE312A +r0-agent4-type=6 +scan-src=1 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.13.11 +tech-class=Hbpl1 +tech-subclass=Color +tech-type=4 +usb-pid=242a +usb-vid=3f0 +wifi-config=0 + +[hp_color_laserjet_pro_mfp_m177fw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=7 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color LaserJet Pro MPF M177fw +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=65 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE311A +r0-agent1-type=4 +r0-agent2-kind=4 +r0-agent2-sku=CE310A +r0-agent2-type=1 +r0-agent3-kind=4 +r0-agent3-sku=CE313A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE312A +r0-agent4-type=6 +scan-src=3 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.13.11 +tech-class=Hbpl1 +tech-subclass=Color +tech-type=4 +usb-pid=332a +usb-vid=3f0 +wifi-config=3 + [hp_laserjet_200_colormfp_m276nw] align-type=0 clean-type=0 @@ -14038,6 +14223,61 @@ usb-pid=1411 usb-vid=3f0 wifi-config=0 +[hp_color_laserjet_m750] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cm1312_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=1 +linefeed-cal-type=0 +model1=HP Color LaserJet Enterprise M750 Printer series +model2=HP Color LaserJet Enterprise M750n +model3=HP Color LaserJet Enterprise M750dn +model4=HP Color LaserJet Enterprise M750xh +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-color_laserjet_m750 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE340A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE341A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE342A +r0-agent3-type=6 +r0-agent4-kind=4 +r0-agent4-sku=CE343A +r0-agent4-type=5 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=3 +support-released=True +support-subtype=48c3 +support-type=2 +support-ver=3.13.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=372a +usb-vid=3f0 +wifi-config=0 + [psc_760] align-type=1 clean-type=1 @@ -14411,6 +14651,51 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[hp_laserjet_m806] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=HP_Color_LaserJet_4730mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=1 +linefeed-cal-type=0 +model1=HP LaserJet Enterprise M806 Printer Series +model2=HP LaserJet Enterprise M806dn Printer +model3=HP LaserJet Enterprise M806x+ Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=laserjet_m806 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF325X +r0-agent1-type=1 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=3 +support-released=True +support-subtype=447b +support-type=2 +support-ver=3.13.10 +tech-class=Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=1f2a +usb-vid=3f0 +wifi-config=0 + [deskjet_810c] align-type=2 clean-type=1 @@ -14800,6 +15085,50 @@ usb-pid=704 usb-vid=3f0 wifi-config=0 +[hp_laserjet_flow_mfp_m830] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=HP_Color_LaserJet_4730mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=1 +linefeed-cal-type=0 +model1=HP LaserJet Enterprise flow M830z Multifunction Printer +model2=HP LaserJet Enterprise flow M830 Multifunction Printer Series +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=laserjet_flow_mfp_m830 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF325X +r0-agent1-type=1 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=3 +support-released=True +support-subtype=430e +support-type=2 +support-ver=3.13.10 +tech-class=Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=1e2a +usb-vid=3f0 +wifi-config=0 + [deskjet_830c] align-type=2 clean-type=1 @@ -15227,6 +15556,73 @@ usb-pid=1512 usb-vid=3f0 wifi-config=0 +[hp_color_laserjet_m855] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=HP_Color_LaserJet_4730mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=1 +linefeed-cal-type=0 +model1=HP Color LaserJet Enterprise M855 Printer series +model2=HP Color LaserJet Enterprise M855dn Printer +model3=HP Color LaserJet Enterprise M855xh Printer +model4=HP Color LaserJet Enterprise M855x+ Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=color_laserjet_m855 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF300A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CF311A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CF313A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CF312A +r0-agent4-type=6 +r0-agent5-kind=7 +r0-agent5-sku=CF358A +r0-agent5-type=1 +r0-agent6-kind=7 +r0-agent6-sku=CF359A +r0-agent6-type=4 +r0-agent7-kind=7 +r0-agent7-sku=CF365A +r0-agent7-type=5 +r0-agent8-kind=7 +r0-agent8-sku=CF364A +r0-agent8-type=6 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=3 +support-released=True +support-subtype=430e +support-type=2 +support-ver=3.13.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=1c2a +usb-vid=3f0 +wifi-config=0 + [deskjet_855c] align-type=2 clean-type=1 @@ -15367,6 +15763,72 @@ usb-pid=104 usb-vid=3f0 wifi-config=0 +[hp_color_laserjet_flow_mfp_m880] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=HP_Color_LaserJet_4730mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=1 +linefeed-cal-type=0 +model1=HP Color LaserJet Enterprise flow M880 Multifunction Printer series +model2=HP Color LaserJet Enterprise flow M880z Multifunction Printer +model3=HP Color LaserJet Enterprise flow M880z+ Multifunction Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=color_laserjet_flow_mfp_m880 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF300A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CF311A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CF313A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CF312A +r0-agent4-type=6 +r0-agent5-kind=7 +r0-agent5-sku=CF358A +r0-agent5-type=1 +r0-agent6-kind=7 +r0-agent6-sku=CF359A +r0-agent6-type=4 +r0-agent7-kind=7 +r0-agent7-sku=CF365A +r0-agent7-type=5 +r0-agent8-kind=7 +r0-agent8-sku=CF364A +r0-agent8-type=6 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=3 +support-released=True +support-subtype=430e +support-type=2 +support-ver=3.13.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=1d2a +usb-vid=3f0 +wifi-config=0 + [deskjet_882c] align-type=2 clean-type=1 @@ -23260,6 +23722,7 @@ model4=HP Deskjet Ink Advantage 1510 All-in-One Printer Series model5=HP Deskjet Ink Advantage 1515 All-in-One Printer model6=HP Deskjet Ink Advantage 1516 All-in-One Printer model7=HP Deskjet Ink Advantage 1518 All-in-One Printer +model8=HP Deskjet 1514 All-in-One Printer monitor-type=0 panel-check-type=1 pcard-type=0 @@ -28495,6 +28958,64 @@ usb-pid=1e04 usb-vid=3f0 wifi-config=0 +[hp_designjet_t2500_postscript] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=default_designjet.png +io-mfp-mode=6 +io-mode=1 +io-support=4 +job-storage=0 +linefeed-cal-type=0 +model1=HP DesignJet T2500 36-in PostScript eMultifunction Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-designjet_t2500-postscript.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=3 +r0-agent1-sku=B3P13A/B3P19A +r0-agent1-type=4 +r0-agent2-kind=3 +r0-agent2-sku=B3P14A/B3P20A +r0-agent2-type=5 +r0-agent3-kind=3 +r0-agent3-sku=B3P15A/B3P21A +r0-agent3-type=6 +r0-agent4-kind=3 +r0-agent4-sku=B3P16A/B3P22A +r0-agent4-type=21 +r0-agent5-kind=3 +r0-agent5-sku=B3P17A/B3P23A +r0-agent5-type=20 +r0-agent6-kind=3 +r0-agent6-sku=B3P18A/B3P24A +r0-agent6-type=17 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=3 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.13.10 +tech-class=Postscript +tech-subclass=Normal +tech-type=2 +usb-pid=0 +usb-vid=3f0 +wifi-config=0 + [hp_designjet_2500cp] align-type=0 clean-type=0 @@ -28984,6 +29505,8 @@ model2=HP Deskjet 2542 All-in-One Printer model3=HP Deskjet Ink Advantage 2545 All-in-One Printer model4=HP Deskjet Ink Advantage 2546 All-in-One Printer model5=HP Deskjet Ink Advantage 2540 All-in-One Printer Series +model6=HP Deskjet Ink Advantage 2548 All-in-One Printer +model7=HP Deskjet 2544 All-in-One Printer monitor-type=0 panel-check-type=0 pcard-type=0 @@ -29782,6 +30305,87 @@ usb-pid=3117 usb-vid=3f0 wifi-config=0 +[officejet_2620_series] +align-type=15 +clean-type=4 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=6 +fw-download=False +icon=default_printer.png +io-mfp-mode=1 +io-mode=1 +io-support=2 +job-storage=0 +linefeed-cal-type=0 +model1=HP Officejet 2620 All-in-One +model2=HP Officejet 2621 All-in-One +model3=HP Officejet 2622 All-in-One +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=0 +scan-src=3 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=11 +support-released=True +support-subtype=430e +support-type=2 +support-ver=3.13.11 +tech-class=Pyramid +tech-subclass=K10 +tech-type=2 +usb-pid=c911 +usb-vid=3f0 +wifi-config=0 + +[deskjet_2640_series] +align-type=15 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=6 +fw-download=False +icon=default_printer.png +io-mfp-mode=1 +io-mode=1 +io-support=2 +job-storage=0 +linefeed-cal-type=0 +model1=HP Deskjet Ink Advantage 2645 All-in-One Printer +model2=HP Deskjet Ink Advantage 2646 All-in-One Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=0 +scan-src=3 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=430e +support-type=2 +support-ver=3.13.10 +tech-class=Pyramid +tech-subclass=K10 +tech-type=2 +usb-pid=ca11 +usb-vid=3f0 +wifi-config=0 + [apollo_2650] align-type=0 clean-type=0 @@ -43023,6 +43627,8 @@ job-storage=0 linefeed-cal-type=0 model1=HP ENVY 5530 e-All-in-One Printer model2=HP ENVY 5535 e-All-in-One Printer +model3=HP ENVY 5532 e-All-in-One Printer +model4=HP ENVY 5531 e-All-in-One Printer monitor-type=0 panel-check-type=0 pcard-type=2 @@ -49375,7 +49981,7 @@ r7-agent4-kind=3 r7-agent4-sku=100 (C9368AN) r7-agent4-type=10 scan-src=1 -scan-type=1 +scan-type=6 status-battery-check=0 status-dynamic-counters=1 status-type=2 @@ -53984,7 +54590,7 @@ wifi-config=0 # 14 : LIDIL DJ D1600 # 15 : Low End Data Model (automatic and semiautomatic) # 16 : Low End Data Model (manual) -# 17 : Low End Data Model via ff/cc/0 channel +# 17 : Low End Data Model via ff/cc/o channel # # # clean-type diff --git a/data/rules/56-hpmud.rules b/data/rules/56-hpmud.rules index 6e6224e1f..c943df69a 100644 --- a/data/rules/56-hpmud.rules +++ b/data/rules/56-hpmud.rules @@ -1,14 +1,14 @@ # HPLIP udev rules file. Notify console user if plugin support is required for this device. ACTION!="add", GOTO="hpmud_rules_end" -SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0660" +SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0664" SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="hpmud_usb_rules" LABEL="hpmud_usb_rules" # ENV{ID_HPLIP}="1" is for Ubuntu udev-acl -ATTR{idVendor}=="03f0", ATTR{idProduct}=="????", OWNER="root", GROUP="lp", MODE="0660", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes", ENV{hp_test}="yes", ENV{ID_HPLIP}="1" +ATTR{idVendor}=="03f0", ATTR{idProduct}=="????", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes", ENV{hp_test}="yes", ENV{ID_HPLIP}="1" # This rule will add the printer and install plugin diff --git a/data/rules/56-hpmud_sysfs.rules b/data/rules/56-hpmud_sysfs.rules index e13b1adbf..2b12a46dc 100644 --- a/data/rules/56-hpmud_sysfs.rules +++ b/data/rules/56-hpmud_sysfs.rules @@ -1,23 +1,22 @@ # HPLIP udev rules file. Notify console user if plugin support is required for this device. ACTION!="add", GOTO="hpmud_rules_end" -SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0660" +SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0666" SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="hpmud_usb_rules" LABEL="hpmud_usb_rules" # ENV{ID_HPLIP}="1" is for Ubuntu udev-acl -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="????", OWNER="root", GROUP="lp", MODE="0660", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes", ENV{hp_test}="yes", ENV{ID_HPLIP}="1" +# SYSFS is for RHEL 5, Centos 5. RHEL 5 requires 'rw-rw-rw-' permissions to setup. +SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="????", OWNER="root", GROUP="lp", MODE="0666", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes", ENV{hp_test}="yes", ENV{ID_HPLIP}="1" +# For RHEL 5, centos 5.. +ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/python hp-config_usb_printer %c '" # This rule will add the printer and install plugin ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c 'if [ -f /usr/bin/systemctl ]; then /usr/bin/systemctl --no-block start hplip-printer@$env{BUSNUM}:$env{DEVNUM}.service; else /usr/bin/nohup /usr/bin/python /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM} ; fi'" -# For RHEL 5, centos 5.. -ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/python hp-config_usb_printer %c &'" - - # If sane-bankends is installed add hpaio backend support to dll.conf if needed. ENV{sane_hpaio}=="yes", RUN+="/bin/sh -c 'grep -q ^#hpaio /etc/sane.d/dll.conf;if [ $$? -eq 0 ];then sed -i -e s/^#hpaio/hpaio/ /etc/sane.d/dll.conf;else grep -q ^hpaio /etc/sane.d/dll.conf;if [ $$? -ne 0 ];then echo hpaio >>/etc/sane.d/dll.conf;fi;fi'" diff --git a/diagnose_queues.py b/diagnose_queues.py index 36eba17f0..b4acf85b4 100755 --- a/diagnose_queues.py +++ b/diagnose_queues.py @@ -106,7 +106,7 @@ try: utils.log_title(__title__, __version__) mod.lockInstance(__mod__, True) - log_file = os.path.normpath('/var/log/hp/hplip_queues.log') + log_file = os.path.normpath('%s/hplip_queues.log'%prop.user_dir) log.debug(log.bold("Saving output in log file: %s" % log_file)) if os.path.exists(log_file): try: @@ -117,7 +117,7 @@ try: log.set_where(log.LOG_TO_CONSOLE_AND_FILE) passwordObj = password.Password(mode) - queues.main_function(passwordObj, mode,ui_toolkit, quiet_mode, True ) + queues.main_function(passwordObj, mode,ui_toolkit, quiet_mode ) except KeyboardInterrupt: @@ -23,7 +23,7 @@ __version__ = '1.0' __title__ = 'Self Diagnse Utility and Healing Utility' __mod__ = 'hp-doctor' -__doc__ = """Check for the deprecated, plug-in, dependencies, queues and Permission issues. And provides self diagnose steps""" +__doc__ = """Tool checks for the deprecated, plug-in, dependencies, queues, permission issues and provides self diagnose steps""" # global import @@ -247,7 +247,7 @@ try: mod.lockInstance('') mod.quiet= False mod.showTitle() - log_file = os.path.normpath('/var/log/hp/hp-doctor.log') + log_file = os.path.normpath('%s/hp-doctor.log'%prop.user_dir) if os.path.exists(log_file): try: @@ -299,16 +299,17 @@ try: core.install_missing_dependencies(INTERACTIVE_MODE,core.get_required_deps(),core.get_optional_deps(), core.get_cmd_to_run()) log.info(log.bold("\n\nChecking Permissions....")) - if not core.get_missing_user_grps() and not core.get_disable_selinux_status(): +# if not core.get_missing_user_grps() and not core.get_disable_selinux_status(): + if not core.get_disable_selinux_status(): log.info("Permissions are correct.") - if core.get_missing_user_grps(): - log.info(log.bold("Missing User Groups")) - log.info(log.bold('-'*len("Missing User Groups"))) - log.info("%s"%core.get_missing_user_grps()) - authenticate(core) - if core.add_groups_to_user(core.get_missing_user_grps(), core.get_user_grp_cmd()): - IS_RESTART_REQ = True +# if core.get_missing_user_grps(): +# log.info(log.bold("Missing User Groups")) +# log.info(log.bold('-'*len("Missing User Groups"))) +# log.info("%s"%core.get_missing_user_grps()) +# authenticate(core) +# if core.add_groups_to_user(core.get_missing_user_grps(), core.get_user_grp_cmd()): +# IS_RESTART_REQ = True if core.get_disable_selinux_status(): log.info(log.bold("SELinux Status")) @@ -319,7 +320,7 @@ try: IS_RESTART_REQ = True log.info(log.bold("\n\nChecking for Configured Queues....")) - queues.main_function(core.passwordObj, MODE,ui_toolkit, False,False, DEVICE_URI) + queues.main_function(core.passwordObj, MODE,ui_toolkit, False, DEVICE_URI) log.info(log.bold("\n\nChecking for HP Properitery Plugin's....")) ### Check for Plugin Printers diff --git a/fax/backend/hpfax.py b/fax/backend/hpfax.py index 95163a902..f73434fea 100755 --- a/fax/backend/hpfax.py +++ b/fax/backend/hpfax.py @@ -243,11 +243,12 @@ else: except IndexError: input_fd = 0 - # REVISIT: - tmp_dir = '/var/log/hp/tmp' - + if os.path.exists("/home/%s/.hplip"%username): + tmp_dir = "/home/%s/.hplip"%username + else: + tmp_dir = "/tmp" - pipe_name = os.path.join(tmp_dir, "hpfax-pipe-%d" % job_id) + pipe_name = os.path.join(tmp_dir, "hp_fax-pipe-%d" % job_id) # Create the named pipe. Make sure it exists before sending # message to hppsd. @@ -255,7 +256,7 @@ else: try: os.mkfifo(pipe_name) except OSError: - os.unlink(pipe_name) + os.unlink(pipe_name) os.mkfifo(pipe_name) # Send dbus event to hpssd diff --git a/fax/ppd/HP-Fax-hpcups.ppd.gz b/fax/ppd/HP-Fax-hpcups.ppd.gz Binary files differindex 3dde35cac..23bd4b7ff 100644 --- a/fax/ppd/HP-Fax-hpcups.ppd.gz +++ b/fax/ppd/HP-Fax-hpcups.ppd.gz diff --git a/fax/ppd/HP-Fax-hpijs.ppd.gz b/fax/ppd/HP-Fax-hpijs.ppd.gz Binary files differindex de6a8d67e..ba8d8a114 100644 --- a/fax/ppd/HP-Fax-hpijs.ppd.gz +++ b/fax/ppd/HP-Fax-hpijs.ppd.gz diff --git a/fax/ppd/HP-Fax2-hpcups.ppd.gz b/fax/ppd/HP-Fax2-hpcups.ppd.gz Binary files differindex adbb1776a..39861ab94 100644 --- a/fax/ppd/HP-Fax2-hpcups.ppd.gz +++ b/fax/ppd/HP-Fax2-hpcups.ppd.gz diff --git a/fax/ppd/HP-Fax2-hpijs.ppd.gz b/fax/ppd/HP-Fax2-hpijs.ppd.gz Binary files differindex af4d9e9b7..45de6aa78 100644 --- a/fax/ppd/HP-Fax2-hpijs.ppd.gz +++ b/fax/ppd/HP-Fax2-hpijs.ppd.gz diff --git a/fax/ppd/HP-Fax3-hpcups.ppd.gz b/fax/ppd/HP-Fax3-hpcups.ppd.gz Binary files differindex f3636be4d..627359079 100644 --- a/fax/ppd/HP-Fax3-hpcups.ppd.gz +++ b/fax/ppd/HP-Fax3-hpcups.ppd.gz diff --git a/fax/ppd/HP-Fax3-hpijs.ppd.gz b/fax/ppd/HP-Fax3-hpijs.ppd.gz Binary files differindex d57231feb..12c86e812 100644 --- a/fax/ppd/HP-Fax3-hpijs.ppd.gz +++ b/fax/ppd/HP-Fax3-hpijs.ppd.gz diff --git a/fax/ppd/HP-Fax4-hpcups.ppd.gz b/fax/ppd/HP-Fax4-hpcups.ppd.gz Binary files differindex ba2bf003e..37a7300d7 100644 --- a/fax/ppd/HP-Fax4-hpcups.ppd.gz +++ b/fax/ppd/HP-Fax4-hpcups.ppd.gz diff --git a/fax/ppd/HP-Fax4-hpijs.ppd.gz b/fax/ppd/HP-Fax4-hpijs.ppd.gz Binary files differindex c49fca656..41ea55d1e 100644 --- a/fax/ppd/HP-Fax4-hpijs.ppd.gz +++ b/fax/ppd/HP-Fax4-hpijs.ppd.gz diff --git a/foomatic_drv.inc b/foomatic_drv.inc index 34aa3937d..a43df72c4 100644 --- a/foomatic_drv.inc +++ b/foomatic_drv.inc @@ -80,6 +80,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_1600c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_cp1025nw-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_1000_j110_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m127fn-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_d7100_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_600-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz \ @@ -145,6 +146,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-psc_2100_series-hpijs.ppd.gz \ ppd/hpijs/hp-business_inkjet_1200-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p1006-hpijs.ppd.gz \ + ppd/hpijs/hp-color_laserjet_pro_mfp_m176n-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1005_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_d6100_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_672c-hpijs.ppd.gz \ @@ -339,10 +341,12 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-photosmart_estn_c510_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_855c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4340_series-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_2620_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-envy_4500_series-hpijs.ppd.gz \ ppd/hpijs/hp-psc_1200_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_pro_b8800_series-hpijs.ppd.gz \ + ppd/hpijs/hp-color_laserjet_pro_mfp_m177fw-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_series_710-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_f4213_series-hpijs.ppd.gz \ @@ -551,6 +555,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_3100-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_700-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_7345-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m127fw-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_d1300_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3420-hpijs.ppd.gz \ @@ -578,6 +583,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_t_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_6500_e709a-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_2640_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_pro_8600-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4300-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_1115-hpijs.ppd.gz \ @@ -732,6 +738,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_cm6049_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_m1522_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz \ + prnt/ps/hp-designjet_t2500-postscript.ppd.gz \ prnt/ps/hp-color_laserjet_9500-ps.ppd.gz \ prnt/ps/hp-laserjet_400_mfp_m425-ps.ppd.gz \ prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.gz \ @@ -778,11 +785,13 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_3200m-ps.ppd.gz \ prnt/ps/hp-laserjet_1320-ps.ppd.gz \ prnt/ps/hp-designjet_z5400-postscript.ppd.gz \ + prnt/ps/hp-laserjet_m806-ps.ppd.gz \ prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz \ prnt/ps/hp-designjet_4500ps.ppd.gz \ prnt/ps/hp-laserjet_4240-ps.ppd.gz \ prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz \ + prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2840-ps.ppd.gz \ prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2250-ps.ppd.gz \ @@ -858,6 +867,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_2300-ps.ppd.gz \ prnt/ps/hp-laserjet_9000_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2830-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz \ prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz \ prnt/ps/hp-laserjet_4000_series-ps.ppd.gz \ prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz \ @@ -939,11 +949,13 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_5200l-ps.ppd.gz \ prnt/ps/hp-mopier_240-ps.ppd.gz \ prnt/ps/hp-laserjet_9050_mfp-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m750-ps.ppd.gz \ prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz \ prnt/ps/hp-laserjet_1200n-ps.ppd.gz \ prnt/ps/hp-laserjet_3390-ps.ppd.gz \ prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz \ prnt/ps/hp-designjet_4500mfp.ppd.gz \ + prnt/ps/hp-color_laserjet_m855-ps.ppd.gz \ prnt/ps/hp-laserjet_400_m401-ps.ppd.gz foomatic_drv = prnt/drv/hpijs.drv diff --git a/hplip.conf.in b/hplip.conf.in index 3454d087f..e28b3d98f 100644 --- a/hplip.conf.in +++ b/hplip.conf.in @@ -9,6 +9,7 @@ run=/var/run ppd=@abs_hpppddir@ ppdbase=@abs_ppddir@ doc=@abs_docdir@ +html=@abs_htmldir@ icon=@icondir@ cupsbackend=@cupsbackenddir@ cupsfilter=@cupsfilterdir@ diff --git a/hplip.list.in b/hplip.list.in index add4cb27a..905154e0e 100644 --- a/hplip.list.in +++ b/hplip.list.in @@ -49,6 +49,7 @@ $pyexecdir=@pyexecdir@ $icondir=@icondir@ $systraydir=@systraydir@ $docdir=@hpdocdir@ +$htmldir=@hphtmldir@ $version=@VERSION@ $internal_tag=@PACKAGE_BUGREPORT@ @@ -275,11 +276,11 @@ f 0644 root root $ppd/HP prnt/ps/*.ppd.gz @epm_full@f 755 root root $home/hplip_clean.sh hplip_clean.sh # docs -@epm_full@f 644 root root $docdir doc/* -@epm_full@d 775 root root $docdir/images - -@epm_full@f 644 root root $docdir/images doc/images/* -@epm_full@d 775 root root $docdir/styles - -@epm_full@f 644 root root $docdir/styles doc/styles/* +@epm_full@f 644 root root $htmldir doc/* +@epm_full@d 775 root root $htmldir/images - +@epm_full@f 644 root root $htmldir/images doc/images/* +@epm_full@d 775 root root $htmldir/styles - +@epm_full@f 644 root root $htmldir/styles doc/styles/* # python commands @epm_full@l 755 root root $bindir/hp-toolbox ../share/hplip/toolbox.py @epm_full@l 755 root root $bindir/hp-colorcal ../share/hplip/colorcal.py @@ -327,7 +328,6 @@ f 0644 root root $ppd/HP prnt/ps/*.ppd.gz %if !SUSE9 @epm_print_only_exclude@f 0700 root root $cupsbackend/hp .libs/hp -@epm_print_only_exclude@f 0755 root root $bindir/hp-mkuri .libs/hp-mkuri %endif # Use LINPUS8 for Acer Aspire One @@ -453,8 +453,6 @@ f 0644 root root $docdir/copyright prnt/plugins/copyright d 0755 root root /var/lib/hp/ - f 0644 root root $home/data/firmware data/firmware/*.fw.gz d 0775 root root $home/data/plugin - -d 0775 root lp /var/log/hp - -d 0775 root lp /var/log/hp/tmp - #scan @@ -490,8 +488,7 @@ EOF f 0644 root root $docdir/COPYING COPYING f 0644 root root $docdir/copyright copyright d 0755 root root /var/lib/hp/ - -d 0775 root lp /var/log/hp - -d 0775 root lp /var/log/hp/tmp - + %system !darwin @epm_print_only_exclude@f 0644 root root /etc/udev/rules.d/56-hpmud.rules data/rules/56-hpmud.rules diff --git a/hplip_clean.sh b/hplip_clean.sh index 9a8618d9f..bb8750d06 100755 --- a/hplip_clean.sh +++ b/hplip_clean.sh @@ -23,7 +23,7 @@ LC_ALL=C LANG=C -LOG_DIR=/var/log/hp/tmp/ +LOG_DIR=/var/spool/cups/tmp # Default for number of days to keep old log files in /var/log/hp/tmp LOGFILE_DAYS=3 @@ -31,13 +31,16 @@ MAXSIZE=1048576 # 1 GB # Clears the logs which are less than 3 days. if [ -d $LOG_DIR ]; then - find $LOG_DIR -type f -mtime +$LOGFILE_DAYS -print0 2>/dev/null | xargs -r -0 rm -f 2>/dev/null + if ! [ -w $LOG_DIR ]; then + exit 1 + else + find $LOG_DIR -type f -name hp-\* -mtime +$LOGFILE_DAYS -print0 2>/dev/null | xargs -r -0 rm -f 2>/dev/null + fi else - mkdir -p $LOG_DIR - chgrp "lp" -R $LOG_DIR - chmod 1775 $LOG_DIR + exit 1 fi + USAGE=`du -c $LOG_DIR 2>/dev/null |grep total |cut -d't' -f1` # Clears the logs if size is greater than specified limit @@ -48,10 +51,10 @@ while [ $USAGE -gt $MAXSIZE ]; do # If same day logs are reaching Max size, deleting all log files. if [ $LOGFILE_DAYS -eq 0 ]; then - find $LOG_DIR -type f -print0 2>/dev/null | xargs -r -0 rm -f 2>/dev/null + find $LOG_DIR -type f -name hp-\* -print0 2>/dev/null | xargs -r -0 rm -f 2>/dev/null break - else - find $LOG_DIR -type f -mtime +$LOGFILE_DAYS -print0 2>/dev/null | xargs -r -0 rm -f 2>/dev/null + else + find $LOG_DIR -type f -name hp-\* -mtime +$LOGFILE_DAYS -print0 2>/dev/null | xargs -r -0 rm -f 2>/dev/null fi USAGE=`du -c $LOG_DIR 2>/dev/null |grep total |cut -d't' -f1` done diff --git a/installer/core_install.py b/installer/core_install.py index c1599789d..5a00fd42e 100644 --- a/installer/core_install.py +++ b/installer/core_install.py @@ -97,10 +97,12 @@ err_pats = {r'(?is)<TITLE>.*?(404|403).*?ERROR.*?</TITLE>': 0.95, } # Note:- If new utility is added, add same utility here to uninstall properly. -BINS_LIST=['hpijs','hp-align','hp-colorcal','hp-faxsetup','hp-linefeedcal','hp-pkservice','hp-printsettings','hp-sendfax','hp-timedate','hp-check','hp-devicesettings','hp-firmware','hp-makecopies','hp-plugin','hp-probe','hp-setup','hp-toolbox','hp-check-plugin','hp-diagnose_plugin','hp-info','hp-makeuri','hp-pqdiag','hp-query','hp-systray','hp-unload','hp-clean','hp-fab','hp-levels','hp-mkuri','hp-print','hp-scan','hp-testpage','hp-wificonfig', 'hp-upgrade','hplip-info','hp-check-upgrade','hp-config_usb_printer','hp-diagnose_queues', 'hp-devicesetup','hp-doctor','hp-logcapture'] +BINS_LIST=['hpijs','hp-align','hp-colorcal','hp-faxsetup','hp-linefeedcal','hp-pkservice','hp-printsettings','hp-sendfax','hp-timedate','hp-check','hp-devicesettings','hp-firmware','hp-makecopies','hp-plugin','hp-probe','hp-setup','hp-toolbox','hp-check-plugin','hp-diagnose_plugin','hp-info','hp-makeuri','hp-pqdiag','hp-query','hp-systray','hp-unload','hp-clean','hp-fab','hp-levels','hp-print','hp-scan','hp-testpage','hp-wificonfig', 'hp-upgrade','hplip-info','hp-check-upgrade','hp-config_usb_printer','hp-diagnose_queues', 'hp-devicesetup','hp-doctor','hp-logcapture'] LIBS_LIST=['libhpmud.*','libhpip.*','sane/libsane-hpaio.*','cups/backend/hp','cups/backend/hpfax', 'cups/filter/hpcac', 'cups/filter/hpps', 'cups/filter/pstotiff','cups/filter/hpcups', 'cups/filter/hpcupsfax', 'cups/filter/hplipjs'] +HPLIP_EXT_LIST = ['cupsext.so', 'cupsext.la', 'scanext.so', 'scanext.la', 'hpmudext.so', 'hpmudext.la', 'pcardext.so', 'pcardext.la'] + FILES_LIST=[ '/usr/share/cups/drv/hp/','/usr/local/share/ppd/HP/','/usr/local/share/cups/drv/hp/' ,'/usr/share/applications/hplip.desktop', '/etc/xdg/autostart/hplip-systray.desktop', '/etc/hp/hplip.conf', '/usr/share/doc/hplip-*','/usr/lib/systemd/system/hplip-printer*.service'] RULES_LIST=['56-hpmud.rules','56-hpmud_sysfs.rules', '40-hplip.rules', '56-hpmud_support.rules', '56-hpmud_support_sysfs.rules','55-hpmud.rules','55-hpmud_sysfs.rules','56-hpmud_add_printer.rules','56-hpmud_add_printer_sysfs.rules', '86-hpmud-hp_*.rules', '86-hpmud_plugin.rules', '86-hpmud_plugin_sysfs.rules'] @@ -229,7 +231,6 @@ class CoreInstall(object): 'native_cups' : TYPE_BOOL, 'package_available' : TYPE_BOOL, 'package_arch' : TYPE_LIST, - 'add_user_to_group': TYPE_STRING, 'open_mdns_port' : TYPE_LIST, # command to use to open mdns multicast port 5353 'acl_rules' : TYPE_BOOL, # Use ACL uDEV rules (Ubuntu 9.10+) 'libdir_path' : TYPE_STRING, @@ -325,7 +326,7 @@ class CoreInstall(object): 'libcrypto': (True, ['network'], "libcrypto - OpenSSL cryptographic library", self.check_libcrypto, DEPENDENCY_RUN_AND_COMPILE_TIME), 'network': (False, ['network'], "network -wget", self.check_wget, DEPENDENCY_RUN_TIME), 'avahi-utils': (False, ['network'], "avahi-utils", self.check_avahi_utils, DEPENDENCY_RUN_TIME), - 'passwd_util': (False, ['gui_qt4'], "GUI Password utility (gksu/kdesu)", self.check_passwd_util, DEPENDENCY_RUN_TIME), +# 'passwd_util': (False, ['gui_qt4'], "GUI Password utility (gksu/kdesu)", self.check_passwd_util, DEPENDENCY_RUN_TIME), } for opt in self.options: @@ -1029,18 +1030,25 @@ class CoreInstall(object): def check_hpaio(self): found = False - log.debug("'Checking for hpaio' in '/etc/sane.d/dll.conf'...") - try: - f = file('/etc/sane.d/dll.conf', 'r') - except IOError: - log.error("'/etc/sane.d/dll.conf' not found. Is SANE installed?") - else: - for line in f: - lineNoSpace = re.sub(r'\s', '', line) - hpaiomatched=re.match('hpaio',lineNoSpace) - if hpaiomatched: - found = True - break + for path in ['/etc/sane.d/dll.conf','/etc/sane.d/dll.d/hpaio', '/etc/sane.d/dll.d/hplip']: + log.debug("'Checking for hpaio' in '%s'..." % path) + try: + f = file(path, 'r') + except IOError: + log.info("'%s' not found." % path) + else: + for line in f: + lineNoSpace = re.sub(r'\s', '', line) + hpaiomatched=re.match('hpaio',lineNoSpace) + if hpaiomatched: + found = True + break + if found: + break + + if not found: + log.error("'hpaio' not found in SANE conf files. Is SANE installed?") + return found def update_hpaio(self): @@ -1505,7 +1513,9 @@ class CoreInstall(object): else: log.debug("avahi-browse is not installed") return False - + + + ''' def check_passwd_util(self): if utils.which("gksu"): return True @@ -1515,7 +1525,7 @@ class CoreInstall(object): return True else: log.debug("GUI password gksu/kdesu/kdesudo utility is not installed") - return False + return False''' def run_pre_install(self, callback=None,distro_ver=None): @@ -1620,13 +1630,6 @@ class CoreInstall(object): kill = kill_cmd + " %s"%pid cmds.append(self.passwordObj.getAuthCmd() % kill) - # Add user to group if needed - # add_user_to_group=<usermod params> [TYPE_STRING] (leave empty for none) [ex. "-a -G sys" or "-G lp"] - add_user_to_group = self.get_distro_ver_data('add_user_to_group', '',distro_ver) - if add_user_to_group: - usermod = os.path.join(utils.which("usermod"), "usermod") + " %s %s" % (add_user_to_group, prop.username) - cmds.append(self.passwordObj.getAuthCmd() % usermod) - return cmds @@ -1842,6 +1845,25 @@ class CoreInstall(object): for fl in RULES_LIST_FULL: utils.remove(fl , self.passwordObj, checkSudo) + # removing (unused) hplip folder from other location + cmd = 'find /usr -type d -name hplip' + cmd = self.passwordObj.getAuthCmd() %cmd + status, output=utils.run(cmd, self.passwordObj, checkSudo) + if status == 0: + hplip_folders = output.splitlines() + for hplip_d in hplip_folders: + if hplip_d != home_dir: + utils.remove(hplip_d, self.passwordObj, checkSudo) + + # removing all hplip extension libraries + for ext_f in HPLIP_EXT_LIST: + if ext_f: + cmd = 'find /usr -type f -name %s -delete'%ext_f + cmd = self.passwordObj.getAuthCmd() %cmd + status,output = utils.run(cmd , self.passwordObj, checkSudo) + if status != 0: + log.warn("Failed to delete %s library [%s]"%(ext_f,output)) + # removing Plug-in files if remove_plugins == True: cnt =0 @@ -1907,8 +1929,6 @@ class CoreInstall(object): return User_exit, Is_pkg_mgr_running - - #add_groups_to_user() # Input: # missing_user_groups (string) --> Contains only missing groups, to show to user. diff --git a/installer/distros.dat b/installer/distros.dat index 8785c7e04..dd2baebee 100644 --- a/installer/distros.dat +++ b/installer/distros.dat @@ -112,7 +112,7 @@ supported=0 [suse] index=3 -versions=12.2,12.3 +versions=12.2,12.3,13.1 display_name=SUSE Linux alt_names= display=1 @@ -150,7 +150,6 @@ drv_dir=/usr/share/cups/drv/HP cups_path_with_bitness=0 ui_toolkit=qt4 native_cups=1 -add_user_to_group= -Asys,lp open_mdns_port=/bin/bash ./init-suse-firewall pre_depend_cmd=su -c "zypper refresh" @@ -271,7 +270,6 @@ drv_dir=/usr/share/cups/drv/HP cups_path_with_bitness=0 ui_toolkit=qt4 native_cups=1 -add_user_to_group= -a -G sys,lp open_mdns_port=/bin/bash ./init-suse-firewall pre_depend_cmd=su -c "zypper refresh" @@ -372,6 +370,15 @@ packages=wget [suse:12.3:avahi-utils] packages=avahi-utils # **************************************** + +[suse:13.1] +code_name=Evergreen +supported=1 +packaged_version=3.13.7 +release_date=19.09.2013 +same_as_version=12.3 + +# **************************************** [redhat] index=6 versions=8.0,9.0 @@ -610,7 +617,6 @@ drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt4 policykit=0 native_cups=1 -add_user_to_group=-a -Gsys,lp open_mdns_port=/bin/bash ./init-iptables-firewall pre_depend_cmd=su -c "yum clean all",su -c "yum check-update" @@ -728,7 +734,6 @@ drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt4 policykit=0 native_cups=1 -add_user_to_group=-a -Gsys,lp open_mdns_port=/bin/bash ./init-iptables-firewall pre_depend_cmd=su -c "yum clean all",su -c "yum check-update" @@ -918,7 +923,7 @@ drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt3 package_available=1 package_arch=i386,x86_64 -add_user_to_group=-a -Glp,sys + [rhel:5.0:cups] packages=cups @@ -1032,7 +1037,9 @@ drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt4 package_available=1 package_arch=i686,x86_64 -add_user_to_group=-a -Glp,sys +native_cups=1 +libusb01=1 + [rhel:6.0:cups] packages=cups @@ -1347,7 +1354,7 @@ ppd_dir=/usr/share/cups/model/HP fix_ppd_symlink=0 drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt3 -add_user_to_group=-a -Glp,sys + [centos:any:cups] packages=cups @@ -1484,7 +1491,7 @@ ppd_dir=/usr/share/ppd/HP fix_ppd_symlink=0 drv_dir=/usr/share/cups/drv/HP ui_toolkit=none -add_user_to_group=-a -Glp + # **************************************** [pclinuxos] @@ -2224,7 +2231,7 @@ packages=avahi # **************************************** [ubuntu] index=12 -versions=10.04,11.10,12.04,12.10,13.04 +versions=10.04,11.10,12.04,12.10,13.04,13.10 display_name=Ubuntu alt_names=kubuntu,edubuntu,xubuntu display=1 @@ -2262,7 +2269,7 @@ drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt4 native_cups=1 acl_rules=1 -add_user_to_group=-a -Glp,lpadmin + [ubuntu:10.04:cups] packages=libcups2 @@ -2381,7 +2388,7 @@ drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt4 native_cups=1 acl_rules=1 -add_user_to_group=-a -Glp,lpadmin + libdir_path=/usr/lib [ubuntu:11.10:cups] @@ -2501,7 +2508,7 @@ drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt4 native_cups=1 acl_rules=1 -add_user_to_group=-a -Glp,lpadmin + libdir_path=/usr/lib [ubuntu:12.04:cups] @@ -2598,9 +2605,6 @@ packages=python-notify [ubuntu:12.04:network] packages=wget -[ubuntu:12.04:passwd_util] -packages=gksu - [ubuntu:12.04:avahi-utils] packages=avahi-utils # ******************** @@ -2611,10 +2615,130 @@ same_as_version=12.04 [ubuntu:13.04] same_as_version=12.04 +# ******************** +[ubuntu:13.10] +code_name=Saucy +supported=1 +scan_supported=1 +fax_supported=1 +pcard_supported=1 +network_supported=1 +parallel_supported=1 +usb_supported=1 +packaged_version=3.13.7 +release_date=17/10/2013 +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. During the install process you will be added to the lp and lpadmin group, please quit the installer before the setup stage, log out, log back in, and run hp-setup to complete the install. +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 + +libdir_path=/usr/lib +[ubuntu:13.10:cups] +packages=libcups2 + +[ubuntu:13.10:cups-devel] +packages=libcups2-dev,cups-bsd,cups-client + +[ubuntu:13.10:gcc] +packages=build-essential + +[ubuntu:13.10:gs] +packages=ghostscript + +[ubuntu:13.10:libcrypto] +packages=openssl + +[ubuntu:13.10:libjpeg] +packages=libjpeg-dev + +[ubuntu:13.10:libnetsnmp-devel] +packages=libsnmp-dev,snmp-mibs-downloader + +[ubuntu:13.10:libpthread] +packages=build-essential + +[ubuntu:13.10:libtool] +packages=libtool + +[ubuntu:13.10:libusb] +packages=libusb-1.0.0-dev + +[ubuntu:13.10:make] +packages=build-essential + +[ubuntu:13.10:pil] +packages=python-imaging + +[ubuntu:13.10:ppdev] +packages= +commands=sudo modprobe ppdev,sudo cp -f /etc/modules /etc/modules.hplip,echo ppdev | sudo tee -a /etc/modules + +[ubuntu:13.10:pyqt] +packages=gtk2-engines-pixbuf,python-qt4 + +[ubuntu:13.10:python-devel] +packages=python-dev + +[ubuntu:13.10:pyqt4] +packages=gtk2-engines-pixbuf,python-qt4 + +[ubuntu:13.10:pyqt4-dbus] +packages=python-qt4-dbus + +#[ubuntu:13.10:python23] +#packages=python + +[ubuntu:13.10:python2x] +packages=python + +[ubuntu:13.10:reportlab] +packages=python-reportlab + +[ubuntu:13.10:sane] +packages=libsane + +[ubuntu:13.10:sane-devel] +packages=libsane-dev + +[ubuntu:13.10:scanimage] +packages=sane-utils + +[ubuntu:13.10:xsane] +packages=gtk2-engines-pixbuf,xsane + +[ubuntu:13.10:python-dbus] +packages=python-dbus,python-gobject + +[ubuntu:13.10:dbus] +packages=libdbus-1-dev + +[ubuntu:13.10:cups-image] +packages=libcupsimage2-dev + +[ubuntu:13.10:cups-ddk] +packages=cups + +[ubuntu:13.10:policykit] +packages=policykit-1,policykit-1-gnome + +[ubuntu:13.10:python-notify] +packages=python-notify + +[ubuntu:13.10:network] +packages=wget + +[ubuntu:13.10:avahi-utils] +packages=avahi-utils + # **************************************** [debian] index=2 -versions=6.0,6.0.1,6.0.2,6.0.3,6.0.4,6.0.5,6.0.6,6.0.7,7.0,7.1 +versions=6.0,6.0.1,6.0.2,6.0.3,6.0.4,6.0.5,6.0.6,6.0.7,6.0.8,7.0,7.1,7.2 display_name=Debian alt_names= display=1 @@ -2652,7 +2776,7 @@ drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt4 native_cups=1 policykit=0 -add_user_to_group=-a -G lp,lpadmin + [debian:6.0:cups] packages=libcups2 @@ -2775,6 +2899,9 @@ same_as_version=6.0 [debian:6.0.7] same_as_version=6.0 +[debian:6.0.8] +same_as_version=6.0 + # ********************* [debian:7.0] @@ -2797,7 +2924,7 @@ drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt4 native_cups=1 policykit=0 -add_user_to_group=-a -G lp,lpadmin + # This libdir_path will be used only for 64 bit machine. libdir_path=/usr/lib/x86_64-linux-gnu @@ -2905,6 +3032,9 @@ packages=avahi-utils [debian:7.1] same_as_version=7.0 +[debian:7.2] +same_as_version=7.0 + # ********************* [xandros] @@ -4942,7 +5072,7 @@ drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt4 native_cups=1 acl_rules=1 -add_user_to_group=-a -Glp,lpadmin + libdir_path=/usr/lib [linuxmint:13:cups] @@ -5072,7 +5202,7 @@ drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt4 native_cups=1 acl_rules=1 -add_user_to_group=-a -Glp,lpadmin + libdir_path=/usr/lib/x86_64-linux-gnu [linuxmint:15:cups] diff --git a/installer/pluginhandler.py b/installer/pluginhandler.py index 253d32877..4720f449a 100755 --- a/installer/pluginhandler.py +++ b/installer/pluginhandler.py @@ -60,7 +60,7 @@ PLUGIN_INSTALL_ERROR_UNABLE_TO_RECV_KEYS = 7 class PluginHandle(object): - def __init__(self, pluginPath = "/var/log/hp/tmp"): + def __init__(self, pluginPath = prop.user_dir): self.__plugin_path = pluginPath self.__required_version = "" self.__plugin_name = "" diff --git a/installer/text_install.py b/installer/text_install.py index d80c73365..45696671b 100755 --- a/installer/text_install.py +++ b/installer/text_install.py @@ -776,8 +776,8 @@ def start(language, auto=True, test_depends=False, user_conf.set('upgrade','last_upgraded_time',str(int(time.time()))) user_conf.set('upgrade','pending_upgrade_time','0') - tui.title("HPLIP UPDATE NOTIFICATION") if prev_hplip_plugin_status != pluginhandler.PLUGIN_NOT_INSTALLED: + tui.title("HPLIP PLUGIN UPDATE NOTIFICATION") ok, choice = tui.enter_choice("HPLIP Plug-in's needs to be installed/updated. Do you want to update plug-in's?. (y=yes*, n=no) : ",['y', 'n'], 'y') if ok and choice == 'y': services.run_hp_tools_with_auth('hp-plugin', core.passwordObj) @@ -843,7 +843,7 @@ def start(language, auto=True, test_depends=False, if install_printer: log.info("Please make sure your printer is connected and powered on at this time.") - if not services.run_hp_tools( 'hp-setup'): + if not services.run_hp_tools_with_auth( 'hp-setup', core.passwordObj): log.error("hp-setup failed. Please run hp-setup manually.") tui.title("RE-STARTING HP_SYSTRAY") diff --git a/io/hpmud/hp-mkuri.c b/io/hpmud/hp-mkuri.c deleted file mode 100644 index 1ae862a92..000000000 --- a/io/hpmud/hp-mkuri.c +++ /dev/null @@ -1,535 +0,0 @@ -/*****************************************************************************\ - - hp-mkuri.c - make uri with multi-point transport driver (HPMUD) - - (c) 2008-2009 Copyright Hewlett-Packard Development Company, LP - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - of the Software, and to permit persons to whom the Software is furnished to do - so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -\*****************************************************************************/ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <dirent.h> -#include <signal.h> -#include <ctype.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -#include <syslog.h> -#include <dlfcn.h> -#include "hpmud.h" -#include "utils.h" - -#define _STRINGIZE(x) #x -#define STRINGIZE(x) _STRINGIZE(x) -//#define BUG(args...) fprintf(stderr, __FILE__ " " STRINGIZE(__LINE__) ": " args) -#define BUG(args...) syslog(LOG_ERR, __FILE__ " " STRINGIZE(__LINE__) ": " args) - -static int verbose; -static char homedir[255] = ""; - -static void usage() -{ - fprintf(stdout, "HPLIP Make URI %s\n", VERSION); - fprintf(stdout, "(c) 2008 Copyright Hewlett-Packard Development Company, LP\n"); - fprintf(stdout, "usage: hp-mkuri -i ip [-p port]\n"); - fprintf(stdout, "usage: hp-mkuri -z hostname\n"); - fprintf(stdout, "usage: hp-mkuri -b busnum -d devnum\n"); - fprintf(stdout, "usage: hp-mkuri -s serialnum\n"); - fprintf(stdout, "usage: hp-mkuri -l /dev/parportx\n"); - fprintf(stdout, "usage: hp-mkuri -m hostname [-p port]\n"); - fprintf(stdout, "usage: hp-mkuri -o (probe)\n"); - fprintf(stdout, "usage: hp-mkuri -c [-n (no notifier)] (check support)\n"); - fprintf(stdout, "\nSupport matrix:\n"); - fprintf(stdout, "+--------------+---------+-----+-----------------+-----------------+\n"); - fprintf(stdout, "| return value | printer | fax | plugin_required | plugin_optional |\n"); - fprintf(stdout, "+--------------+---------+-----+-----------------+-----------------+\n"); - fprintf(stdout, "| 0 | yes | | | |\n"); - fprintf(stdout, "+--------------+---------+-----+-----------------+-----------------+\n"); - fprintf(stdout, "| 1 | * | * | * | * |\n"); - fprintf(stdout, "+--------------+---------+-----+-----------------+-----------------+\n"); - fprintf(stdout, "| 2 | yes | | yes | |\n"); - fprintf(stdout, "+--------------+---------+-----+-----------------+-----------------+\n"); - fprintf(stdout, "| 3 | yes | | | yes |\n"); - fprintf(stdout, "+--------------+---------+-----+-----------------+-----------------+\n"); - fprintf(stdout, "| 4 | yes | yes | | |\n"); - fprintf(stdout, "+--------------+---------+-----+-----------------+-----------------+\n"); - fprintf(stdout, "| 5 | yes | yes | yes | |\n"); - fprintf(stdout, "+--------------+---------+-----+-----------------+-----------------+\n"); - fprintf(stdout, "| 6 | yes | yes | | yes |\n"); - fprintf(stdout, "+--------------+---------+-----+-----------------+-----------------+\n"); - fprintf(stdout, " * no support or error\n"); -} /* usage */ - -static int GetPair(char *buf, int buf_len, char *key, char *value, char **tail) -{ - int i=0, j; - - key[0] = 0; - value[0] = 0; - - if (buf[i] == '#') - { - for (; buf[i] != '\n' && i < buf_len; i++); /* eat comment line */ - if (buf[i] == '\n') - i++; /* bump past '\n' */ - } - - j = 0; - while ((buf[i] != '=') && (i < buf_len) && (j < HPMUD_LINE_SIZE)) - key[j++] = buf[i++]; - for (j--; key[j] == ' ' && j > 0; j--); /* eat white space before = */ - key[++j] = 0; - - if (buf[i] == '=') - for (i++; buf[i] == ' ' && i < buf_len; i++); /* eat white space after = */ - - j = 0; - while ((buf[i] != '\n') && (i < buf_len) && (j < HPMUD_LINE_SIZE)) - value[j++] = buf[i++]; - for (j--; value[j] == ' ' && j > 0; j--); /* eat white space before \n */ - value[++j] = 0; - - if (buf[i] == '\n') - i++; /* bump past '\n' */ - - if (tail != NULL) - *tail = buf + i; /* tail points to next line */ - - return i; -} - -static int ReadConfig() -{ - char key[HPMUD_LINE_SIZE]; - char value[HPMUD_LINE_SIZE]; - char rcbuf[255]; - char section[32]; - char *tail; - FILE *inFile = NULL; - int stat=1; - - homedir[0] = 0; - - if((inFile = fopen(CONFDIR "/hplip.conf", "r")) == NULL) - { - BUG("unable to open %s: %m\n", CONFDIR "/hplip.conf"); - goto bugout; - } - - section[0] = 0; - - /* Read the config file */ - while ((fgets(rcbuf, sizeof(rcbuf), inFile) != NULL)) - { - if (rcbuf[0] == '[') - { - strncpy(section, rcbuf, sizeof(section)); /* found new section */ - continue; - } - - GetPair(rcbuf, strlen(rcbuf), key, value, &tail); - - if ((strncasecmp(section, "[dirs]", 6) == 0) && (strcasecmp(key, "home") == 0)) - { - strncpy(homedir, value, sizeof(homedir)); - break; /* done */ - } - } - - stat = 0; - -bugout: - if (inFile != NULL) - fclose(inFile); - - return stat; -} - -static int generalize_model(const char *sz, char *buf, int bufSize) -{ - const char *pMd=sz; - int i, j, dd=0; - - for (i=0; pMd[i] == ' ' && i < bufSize; i++); /* eat leading white space */ - - for (j=0; (pMd[i] != 0) && (pMd[i] != ';') && (j < bufSize); i++) - { - if (pMd[i]==' ' || pMd[i]=='/') - { - /* Remove double spaces. */ - if (!dd) - { - buf[j++] = '_'; /* convert space to "_" */ - dd=1; - } - } - else - { - buf[j++] = tolower(pMd[i]); - dd=0; - } - } - - for (j--; buf[j] == '_' && j > 0; j--); /* eat trailing white space */ - - buf[++j] = 0; - - return j; /* length does not include zero termination */ -} - -static int set_x_environment(void) -{ - DIR *dir=NULL; - FILE *file=NULL; - struct dirent *entry; - char path[32], line[256], cookie[128], *p; - int i, c, stat=1; - - if ((dir = opendir("/proc"))==NULL) - { - BUG("unable to open /proc: %m\n"); - goto bugout; - } - - while ((entry = readdir(dir)) != NULL) - { - if (!isdigit(*entry->d_name)) - continue; - - /* Get command line for this PID. */ - snprintf(path, sizeof(path), "/proc/%s/cmdline", entry->d_name); - if ((file = fopen(path, "r")) == NULL) - continue; - for (i=0; ((c = getc(file)) != EOF) && (i < (sizeof(line)-1)); i++) - { - if (c == 0) - c = ' '; - line[i] = c; - } - line[i]=0; - fclose(file); - if ((p = strstr(line, "-auth "))) - { - /* Found X server. */ - for (p+=6; (*p == ' ') && (*p != 0); p++); /* eat any white space before cookie */ - for (i=0; (*(p+i) != ' ') && (*(p+i) != 0) && i < (sizeof(cookie)-1); i++) - cookie[i] = *(p+i); - cookie[i]=0; - setenv("XAUTHORITY", cookie, 1); - setenv("DISPLAY", ":0.0", 1); - break; - } - } /* while ((entry = readdir(dir)) != NULL) */ - - stat = 0; - -bugout: - if (dir) - closedir(dir); - return(stat); -} /* set_x_environment */ - -static int notify(const char *summary, const char *message, int ms_timeout) -{ - void *handle=NULL, *n; - int stat=1; - - typedef void (*notify_init_t)(char *); - typedef void *(*notify_notification_new_t)(const char *, const char *, const char *, void *); - typedef void (*notify_notification_set_timeout_t)(void *, int); - typedef void (*notify_notification_show_t)(void *, char *); - - notify_init_t n_init; - notify_notification_new_t n_new; - notify_notification_set_timeout_t n_timeout; - notify_notification_show_t n_show; - - set_x_environment(); - - /* Bypass glib build dependencies by loading libnotify manually. */ - - if ((handle = load_library("libnotify.so.1")) == NULL) - { - BUG("failed to open libnotify: %m\n"); - goto bugout; - } - - if ((n_init = (notify_init_t)get_library_symbol(handle, "notify_init")) == NULL) - goto bugout; - - n_init("Basics"); - - if ((n_new = (notify_notification_new_t)get_library_symbol(handle, "notify_notification_new")) == NULL) - goto bugout; - - n = n_new(summary, message, NULL, NULL); - - if ((n_timeout = (notify_notification_set_timeout_t)get_library_symbol(handle, "notify_notification_set_timeout")) == NULL) - goto bugout; - - n_timeout(n, ms_timeout); - - if ((n_show = (notify_notification_show_t)get_library_symbol(handle, "notify_notification_show")) == NULL) - goto bugout; - - n_show(n, NULL); - - stat=0; - -bugout: - unload_library(handle); - - return stat; -} /* notify */ - -static int check_support(int send_notify) -{ - struct stat sb; - char model[256]; - int ret=1, plugin_installed=1; - const char *pm; - char m[256]; - char datfile[256]; - char value[32]; - int support, plugin, fax; - - /* Get hp model from environment variables. */ - if ((pm = getenv("hp_model"))) - { - strncpy(model, pm, sizeof(model)); - } - else - { - fprintf(stderr, "error no hp_model environment variable set\n"); - BUG("error no hp_model environment variable set\n"); - goto bugout; - } - - if (model[0]==0) - { - BUG("invalid parameter(s)\n"); - usage(); - goto bugout; - } - - generalize_model(model, m, sizeof(m)); - snprintf(model, sizeof(model), "[%s]", m); - - if (ReadConfig()) - goto bugout; - - snprintf(datfile, sizeof(datfile), "%s/data/models/models.dat", homedir); - - if (get_key_value(datfile, model, "support-type", value, sizeof(value)) != UTILS_CONF_OK) - goto bugout; - support = strtol(value, NULL, 10); - if (get_key_value(datfile, model, "plugin", value, sizeof(value)) != UTILS_CONF_OK) - goto bugout; - plugin = strtol(value, NULL, 10); - if (get_key_value(datfile, model, "fax-type", value, sizeof(value)) != UTILS_CONF_OK) - goto bugout; - fax = strtol(value, NULL, 10); - - /* See if device is supported by hplip. */ - if (support == HPMUD_SUPPORT_TYPE_NONE) - { - BUG("%s is not supported by HPLIP %s\n", pm, VERSION); - goto bugout; - } - - if (stat("/etc/udev/rules.d/86-hpmud-hp_laserjet_1018.rules", &sb) == -1) - plugin_installed=0; - - if (send_notify && !plugin_installed) - { - /* See if device requires a Plugin. */ - switch (plugin) - { - case HPMUD_PLUGIN_TYPE_REQUIRED: - BUG("%s requires a proprietary plugin\n", m); - notify(m, "requires a proprietary plugin, run hp-setup", 30000); - break; - case HPMUD_PLUGIN_TYPE_OPTIONAL: - BUG("%s has a optional proprietary plugin\n", m); - notify(m, "has a optional proprietary plugin, run hp-setup", 30000); - break; - default: - break; - } - } - - ret = 0; - if (plugin == HPMUD_PLUGIN_TYPE_REQUIRED) - ret = 2; - else if (plugin == HPMUD_PLUGIN_TYPE_OPTIONAL) - ret = 3; - if (fax > 0) - { - ret = 4; - if (plugin == HPMUD_PLUGIN_TYPE_REQUIRED) - ret = 5; - else if (plugin == HPMUD_PLUGIN_TYPE_OPTIONAL) - ret = 6; - } - -bugout: - return ret; -} /* check_support */ - -int main(int argc, char *argv[]) -{ - char ip[HPMUD_LINE_SIZE]; /* internet address */ - char bn[HPMUD_LINE_SIZE]; /* usb bus number */ - char dn[HPMUD_LINE_SIZE]; /* usb device number */ - char sn[HPMUD_LINE_SIZE]; /* usb serial number */ - char pp[HPMUD_LINE_SIZE]; /* parallel port device */ - char uri[HPMUD_LINE_SIZE]; - char host[HPMUD_LINE_SIZE]; - int i, port=1, ret=1, probe=0, support=0, send_notify=1; - enum HPMUD_RESULT stat; - char buf[HPMUD_LINE_SIZE*64]; - int cnt, bytes_read; - - ip[0] = bn[0] = dn[0] = pp[0] = uri[0] = sn[0] = host[0] = 0; - while ((i = getopt(argc, argv, "vhocni:p:b:d:l:s:z:")) != -1) - { - switch (i) - { - case 'i': - strncpy(ip, optarg, sizeof(ip)); - break; - case 'z': - strncpy(host, optarg, sizeof(host)); - break; - case 'p': - port = strtol(optarg, NULL, 10); - break; - case 'b': - strncpy(bn, optarg, sizeof(bn)); - break; - case 'd': - strncpy(dn, optarg, sizeof(dn)); - break; - case 'l': - strncpy(pp, optarg, sizeof(pp)); - break; - case 's': - strncpy(sn, optarg, sizeof(sn)); - break; - case 'o': - probe++; - break; - case 'c': - support++; - break; - case 'v': - verbose++; - break; - case 'n': - send_notify=0; - break; - case 'h': - usage(); - exit(0); - case '?': - usage(); - fprintf(stderr, "unknown argument: %s\n", argv[1]); - exit(-1); - default: - break; - } - } - - if (ip[0]==0 && (!(bn[0] && dn[0])) && pp[0]==0 && probe==0 && sn[0]==0 && support==0 && host[0]==0) - { - fprintf(stderr, "invalid command parameter(s)\n"); - usage(); - goto bugout; - } - - if (probe) - { - hpmud_probe_devices(HPMUD_BUS_ALL, buf, sizeof(buf), &cnt, &bytes_read); - if (bytes_read) - fprintf(stdout, "%s", buf); - } - -#ifdef HAVE_LIBNETSNMP - if (ip[0]) - { - stat = hpmud_make_net_uri(ip, port, uri, sizeof(uri), &bytes_read); - if (stat == HPMUD_R_OK) - { - fprintf(stdout, "%s\n", uri); - fprintf(stdout, "hpaio%s\n", &uri[2]); - } - } - if (host[0]) - { - stat = hpmud_make_mdns_uri(host, port, uri, sizeof(uri), &bytes_read); - if (stat == HPMUD_R_OK) - { - fprintf(stdout, "%s\n", uri); - fprintf(stdout, "hpaio%s\n", &uri[2]); - } - } -#endif - - if (bn[0] && dn[0]) - { - stat = hpmud_make_usb_uri(bn, dn, uri, sizeof(uri), &bytes_read); - if (stat == HPMUD_R_OK) - { - fprintf(stdout, "%s\n", uri); - fprintf(stdout, "hpaio%s\n", &uri[2]); - } - } - - if (sn[0]) - { - stat = hpmud_make_usb_serial_uri(sn, uri, sizeof(uri), &bytes_read); - if (stat == HPMUD_R_OK) - { - fprintf(stdout, "%s\n", uri); - fprintf(stdout, "hpaio%s\n", &uri[2]); - } - } - -#ifdef HAVE_PPORT - if (pp[0]) - { - stat = hpmud_make_par_uri(pp, uri, sizeof(uri), &bytes_read); - if (stat == HPMUD_R_OK) - { - fprintf(stdout, "%s\n", uri); - fprintf(stdout, "hpaio%s\n", &uri[2]); - } - } -#endif - - ret = 0; - - if (support) - ret = check_support(send_notify); - -bugout: - exit(ret); -} /* main */ diff --git a/logcapture.py b/logcapture.py index b6554145a..9f1ac30d6 100755 --- a/logcapture.py +++ b/logcapture.py @@ -32,14 +32,17 @@ import glob from base.g import * from base import utils,tui,module, os_utils - +from subprocess import Popen, PIPE CUPS_FILE='/etc/cups/cupsd.conf' CUPS_BACKUP_FILE='/etc/cups/cupsd.conf_orginal' LOG_FOLDER_PATH='./' LOG_FOLDER_NAME='hplip_troubleshoot_logs' LOG_FILES=LOG_FOLDER_PATH + LOG_FOLDER_NAME -TMP_DIR='/var/log/hp/tmp' +TMP_DIR = "/var/spool/cups/tmp" +USER_NAME ="" +USERS={} + ############ enable_log() function ############ #This function changes CUPS conf log level to debug and restarts CUPS service. @@ -149,8 +152,10 @@ def backup_clearLog(strLog): USAGE = [(__doc__, "", "name", True), - ("Usage: [su -c /sudo] %s [OPTIONS]" % __mod__, "", "summary", True), + ("Usage: [su -c /sudo] %s [USER INFO] [OPTIONS]" % __mod__, "", "summary", True), ("e.g. su -c '%s'"%__mod__,"","summary",True), + ("[USER INFO]", "", "heading", False), + ("User name for which logs to be collected:", "--user=<username> ", "option", False), utils.USAGE_OPTIONS, utils.USAGE_HELP, utils.USAGE_LOGGING1, utils.USAGE_LOGGING2, utils.USAGE_LOGGING3, @@ -160,11 +165,10 @@ USAGE = [(__doc__, "", "name", True), ######## Main ####### try: mod = module.Module(__mod__, __title__, __version__, __doc__, USAGE, - (INTERACTIVE_MODE, GUI_MODE), - (UI_TOOLKIT_QT3, UI_TOOLKIT_QT4), True, True) + (INTERACTIVE_MODE,),run_as_root_ok=True, quiet=True) opts, device_uri, printer_name, mode, ui_toolkit, loc = \ - mod.parseStdOpts('hl:g', ['help', 'help-rest', 'help-man', 'help-desc', 'logging=', 'debug'],handle_device_printer=False) + mod.parseStdOpts('hl:g', ['help', 'help-rest', 'help-man', 'help-desc', 'logging=', 'debug','user='],handle_device_printer=False) except getopt.GetoptError, e: log.error(e.msg) usage() @@ -194,11 +198,28 @@ for o, a in opts: elif o in ('-g', '--debug'): log.set_level('debug') + elif o == '--user': + USER_NAME = a + + if os.getuid() != 0: log.error("logCapture needs root permissions since cups service restart requires....") sys.exit() +if not USER_NAME: + pout = Popen(["who", "am", "i"], stdout=PIPE) + output = pout.communicate()[0] + if output: + USER_NAME = output.split(' ')[0] + + if not USER_NAME: + log.error("Failed to get the user name. Try again by passing '--user' option") + sys.exit(1) + +if not os.path.exists(TMP_DIR): + TMP_DIR = "/tmp" + cmd = "mkdir -p %s"%LOG_FILES log.debug("Creating temporary logs folder =%s"%cmd) sts, out = utils.run(cmd) @@ -206,6 +227,24 @@ if sts != 0: log.error("Failed to create directory =%s. Exiting"%LOG_FILES) sys.exit(1) +sts,out = utils.run('chmod 755 %s'%LOG_FILES) +if sts != 0: + log.error("Failed to change permissions for %s."%(LOG_FILES)) + + +USERS[USER_NAME]="/home/"+USER_NAME+"/.hplip" + +USERS['root']="/root/.hplip" +for u in USERS: + sts, out = utils.run('mkdir -p %s/%s'%(LOG_FILES,u)) + if sts != 0: + log.error("Failed to create directory =%s. Exiting"%LOG_FILES) + sys.exit(1) + + sts,out = utils.run('chmod 755 %s/%s'%(LOG_FILES,u)) + if sts != 0: + log.error("Failed to change permissions for %s/%s."%(LOG_FILES,u)) + enable_log() @@ -221,21 +260,23 @@ if ok and user_input == "y": backup_clearLog('/var/log/messages') backup_clearLog('/var/log/cups/error_log') -File_list, File_list_str =utils.expand_list('%s/*.bmp'%TMP_DIR) -if File_list: - cmd= 'rm -rf %s'%File_list_str - log.debug("cmd= %s"%cmd) - sts,out = utils.run(cmd) - if sts != 0: - log.warn("Failed to remove %s files"%File_list_st) +''' +sts = os.system('rm -f %s/hpcupsfilter*'%TMP_DIR) +if sts != 0: + log.error("Failed to remove hpcupsfilter tmp files.") -File_list, File_list_str =utils.expand_list('%s/*.out'%TMP_DIR) -if File_list: - cmd= 'rm -rf %s'%File_list_str - log.debug("cmd= %s"%cmd) - sts,out = utils.run(cmd) - if sts != 0: - log.warn("Failed to remove %s files"%File_list_st) +sts = os.system('rm -f %s/hpcups_* '%TMP_DIR) +if sts != 0: + log.error("Failed to remove hpcups tmp files.") + +sts = os.system('rm -f %s/hpliptiff*'%TMP_DIR) +if sts != 0: + log.error("Failed to remove hpliptiff tmp files.") + +sts = os.system('rm -f %s/hplipfaxLog* '%TMP_DIR) +if sts != 0: + log.error("Failed to remove hpcups tmp files.") +''' ######## Waiting for user to completed job ####### @@ -270,34 +311,20 @@ if os.path.exists('/var/log/cups/error_log'): if sts != 0: log.error("Failed to capture %s log file."%("/var/log/cups/error_log")) -File_list, File_list_str = utils.expand_list('/var/log/hp/*.log') -if File_list: - sts,out = utils.run('cp -f %s %s'%(File_list_str, LOG_FILES)) - if sts != 0: - log.error("Failed to capture %s log files."%(File_list_str)) +for u in USERS: + sts = os.system('cp -f %s/*.log %s/%s 2>/devnull '%(USERS[u],LOG_FILES,u)) + sts = os.system('cp -f %s/*.out %s/%s 2>/devnull '%(USERS[u],LOG_FILES,u)) + sts = os.system('cp -f %s/hp_* %s 2>/devnull '%(USERS[u],LOG_FILES)) -File_list, File_list_str =utils.expand_list('%s/hpcupsfilter*'%TMP_DIR) -if File_list: - sts,out = utils.run('cp -f %s %s'%(File_list_str, LOG_FILES)) - if sts != 0: - log.error("Failed to capture %s log files."%(File_list_str)) - -File_list, File_list_str =utils.expand_list('%s/hpcups_*'%TMP_DIR) -if File_list: - sts,out = utils.run('cp -f %s %s'%(File_list_str, LOG_FILES)) - if sts != 0: - log.error("Failed to capture %s log files."%(File_list_str)) +sts = os.system('cp -f %s/hp_%s_* %s 2>/devnull '%(TMP_DIR, USER_NAME, LOG_FILES)) sts,out = utils.run('mv -f ./hp-check.log %s'%LOG_FILES) if sts != 0: log.error("Failed to capture %s log files."%("./hp-check.log")) -sts,out = utils.run('chmod 755 %s'%LOG_FILES) -if sts != 0: - log.error("Failed to change permissions for %s. Only root can access."%(LOG_FILES)) -cmd = 'chmod 666 -R %s/*' % LOG_FILES +cmd = 'chmod 666 %s/*.log' % LOG_FILES sts = os_utils.execute(cmd) if sts != 0: - log.error("Failed to change permissions for %s. Only root can access."%(LOG_FILES)) + log.error("Failed to change permissions for %s."%(LOG_FILES)) ######## Compressing log files ####### cmd = 'tar -zcf %s.tar.gz %s'%(LOG_FOLDER_NAME,LOG_FILES) @@ -310,7 +337,7 @@ else: log.debug("Changing Permissions of ./%s.tar.gz "%LOG_FOLDER_NAME) sts,out = utils.run('chmod 666 -R ./%s.tar.gz'%(LOG_FOLDER_NAME)) if sts != 0: - log.error("Failed to change permissions for %s.tar.gz Only root can access."%(LOG_FILES)) + log.error("Failed to change permissions for %s.tar.gz."%(LOG_FILES)) log.debug("Removing Temporary log files..") sts,out = utils.run('rm -rf %s'%LOG_FILES) if sts != 0: diff --git a/ppd/hpcups/apollo-2100.ppd.gz b/ppd/hpcups/apollo-2100.ppd.gz Binary files differindex 2db70ed0c..b42e09dbe 100644 --- a/ppd/hpcups/apollo-2100.ppd.gz +++ b/ppd/hpcups/apollo-2100.ppd.gz diff --git a/ppd/hpcups/apollo-2150.ppd.gz b/ppd/hpcups/apollo-2150.ppd.gz Binary files differindex b4bd38f05..0f87d5011 100644 --- a/ppd/hpcups/apollo-2150.ppd.gz +++ b/ppd/hpcups/apollo-2150.ppd.gz diff --git a/ppd/hpcups/apollo-2200.ppd.gz b/ppd/hpcups/apollo-2200.ppd.gz Binary files differindex dcd628072..ee11b1d5d 100644 --- a/ppd/hpcups/apollo-2200.ppd.gz +++ b/ppd/hpcups/apollo-2200.ppd.gz diff --git a/ppd/hpcups/apollo-2500.ppd.gz b/ppd/hpcups/apollo-2500.ppd.gz Binary files differindex 4bd1f3f5c..8eb15f8b7 100644 --- a/ppd/hpcups/apollo-2500.ppd.gz +++ b/ppd/hpcups/apollo-2500.ppd.gz diff --git a/ppd/hpcups/apollo-2600.ppd.gz b/ppd/hpcups/apollo-2600.ppd.gz Binary files differindex 758a1b8bf..2e1a66ce8 100644 --- a/ppd/hpcups/apollo-2600.ppd.gz +++ b/ppd/hpcups/apollo-2600.ppd.gz diff --git a/ppd/hpcups/apollo-2650.ppd.gz b/ppd/hpcups/apollo-2650.ppd.gz Binary files differindex 93ba44198..4212342c5 100644 --- a/ppd/hpcups/apollo-2650.ppd.gz +++ b/ppd/hpcups/apollo-2650.ppd.gz diff --git a/ppd/hpcups/apollo-p2000-u.ppd.gz b/ppd/hpcups/apollo-p2000-u.ppd.gz Binary files differindex bf2790b43..f4d96006b 100644 --- a/ppd/hpcups/apollo-p2000-u.ppd.gz +++ b/ppd/hpcups/apollo-p2000-u.ppd.gz diff --git a/ppd/hpcups/apollo-p2250.ppd.gz b/ppd/hpcups/apollo-p2250.ppd.gz Binary files differindex 7a545b051..c69dcaa2b 100644 --- a/ppd/hpcups/apollo-p2250.ppd.gz +++ b/ppd/hpcups/apollo-p2250.ppd.gz diff --git a/ppd/hpcups/hp-2000c.ppd.gz b/ppd/hpcups/hp-2000c.ppd.gz Binary files differindex ee52bbb70..8c4feed3f 100644 --- a/ppd/hpcups/hp-2000c.ppd.gz +++ b/ppd/hpcups/hp-2000c.ppd.gz diff --git a/ppd/hpcups/hp-2500c.ppd.gz b/ppd/hpcups/hp-2500c.ppd.gz Binary files differindex 269bd5c2d..55d021084 100644 --- a/ppd/hpcups/hp-2500c.ppd.gz +++ b/ppd/hpcups/hp-2500c.ppd.gz diff --git a/ppd/hpcups/hp-910.ppd.gz b/ppd/hpcups/hp-910.ppd.gz Binary files differindex 33818e32d..1eea67ff1 100644 --- a/ppd/hpcups/hp-910.ppd.gz +++ b/ppd/hpcups/hp-910.ppd.gz diff --git a/ppd/hpcups/hp-915.ppd.gz b/ppd/hpcups/hp-915.ppd.gz Binary files differindex af8c11d01..c42604dc3 100644 --- a/ppd/hpcups/hp-915.ppd.gz +++ b/ppd/hpcups/hp-915.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_1000.ppd.gz b/ppd/hpcups/hp-business_inkjet_1000.ppd.gz Binary files differindex 1bd4872c5..7a1619c03 100644 --- a/ppd/hpcups/hp-business_inkjet_1000.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_1000.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_1100.ppd.gz b/ppd/hpcups/hp-business_inkjet_1100.ppd.gz Binary files differindex 12b15578c..7bcd77905 100644 --- a/ppd/hpcups/hp-business_inkjet_1100.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_1100.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_1200.ppd.gz b/ppd/hpcups/hp-business_inkjet_1200.ppd.gz Binary files differindex d8343c41c..89538617f 100644 --- a/ppd/hpcups/hp-business_inkjet_1200.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_1200.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_2200.ppd.gz b/ppd/hpcups/hp-business_inkjet_2200.ppd.gz Binary files differindex 45c79933e..38353a28f 100644 --- a/ppd/hpcups/hp-business_inkjet_2200.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_2200.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_2230.ppd.gz b/ppd/hpcups/hp-business_inkjet_2230.ppd.gz Binary files differindex f5ac19c65..b5048cb60 100644 --- a/ppd/hpcups/hp-business_inkjet_2230.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_2230.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_2250-pcl3.ppd.gz b/ppd/hpcups/hp-business_inkjet_2250-pcl3.ppd.gz Binary files differindex 68bfec264..aac5daafd 100644 --- a/ppd/hpcups/hp-business_inkjet_2250-pcl3.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_2250-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_2280-pcl3.ppd.gz b/ppd/hpcups/hp-business_inkjet_2280-pcl3.ppd.gz Binary files differindex 0fdc4b8c8..d13a73eb4 100644 --- a/ppd/hpcups/hp-business_inkjet_2280-pcl3.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_2280-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_2300-pcl3.ppd.gz b/ppd/hpcups/hp-business_inkjet_2300-pcl3.ppd.gz Binary files differindex cb5e6e60b..b65395279 100644 --- a/ppd/hpcups/hp-business_inkjet_2300-pcl3.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_2300-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_2600-pcl3.ppd.gz b/ppd/hpcups/hp-business_inkjet_2600-pcl3.ppd.gz Binary files differindex c7930739d..df1149720 100644 --- a/ppd/hpcups/hp-business_inkjet_2600-pcl3.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_2600-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_2800-pcl3.ppd.gz b/ppd/hpcups/hp-business_inkjet_2800-pcl3.ppd.gz Binary files differindex cc5591403..eefe45717 100644 --- a/ppd/hpcups/hp-business_inkjet_2800-pcl3.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_2800-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_3000-pcl3.ppd.gz b/ppd/hpcups/hp-business_inkjet_3000-pcl3.ppd.gz Binary files differindex 74096fab9..232904395 100644 --- a/ppd/hpcups/hp-business_inkjet_3000-pcl3.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_3000-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_inkjet_cp1700.ppd.gz b/ppd/hpcups/hp-color_inkjet_cp1700.ppd.gz Binary files differindex bdf2b83ee..73624c976 100644 --- a/ppd/hpcups/hp-color_inkjet_cp1700.ppd.gz +++ b/ppd/hpcups/hp-color_inkjet_cp1700.ppd.gz diff --git a/ppd/hpcups/hp-color_inkjet_printer_cp1700.ppd.gz b/ppd/hpcups/hp-color_inkjet_printer_cp1700.ppd.gz Binary files differindex 47d29eb35..8e8b6260d 100644 --- a/ppd/hpcups/hp-color_inkjet_printer_cp1700.ppd.gz +++ b/ppd/hpcups/hp-color_inkjet_printer_cp1700.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_1600.ppd.gz b/ppd/hpcups/hp-color_laserjet_1600.ppd.gz Binary files differindex febb7c93e..8213eea17 100644 --- a/ppd/hpcups/hp-color_laserjet_1600.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_1600.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_2500-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_2500-pcl3.ppd.gz Binary files differindex 2a9c4a9d5..9041d7366 100644 --- a/ppd/hpcups/hp-color_laserjet_2500-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_2500-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_2500_series.ppd.gz b/ppd/hpcups/hp-color_laserjet_2500_series.ppd.gz Binary files differindex 2de8e2dde..bfb49958f 100644 --- a/ppd/hpcups/hp-color_laserjet_2500_series.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_2500_series.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_2600n.ppd.gz b/ppd/hpcups/hp-color_laserjet_2600n.ppd.gz Binary files differindex 94919b350..62e485aa5 100644 --- a/ppd/hpcups/hp-color_laserjet_2600n.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_2600n.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_3000-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_3000-pcl3.ppd.gz Binary files differindex 615630905..850ba2ad5 100644 --- a/ppd/hpcups/hp-color_laserjet_3000-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_3000-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_3500.ppd.gz b/ppd/hpcups/hp-color_laserjet_3500.ppd.gz Binary files differindex 015315597..f4a6ddce0 100644 --- a/ppd/hpcups/hp-color_laserjet_3500.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_3500.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_3500n.ppd.gz b/ppd/hpcups/hp-color_laserjet_3500n.ppd.gz Binary files differindex e7c277477..aae3eefd7 100644 --- a/ppd/hpcups/hp-color_laserjet_3500n.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_3500n.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_3550.ppd.gz b/ppd/hpcups/hp-color_laserjet_3550.ppd.gz Binary files differindex 7baf1d327..b73ed5bf2 100644 --- a/ppd/hpcups/hp-color_laserjet_3550.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_3550.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_3550n.ppd.gz b/ppd/hpcups/hp-color_laserjet_3550n.ppd.gz Binary files differindex 89a77489e..b558dac15 100644 --- a/ppd/hpcups/hp-color_laserjet_3550n.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_3550n.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_3600.ppd.gz b/ppd/hpcups/hp-color_laserjet_3600.ppd.gz Binary files differindex 8d9a9b5cb..fe58f4440 100644 --- a/ppd/hpcups/hp-color_laserjet_3600.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_3600.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_3700-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_3700-pcl3.ppd.gz Binary files differindex b3528241c..3e77f20e1 100644 --- a/ppd/hpcups/hp-color_laserjet_3700-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_3700-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_3700n.ppd.gz b/ppd/hpcups/hp-color_laserjet_3700n.ppd.gz Binary files differindex 9e90d04a3..bb217298e 100644 --- a/ppd/hpcups/hp-color_laserjet_3700n.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_3700n.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_3800-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_3800-pcl3.ppd.gz Binary files differindex 1de49ade9..fba742bbf 100644 --- a/ppd/hpcups/hp-color_laserjet_3800-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_3800-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_4500-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4500-pcl3.ppd.gz Binary files differindex 5c01827d8..3c7db7855 100644 --- a/ppd/hpcups/hp-color_laserjet_4500-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_4500-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_4550-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4550-pcl3.ppd.gz Binary files differindex bf5501838..8b499081e 100644 --- a/ppd/hpcups/hp-color_laserjet_4550-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_4550-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_4600-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4600-pcl3.ppd.gz Binary files differindex 1e5f2f0bc..5b26195af 100644 --- a/ppd/hpcups/hp-color_laserjet_4600-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_4600-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_4600_series.ppd.gz b/ppd/hpcups/hp-color_laserjet_4600_series.ppd.gz Binary files differindex 2dd6cc8d7..f963f258c 100644 --- a/ppd/hpcups/hp-color_laserjet_4600_series.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_4600_series.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_4610-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4610-pcl3.ppd.gz Binary files differindex 9be998d94..b7a8b9a3c 100644 --- a/ppd/hpcups/hp-color_laserjet_4610-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_4610-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_4650-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4650-pcl3.ppd.gz Binary files differindex fa089d5b5..be3d5f277 100644 --- a/ppd/hpcups/hp-color_laserjet_4650-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_4650-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_4700-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4700-pcl3.ppd.gz Binary files differindex 1104b12a5..7822cdad1 100644 --- a/ppd/hpcups/hp-color_laserjet_4700-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_4700-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_4730mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4730mfp-pcl3.ppd.gz Binary files differindex 6d21d8f5a..0385d5bad 100644 --- a/ppd/hpcups/hp-color_laserjet_4730mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_4730mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_5.ppd.gz b/ppd/hpcups/hp-color_laserjet_5.ppd.gz Binary files differindex 6ae9b0674..5c494b8d4 100644 --- a/ppd/hpcups/hp-color_laserjet_5.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_5.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_5500-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_5500-pcl3.ppd.gz Binary files differindex 82130bf62..63c25a452 100644 --- a/ppd/hpcups/hp-color_laserjet_5500-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_5500-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_5550-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_5550-pcl3.ppd.gz Binary files differindex 34e19f4b9..a50b23ac8 100644 --- a/ppd/hpcups/hp-color_laserjet_5550-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_5550-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_5m-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_5m-pcl3.ppd.gz Binary files differindex 57b25bb4c..b022e031a 100644 --- a/ppd/hpcups/hp-color_laserjet_5m-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_5m-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_8500-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_8500-pcl3.ppd.gz Binary files differindex 867fab311..ba61fbdce 100644 --- a/ppd/hpcups/hp-color_laserjet_8500-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_8500-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_8550-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_8550-pcl3.ppd.gz Binary files differindex f05f86460..691276143 100644 --- a/ppd/hpcups/hp-color_laserjet_8550-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_8550-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_9500-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_9500-pcl3.ppd.gz Binary files differindex 5d21224a0..089d3153f 100644 --- a/ppd/hpcups/hp-color_laserjet_9500-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_9500-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_9500_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_9500_mfp-pcl3.ppd.gz Binary files differindex 0ffccd1f6..32bafb493 100644 --- a/ppd/hpcups/hp-color_laserjet_9500_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_9500_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz Binary files differindex 048a8f00d..985c88d5e 100644 --- a/ppd/hpcups/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd.gz Binary files differindex 698efb377..adb72a339 100644 --- a/ppd/hpcups/hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm2320_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm2320_mfp-pcl3.ppd.gz Binary files differindex 6357bde46..937b06a5b 100644 --- a/ppd/hpcups/hp-color_laserjet_cm2320_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm2320_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd.gz Binary files differindex 83d5936a8..1f8824508 100644 --- a/ppd/hpcups/hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm2320n_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm2320n_mfp-pcl3.ppd.gz Binary files differindex eb0ec066c..7b85c9519 100644 --- a/ppd/hpcups/hp-color_laserjet_cm2320n_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm2320n_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm2320nf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm2320nf_mfp-pcl3.ppd.gz Binary files differindex 6196d060f..e10018a15 100644 --- a/ppd/hpcups/hp-color_laserjet_cm2320nf_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm2320nf_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm3530_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm3530_mfp-pcl3.ppd.gz Binary files differindex af6930349..0613e1f7d 100644 --- a/ppd/hpcups/hp-color_laserjet_cm3530_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm3530_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz Binary files differindex 027e1e642..cb9418116 100644 --- a/ppd/hpcups/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm4730_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm4730_mfp-pcl3.ppd.gz Binary files differindex ff74a3c53..fa4fd01cf 100644 --- a/ppd/hpcups/hp-color_laserjet_cm4730_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm4730_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm6030_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm6030_mfp-pcl3.ppd.gz Binary files differindex 3ef09f1e7..aa7c8a265 100644 --- a/ppd/hpcups/hp-color_laserjet_cm6030_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm6030_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm6040_mfp.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm6040_mfp.ppd.gz Binary files differindex 35160245d..ec7890b8a 100644 --- a/ppd/hpcups/hp-color_laserjet_cm6040_mfp.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm6040_mfp.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm6049_mfp.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm6049_mfp.ppd.gz Binary files differindex 7a44bb7cb..1d54e1273 100644 --- a/ppd/hpcups/hp-color_laserjet_cm6049_mfp.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm6049_mfp.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp1215.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp1215.ppd.gz Binary files differindex 6d02517d2..eb3408ea9 100644 --- a/ppd/hpcups/hp-color_laserjet_cp1215.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp1215.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp1217.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp1217.ppd.gz Binary files differindex 2e819f20f..a43b6e6ee 100644 --- a/ppd/hpcups/hp-color_laserjet_cp1217.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp1217.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp1514n-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp1514n-pcl3.ppd.gz Binary files differindex 34fe92b9b..528822b81 100644 --- a/ppd/hpcups/hp-color_laserjet_cp1514n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp1514n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp1515n-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp1515n-pcl3.ppd.gz Binary files differindex 6d395ff3e..bf9f98745 100644 --- a/ppd/hpcups/hp-color_laserjet_cp1515n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp1515n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp1518ni-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp1518ni-pcl3.ppd.gz Binary files differindex 22c37afba..358a17727 100644 --- a/ppd/hpcups/hp-color_laserjet_cp1518ni-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp1518ni-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp2025-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp2025-pcl3.ppd.gz Binary files differindex ed192a83d..fcff7e6b1 100644 --- a/ppd/hpcups/hp-color_laserjet_cp2025-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp2025-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp2025dn-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp2025dn-pcl3.ppd.gz Binary files differindex c9434ac76..8d5051371 100644 --- a/ppd/hpcups/hp-color_laserjet_cp2025dn-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp2025dn-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp2025n-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp2025n-pcl3.ppd.gz Binary files differindex 457e59127..d84005ac2 100644 --- a/ppd/hpcups/hp-color_laserjet_cp2025n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp2025n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp2025x-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp2025x-pcl3.ppd.gz Binary files differindex dfd344e1b..e3aa23037 100644 --- a/ppd/hpcups/hp-color_laserjet_cp2025x-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp2025x-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp3505-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp3505-pcl3.ppd.gz Binary files differindex 897dea569..f60df9902 100644 --- a/ppd/hpcups/hp-color_laserjet_cp3505-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp3505-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp3525-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp3525-pcl3.ppd.gz Binary files differindex f8b8e2fc1..26710dee4 100644 --- a/ppd/hpcups/hp-color_laserjet_cp3525-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp3525-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp4005-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp4005-pcl3.ppd.gz Binary files differindex 07405f67b..d37456328 100644 --- a/ppd/hpcups/hp-color_laserjet_cp4005-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp4005-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp4020_series-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp4020_series-pcl3.ppd.gz Binary files differindex 29b6c73cb..e862a4ecc 100644 --- a/ppd/hpcups/hp-color_laserjet_cp4020_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp4020_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp4520_series-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp4520_series-pcl3.ppd.gz Binary files differindex 90c4d5a79..f39b6c3c4 100644 --- a/ppd/hpcups/hp-color_laserjet_cp4520_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp4520_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp5225-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp5225-pcl3.ppd.gz Binary files differindex 281e5edd8..a8ec2daa1 100644 --- a/ppd/hpcups/hp-color_laserjet_cp5225-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp5225-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp5225dn-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp5225dn-pcl3.ppd.gz Binary files differindex 834cac156..95f993825 100644 --- a/ppd/hpcups/hp-color_laserjet_cp5225dn-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp5225dn-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp5225n-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp5225n-pcl3.ppd.gz Binary files differindex 4902a40f5..a50aebd92 100644 --- a/ppd/hpcups/hp-color_laserjet_cp5225n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp5225n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz Binary files differindex 37abf8169..b52b2419e 100644 --- a/ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz Binary files differindex c85102624..2a691629c 100644 --- a/ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_pro_mfp_m176n.ppd.gz b/ppd/hpcups/hp-color_laserjet_pro_mfp_m176n.ppd.gz Binary files differnew file mode 100644 index 000000000..00a52fe8b --- /dev/null +++ b/ppd/hpcups/hp-color_laserjet_pro_mfp_m176n.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_pro_mfp_m177fw.ppd.gz b/ppd/hpcups/hp-color_laserjet_pro_mfp_m177fw.ppd.gz Binary files differnew file mode 100644 index 000000000..2e129b0d4 --- /dev/null +++ b/ppd/hpcups/hp-color_laserjet_pro_mfp_m177fw.ppd.gz diff --git a/ppd/hpcups/hp-cp1160.ppd.gz b/ppd/hpcups/hp-cp1160.ppd.gz Binary files differindex c820d9124..0411ede33 100644 --- a/ppd/hpcups/hp-cp1160.ppd.gz +++ b/ppd/hpcups/hp-cp1160.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz b/ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz Binary files differindex 6bf477fd8..44144ff6c 100644 --- a/ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1010_series.ppd.gz b/ppd/hpcups/hp-deskjet_1010_series.ppd.gz Binary files differindex c808a64a9..42c76453e 100644 --- a/ppd/hpcups/hp-deskjet_1010_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1010_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1050_j410_series.ppd.gz b/ppd/hpcups/hp-deskjet_1050_j410_series.ppd.gz Binary files differindex 66c085db5..6c3e21c43 100644 --- a/ppd/hpcups/hp-deskjet_1050_j410_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1050_j410_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1100.ppd.gz b/ppd/hpcups/hp-deskjet_1100.ppd.gz Binary files differindex 2483245fc..4a44b7737 100644 --- a/ppd/hpcups/hp-deskjet_1100.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1100.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1120.ppd.gz b/ppd/hpcups/hp-deskjet_1120.ppd.gz Binary files differindex 4788051f3..b3ed2a640 100644 --- a/ppd/hpcups/hp-deskjet_1120.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1120.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1125.ppd.gz b/ppd/hpcups/hp-deskjet_1125.ppd.gz Binary files differindex e42231257..5fd2e3e60 100644 --- a/ppd/hpcups/hp-deskjet_1125.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1125.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1200c.ppd.gz b/ppd/hpcups/hp-deskjet_1200c.ppd.gz Binary files differindex fe6e2c602..0929451df 100644 --- a/ppd/hpcups/hp-deskjet_1200c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1200c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1220c.ppd.gz b/ppd/hpcups/hp-deskjet_1220c.ppd.gz Binary files differindex 49a1d85ff..aec93e784 100644 --- a/ppd/hpcups/hp-deskjet_1220c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1220c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1280.ppd.gz b/ppd/hpcups/hp-deskjet_1280.ppd.gz Binary files differindex 5a1005aa3..b3dafda73 100644 --- a/ppd/hpcups/hp-deskjet_1280.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1280.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1510_series.ppd.gz b/ppd/hpcups/hp-deskjet_1510_series.ppd.gz Binary files differindex 1db87d751..12e3488ea 100644 --- a/ppd/hpcups/hp-deskjet_1510_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1510_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1600c.ppd.gz b/ppd/hpcups/hp-deskjet_1600c.ppd.gz Binary files differindex 7941cb006..1ae31f049 100644 --- a/ppd/hpcups/hp-deskjet_1600c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1600c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1600cm.ppd.gz b/ppd/hpcups/hp-deskjet_1600cm.ppd.gz Binary files differindex f213383e4..809700c5f 100644 --- a/ppd/hpcups/hp-deskjet_1600cm.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1600cm.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1600cn.ppd.gz b/ppd/hpcups/hp-deskjet_1600cn.ppd.gz Binary files differindex d6f0118d9..c8462fc07 100644 --- a/ppd/hpcups/hp-deskjet_1600cn.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1600cn.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2000_j210_series.ppd.gz b/ppd/hpcups/hp-deskjet_2000_j210_series.ppd.gz Binary files differindex 14014b092..204c584fc 100644 --- a/ppd/hpcups/hp-deskjet_2000_j210_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2000_j210_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2020_series.ppd.gz b/ppd/hpcups/hp-deskjet_2020_series.ppd.gz Binary files differindex 30b653f43..2fcc19a59 100644 --- a/ppd/hpcups/hp-deskjet_2020_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2020_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2050_j510_series.ppd.gz b/ppd/hpcups/hp-deskjet_2050_j510_series.ppd.gz Binary files differindex 662eea32f..d4c5bbb58 100644 --- a/ppd/hpcups/hp-deskjet_2050_j510_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2050_j510_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2510_series.ppd.gz b/ppd/hpcups/hp-deskjet_2510_series.ppd.gz Binary files differindex 445a639a3..d6a57b725 100644 --- a/ppd/hpcups/hp-deskjet_2510_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2510_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2520_series.ppd.gz b/ppd/hpcups/hp-deskjet_2520_series.ppd.gz Binary files differindex 2ea7a0a9c..11f0e0833 100644 --- a/ppd/hpcups/hp-deskjet_2520_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2520_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2540_series.ppd.gz b/ppd/hpcups/hp-deskjet_2540_series.ppd.gz Binary files differindex 371f25e05..29841e71e 100644 --- a/ppd/hpcups/hp-deskjet_2540_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2540_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2640_series.ppd.gz b/ppd/hpcups/hp-deskjet_2640_series.ppd.gz Binary files differnew file mode 100644 index 000000000..a409bee3c --- /dev/null +++ b/ppd/hpcups/hp-deskjet_2640_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz b/ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz Binary files differindex a9fe85b4c..8bfe087c4 100644 --- a/ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz b/ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz Binary files differindex d407e7e8a..c387588f0 100644 --- a/ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3050a_j611_series.ppd.gz b/ppd/hpcups/hp-deskjet_3050a_j611_series.ppd.gz Binary files differindex cf4481484..a0de65f02 100644 --- a/ppd/hpcups/hp-deskjet_3050a_j611_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3050a_j611_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3070_b611_series.ppd.gz b/ppd/hpcups/hp-deskjet_3070_b611_series.ppd.gz Binary files differindex eaba314da..3821f98a6 100644 --- a/ppd/hpcups/hp-deskjet_3070_b611_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3070_b611_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3320.ppd.gz b/ppd/hpcups/hp-deskjet_3320.ppd.gz Binary files differindex 7d600a1ba..bc563daea 100644 --- a/ppd/hpcups/hp-deskjet_3320.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3320.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3325.ppd.gz b/ppd/hpcups/hp-deskjet_3325.ppd.gz Binary files differindex f8dbc2035..6efa45db7 100644 --- a/ppd/hpcups/hp-deskjet_3325.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3325.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3420.ppd.gz b/ppd/hpcups/hp-deskjet_3420.ppd.gz Binary files differindex fdf9c5772..35cdd16ad 100644 --- a/ppd/hpcups/hp-deskjet_3420.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3420.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3425.ppd.gz b/ppd/hpcups/hp-deskjet_3425.ppd.gz Binary files differindex 8d46108b5..7c4922177 100644 --- a/ppd/hpcups/hp-deskjet_3425.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3425.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3450.ppd.gz b/ppd/hpcups/hp-deskjet_3450.ppd.gz Binary files differindex da7adbbaa..5e056a58d 100644 --- a/ppd/hpcups/hp-deskjet_3450.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3450.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3500.ppd.gz b/ppd/hpcups/hp-deskjet_3500.ppd.gz Binary files differindex c602b73b8..1a123143f 100644 --- a/ppd/hpcups/hp-deskjet_3500.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3500.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3510_series.ppd.gz b/ppd/hpcups/hp-deskjet_3510_series.ppd.gz Binary files differindex efbb8e3bf..847898240 100644 --- a/ppd/hpcups/hp-deskjet_3510_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3510_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3520_series.ppd.gz b/ppd/hpcups/hp-deskjet_3520_series.ppd.gz Binary files differindex 130f1d682..93bc5efe2 100644 --- a/ppd/hpcups/hp-deskjet_3520_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3520_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3540_series.ppd.gz b/ppd/hpcups/hp-deskjet_3540_series.ppd.gz Binary files differindex b16c266cd..8033ed020 100644 --- a/ppd/hpcups/hp-deskjet_3540_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3540_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3550.ppd.gz b/ppd/hpcups/hp-deskjet_3550.ppd.gz Binary files differindex 86085509c..efae6d3d1 100644 --- a/ppd/hpcups/hp-deskjet_3550.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3550.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3600.ppd.gz b/ppd/hpcups/hp-deskjet_3600.ppd.gz Binary files differindex 51b53331f..cf027f79a 100644 --- a/ppd/hpcups/hp-deskjet_3600.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3600.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3650.ppd.gz b/ppd/hpcups/hp-deskjet_3650.ppd.gz Binary files differindex 65d261255..47ae39e51 100644 --- a/ppd/hpcups/hp-deskjet_3650.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3650.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3740.ppd.gz b/ppd/hpcups/hp-deskjet_3740.ppd.gz Binary files differindex a077e2274..f72cfdd95 100644 --- a/ppd/hpcups/hp-deskjet_3740.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3740.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3810.ppd.gz b/ppd/hpcups/hp-deskjet_3810.ppd.gz Binary files differindex cb5fb12b4..85260d267 100644 --- a/ppd/hpcups/hp-deskjet_3810.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3810.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3816.ppd.gz b/ppd/hpcups/hp-deskjet_3816.ppd.gz Binary files differindex 99c44221b..b6c13327d 100644 --- a/ppd/hpcups/hp-deskjet_3816.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3816.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3819.ppd.gz b/ppd/hpcups/hp-deskjet_3819.ppd.gz Binary files differindex 3bf6d8d81..94b95f898 100644 --- a/ppd/hpcups/hp-deskjet_3819.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3819.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3820.ppd.gz b/ppd/hpcups/hp-deskjet_3820.ppd.gz Binary files differindex a5dd3334f..0acf94f90 100644 --- a/ppd/hpcups/hp-deskjet_3820.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3820.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3822.ppd.gz b/ppd/hpcups/hp-deskjet_3822.ppd.gz Binary files differindex 054bd7245..fb16d5c6f 100644 --- a/ppd/hpcups/hp-deskjet_3822.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3822.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3840.ppd.gz b/ppd/hpcups/hp-deskjet_3840.ppd.gz Binary files differindex 8912a5624..9020e3de4 100644 --- a/ppd/hpcups/hp-deskjet_3840.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3840.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3870.ppd.gz b/ppd/hpcups/hp-deskjet_3870.ppd.gz Binary files differindex 3be12507e..fb336d41f 100644 --- a/ppd/hpcups/hp-deskjet_3870.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3870.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3900.ppd.gz b/ppd/hpcups/hp-deskjet_3900.ppd.gz Binary files differindex c214f60d6..cbe82e46f 100644 --- a/ppd/hpcups/hp-deskjet_3900.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3900.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3910.ppd.gz b/ppd/hpcups/hp-deskjet_3910.ppd.gz Binary files differindex 7888d400b..43f0c5343 100644 --- a/ppd/hpcups/hp-deskjet_3910.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3910.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3920.ppd.gz b/ppd/hpcups/hp-deskjet_3920.ppd.gz Binary files differindex bccbe6cd7..e3f075b16 100644 --- a/ppd/hpcups/hp-deskjet_3920.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3920.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3940.ppd.gz b/ppd/hpcups/hp-deskjet_3940.ppd.gz Binary files differindex 412461c5d..65816fde1 100644 --- a/ppd/hpcups/hp-deskjet_3940.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3940.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_400.ppd.gz b/ppd/hpcups/hp-deskjet_400.ppd.gz Binary files differindex e212f0acf..392c3a11e 100644 --- a/ppd/hpcups/hp-deskjet_400.ppd.gz +++ b/ppd/hpcups/hp-deskjet_400.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_400l.ppd.gz b/ppd/hpcups/hp-deskjet_400l.ppd.gz Binary files differindex 288d1a55b..9eed41170 100644 --- a/ppd/hpcups/hp-deskjet_400l.ppd.gz +++ b/ppd/hpcups/hp-deskjet_400l.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_4510_series.ppd.gz b/ppd/hpcups/hp-deskjet_4510_series.ppd.gz Binary files differindex a7e356458..ea91bc158 100644 --- a/ppd/hpcups/hp-deskjet_4510_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_4510_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_460.ppd.gz b/ppd/hpcups/hp-deskjet_460.ppd.gz Binary files differindex 385234da2..baa5eb06f 100644 --- a/ppd/hpcups/hp-deskjet_460.ppd.gz +++ b/ppd/hpcups/hp-deskjet_460.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_4610_series.ppd.gz b/ppd/hpcups/hp-deskjet_4610_series.ppd.gz Binary files differindex c943808aa..f9689d1ec 100644 --- a/ppd/hpcups/hp-deskjet_4610_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_4610_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_4620_series.ppd.gz b/ppd/hpcups/hp-deskjet_4620_series.ppd.gz Binary files differindex 06276a00d..d3ab66e1d 100644 --- a/ppd/hpcups/hp-deskjet_4620_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_4620_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_500.ppd.gz b/ppd/hpcups/hp-deskjet_500.ppd.gz Binary files differindex d11878788..105706371 100644 --- a/ppd/hpcups/hp-deskjet_500.ppd.gz +++ b/ppd/hpcups/hp-deskjet_500.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_500c.ppd.gz b/ppd/hpcups/hp-deskjet_500c.ppd.gz Binary files differindex 0f31cf81e..36d48652e 100644 --- a/ppd/hpcups/hp-deskjet_500c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_500c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_505j.ppd.gz b/ppd/hpcups/hp-deskjet_505j.ppd.gz Binary files differindex 29f481bf4..12b4e596e 100644 --- a/ppd/hpcups/hp-deskjet_505j.ppd.gz +++ b/ppd/hpcups/hp-deskjet_505j.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_510.ppd.gz b/ppd/hpcups/hp-deskjet_510.ppd.gz Binary files differindex 327f8484e..df937969b 100644 --- a/ppd/hpcups/hp-deskjet_510.ppd.gz +++ b/ppd/hpcups/hp-deskjet_510.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5100.ppd.gz b/ppd/hpcups/hp-deskjet_5100.ppd.gz Binary files differindex 60c590e63..382dc4ec5 100644 --- a/ppd/hpcups/hp-deskjet_5100.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5100.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_520.ppd.gz b/ppd/hpcups/hp-deskjet_520.ppd.gz Binary files differindex 74c6e33c2..22a89a380 100644 --- a/ppd/hpcups/hp-deskjet_520.ppd.gz +++ b/ppd/hpcups/hp-deskjet_520.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_540.ppd.gz b/ppd/hpcups/hp-deskjet_540.ppd.gz Binary files differindex 4b4b6d9f4..00cb9aae7 100644 --- a/ppd/hpcups/hp-deskjet_540.ppd.gz +++ b/ppd/hpcups/hp-deskjet_540.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5400_series.ppd.gz b/ppd/hpcups/hp-deskjet_5400_series.ppd.gz Binary files differindex ec15e32a7..db9bf9164 100644 --- a/ppd/hpcups/hp-deskjet_5400_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5400_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_550c.ppd.gz b/ppd/hpcups/hp-deskjet_550c.ppd.gz Binary files differindex 3f82ed7b6..57be24fe9 100644 --- a/ppd/hpcups/hp-deskjet_550c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_550c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5520_series.ppd.gz b/ppd/hpcups/hp-deskjet_5520_series.ppd.gz Binary files differindex 51c9f22d7..921a39962 100644 --- a/ppd/hpcups/hp-deskjet_5520_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5520_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5550.ppd.gz b/ppd/hpcups/hp-deskjet_5550.ppd.gz Binary files differindex 9782c4a44..467dc9e33 100644 --- a/ppd/hpcups/hp-deskjet_5550.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5550.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5551.ppd.gz b/ppd/hpcups/hp-deskjet_5551.ppd.gz Binary files differindex ec7753968..8135f46cf 100644 --- a/ppd/hpcups/hp-deskjet_5551.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5551.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5552.ppd.gz b/ppd/hpcups/hp-deskjet_5552.ppd.gz Binary files differindex a26dd61db..a328b266e 100644 --- a/ppd/hpcups/hp-deskjet_5552.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5552.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5600.ppd.gz b/ppd/hpcups/hp-deskjet_5600.ppd.gz Binary files differindex d6bf1fd9f..35d7acc51 100644 --- a/ppd/hpcups/hp-deskjet_5600.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5600.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5650.ppd.gz b/ppd/hpcups/hp-deskjet_5650.ppd.gz Binary files differindex d7d04604e..f3cd4dcc8 100644 --- a/ppd/hpcups/hp-deskjet_5650.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5650.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5652.ppd.gz b/ppd/hpcups/hp-deskjet_5652.ppd.gz Binary files differindex 7b452d6fe..d68d6db15 100644 --- a/ppd/hpcups/hp-deskjet_5652.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5652.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5700.ppd.gz b/ppd/hpcups/hp-deskjet_5700.ppd.gz Binary files differindex dbc7d0fa4..f47fe0c08 100644 --- a/ppd/hpcups/hp-deskjet_5700.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5700.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5800.ppd.gz b/ppd/hpcups/hp-deskjet_5800.ppd.gz Binary files differindex 403bd08ae..1bec37b2c 100644 --- a/ppd/hpcups/hp-deskjet_5800.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5800.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5850.ppd.gz b/ppd/hpcups/hp-deskjet_5850.ppd.gz Binary files differindex bfc1f6b7b..66acb77c3 100644 --- a/ppd/hpcups/hp-deskjet_5850.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5850.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5900_series.ppd.gz b/ppd/hpcups/hp-deskjet_5900_series.ppd.gz Binary files differindex b253eb924..d7f32dfc5 100644 --- a/ppd/hpcups/hp-deskjet_5900_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5900_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_600.ppd.gz b/ppd/hpcups/hp-deskjet_600.ppd.gz Binary files differindex e8f740128..94967c6f0 100644 --- a/ppd/hpcups/hp-deskjet_600.ppd.gz +++ b/ppd/hpcups/hp-deskjet_600.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_610c.ppd.gz b/ppd/hpcups/hp-deskjet_610c.ppd.gz Binary files differindex df999cc46..db2a4db8f 100644 --- a/ppd/hpcups/hp-deskjet_610c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_610c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_610cl.ppd.gz b/ppd/hpcups/hp-deskjet_610cl.ppd.gz Binary files differindex cc90fa65d..daed18ec4 100644 --- a/ppd/hpcups/hp-deskjet_610cl.ppd.gz +++ b/ppd/hpcups/hp-deskjet_610cl.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_6120.ppd.gz b/ppd/hpcups/hp-deskjet_6120.ppd.gz Binary files differindex bb061b027..8df10adda 100644 --- a/ppd/hpcups/hp-deskjet_6120.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6120.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_6122.ppd.gz b/ppd/hpcups/hp-deskjet_6122.ppd.gz Binary files differindex e462f6ca2..65b69785e 100644 --- a/ppd/hpcups/hp-deskjet_6122.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6122.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_6127.ppd.gz b/ppd/hpcups/hp-deskjet_6127.ppd.gz Binary files differindex 33364d04a..81b90b3e0 100644 --- a/ppd/hpcups/hp-deskjet_6127.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6127.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_612c.ppd.gz b/ppd/hpcups/hp-deskjet_612c.ppd.gz Binary files differindex c7fdeefa3..fdf20b428 100644 --- a/ppd/hpcups/hp-deskjet_612c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_612c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_630c.ppd.gz b/ppd/hpcups/hp-deskjet_630c.ppd.gz Binary files differindex bafba0cee..c0c983cb9 100644 --- a/ppd/hpcups/hp-deskjet_630c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_630c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_632c.ppd.gz b/ppd/hpcups/hp-deskjet_632c.ppd.gz Binary files differindex b90bab2c9..c2c82a383 100644 --- a/ppd/hpcups/hp-deskjet_632c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_632c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_640c.ppd.gz b/ppd/hpcups/hp-deskjet_640c.ppd.gz Binary files differindex a56abdf40..d08e70686 100644 --- a/ppd/hpcups/hp-deskjet_640c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_640c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_648c.ppd.gz b/ppd/hpcups/hp-deskjet_648c.ppd.gz Binary files differindex 3fd8ad031..3894dee0b 100644 --- a/ppd/hpcups/hp-deskjet_648c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_648c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_6500.ppd.gz b/ppd/hpcups/hp-deskjet_6500.ppd.gz Binary files differindex 0ecc27cd5..2dee0b8c5 100644 --- a/ppd/hpcups/hp-deskjet_6500.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6500.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_6520_series.ppd.gz b/ppd/hpcups/hp-deskjet_6520_series.ppd.gz Binary files differindex 989826919..a8dfda4ac 100644 --- a/ppd/hpcups/hp-deskjet_6520_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6520_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_656c.ppd.gz b/ppd/hpcups/hp-deskjet_656c.ppd.gz Binary files differindex 1964ba8c2..0ca244905 100644 --- a/ppd/hpcups/hp-deskjet_656c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_656c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_660.ppd.gz b/ppd/hpcups/hp-deskjet_660.ppd.gz Binary files differindex 8ea7ac10d..3e2679695 100644 --- a/ppd/hpcups/hp-deskjet_660.ppd.gz +++ b/ppd/hpcups/hp-deskjet_660.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_6600.ppd.gz b/ppd/hpcups/hp-deskjet_6600.ppd.gz Binary files differindex 9c3fde6eb..e63bc079f 100644 --- a/ppd/hpcups/hp-deskjet_6600.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6600.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_670.ppd.gz b/ppd/hpcups/hp-deskjet_670.ppd.gz Binary files differindex ff08e8262..ffe4e7aff 100644 --- a/ppd/hpcups/hp-deskjet_670.ppd.gz +++ b/ppd/hpcups/hp-deskjet_670.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_670c.ppd.gz b/ppd/hpcups/hp-deskjet_670c.ppd.gz Binary files differindex c7f9a1f29..dbc2472e0 100644 --- a/ppd/hpcups/hp-deskjet_670c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_670c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_670tv.ppd.gz b/ppd/hpcups/hp-deskjet_670tv.ppd.gz Binary files differindex dbb7eac61..a52b30843 100644 --- a/ppd/hpcups/hp-deskjet_670tv.ppd.gz +++ b/ppd/hpcups/hp-deskjet_670tv.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_672c.ppd.gz b/ppd/hpcups/hp-deskjet_672c.ppd.gz Binary files differindex bc4df447d..31f4bd2b8 100644 --- a/ppd/hpcups/hp-deskjet_672c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_672c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_680.ppd.gz b/ppd/hpcups/hp-deskjet_680.ppd.gz Binary files differindex 9913f2306..ecf6f275e 100644 --- a/ppd/hpcups/hp-deskjet_680.ppd.gz +++ b/ppd/hpcups/hp-deskjet_680.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_6800.ppd.gz b/ppd/hpcups/hp-deskjet_6800.ppd.gz Binary files differindex d133c4446..9415f96f8 100644 --- a/ppd/hpcups/hp-deskjet_6800.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6800.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_682.ppd.gz b/ppd/hpcups/hp-deskjet_682.ppd.gz Binary files differindex 1f62366f7..be4f91e8d 100644 --- a/ppd/hpcups/hp-deskjet_682.ppd.gz +++ b/ppd/hpcups/hp-deskjet_682.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_690.ppd.gz b/ppd/hpcups/hp-deskjet_690.ppd.gz Binary files differindex b4314895f..fe116621e 100644 --- a/ppd/hpcups/hp-deskjet_690.ppd.gz +++ b/ppd/hpcups/hp-deskjet_690.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_690c.ppd.gz b/ppd/hpcups/hp-deskjet_690c.ppd.gz Binary files differindex 4f7ed9359..89d473a70 100644 --- a/ppd/hpcups/hp-deskjet_690c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_690c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_692.ppd.gz b/ppd/hpcups/hp-deskjet_692.ppd.gz Binary files differindex e8a3d0193..317130c50 100644 --- a/ppd/hpcups/hp-deskjet_692.ppd.gz +++ b/ppd/hpcups/hp-deskjet_692.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_693.ppd.gz b/ppd/hpcups/hp-deskjet_693.ppd.gz Binary files differindex 4abc846b2..10eec659d 100644 --- a/ppd/hpcups/hp-deskjet_693.ppd.gz +++ b/ppd/hpcups/hp-deskjet_693.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_694.ppd.gz b/ppd/hpcups/hp-deskjet_694.ppd.gz Binary files differindex fc3fc9661..dbaff47d0 100644 --- a/ppd/hpcups/hp-deskjet_694.ppd.gz +++ b/ppd/hpcups/hp-deskjet_694.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_6940_series.ppd.gz b/ppd/hpcups/hp-deskjet_6940_series.ppd.gz Binary files differindex 12c223553..fe2e8a4cd 100644 --- a/ppd/hpcups/hp-deskjet_6940_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6940_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_695.ppd.gz b/ppd/hpcups/hp-deskjet_695.ppd.gz Binary files differindex 08e65b407..465001262 100644 --- a/ppd/hpcups/hp-deskjet_695.ppd.gz +++ b/ppd/hpcups/hp-deskjet_695.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_697.ppd.gz b/ppd/hpcups/hp-deskjet_697.ppd.gz Binary files differindex 04e02f227..3fde68bf8 100644 --- a/ppd/hpcups/hp-deskjet_697.ppd.gz +++ b/ppd/hpcups/hp-deskjet_697.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_6980_series.ppd.gz b/ppd/hpcups/hp-deskjet_6980_series.ppd.gz Binary files differindex ec5d77842..6639d7f9f 100644 --- a/ppd/hpcups/hp-deskjet_6980_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6980_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_810c.ppd.gz b/ppd/hpcups/hp-deskjet_810c.ppd.gz Binary files differindex f37e779af..167f77474 100644 --- a/ppd/hpcups/hp-deskjet_810c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_810c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_812c.ppd.gz b/ppd/hpcups/hp-deskjet_812c.ppd.gz Binary files differindex 64ce8dc48..87f475553 100644 --- a/ppd/hpcups/hp-deskjet_812c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_812c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_815c.ppd.gz b/ppd/hpcups/hp-deskjet_815c.ppd.gz Binary files differindex b571c692b..e52fee85c 100644 --- a/ppd/hpcups/hp-deskjet_815c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_815c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_816c.ppd.gz b/ppd/hpcups/hp-deskjet_816c.ppd.gz Binary files differindex 8698dcabb..e78adb2ce 100644 --- a/ppd/hpcups/hp-deskjet_816c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_816c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_825c.ppd.gz b/ppd/hpcups/hp-deskjet_825c.ppd.gz Binary files differindex ceb90a021..e07840711 100644 --- a/ppd/hpcups/hp-deskjet_825c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_825c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_830c.ppd.gz b/ppd/hpcups/hp-deskjet_830c.ppd.gz Binary files differindex 890c06587..557b85716 100644 --- a/ppd/hpcups/hp-deskjet_830c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_830c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_832c.ppd.gz b/ppd/hpcups/hp-deskjet_832c.ppd.gz Binary files differindex cbc7519c2..f0772e125 100644 --- a/ppd/hpcups/hp-deskjet_832c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_832c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_840c.ppd.gz b/ppd/hpcups/hp-deskjet_840c.ppd.gz Binary files differindex 0ac377673..eac158049 100644 --- a/ppd/hpcups/hp-deskjet_840c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_840c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_841c.ppd.gz b/ppd/hpcups/hp-deskjet_841c.ppd.gz Binary files differindex c12ae0c51..f79b94a6d 100644 --- a/ppd/hpcups/hp-deskjet_841c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_841c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_842c.ppd.gz b/ppd/hpcups/hp-deskjet_842c.ppd.gz Binary files differindex b304cc01a..2f3c2eb6d 100644 --- a/ppd/hpcups/hp-deskjet_842c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_842c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_843c.ppd.gz b/ppd/hpcups/hp-deskjet_843c.ppd.gz Binary files differindex 6336d867d..e0758c0c4 100644 --- a/ppd/hpcups/hp-deskjet_843c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_843c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_845c.ppd.gz b/ppd/hpcups/hp-deskjet_845c.ppd.gz Binary files differindex 3adcd1813..cf34f48f8 100644 --- a/ppd/hpcups/hp-deskjet_845c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_845c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_850c.ppd.gz b/ppd/hpcups/hp-deskjet_850c.ppd.gz Binary files differindex 9eac9056a..d0aa2f689 100644 --- a/ppd/hpcups/hp-deskjet_850c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_850c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_855c.ppd.gz b/ppd/hpcups/hp-deskjet_855c.ppd.gz Binary files differindex e9125262e..294e7a03e 100644 --- a/ppd/hpcups/hp-deskjet_855c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_855c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_870c.ppd.gz b/ppd/hpcups/hp-deskjet_870c.ppd.gz Binary files differindex dd4d3fe86..da2e24e47 100644 --- a/ppd/hpcups/hp-deskjet_870c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_870c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_880c.ppd.gz b/ppd/hpcups/hp-deskjet_880c.ppd.gz Binary files differindex 6ed1bfa3b..e6bc64604 100644 --- a/ppd/hpcups/hp-deskjet_880c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_880c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_882c.ppd.gz b/ppd/hpcups/hp-deskjet_882c.ppd.gz Binary files differindex d4b30c6ce..891bf91ab 100644 --- a/ppd/hpcups/hp-deskjet_882c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_882c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_890c.ppd.gz b/ppd/hpcups/hp-deskjet_890c.ppd.gz Binary files differindex 089c0b728..02673582f 100644 --- a/ppd/hpcups/hp-deskjet_890c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_890c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_895c.ppd.gz b/ppd/hpcups/hp-deskjet_895c.ppd.gz Binary files differindex ed139d8ba..e5ea74884 100644 --- a/ppd/hpcups/hp-deskjet_895c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_895c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_916c.ppd.gz b/ppd/hpcups/hp-deskjet_916c.ppd.gz Binary files differindex 5db37246a..af602ad57 100644 --- a/ppd/hpcups/hp-deskjet_916c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_916c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_920c.ppd.gz b/ppd/hpcups/hp-deskjet_920c.ppd.gz Binary files differindex afe79d2e2..a316af2d1 100644 --- a/ppd/hpcups/hp-deskjet_920c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_920c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_9300.ppd.gz b/ppd/hpcups/hp-deskjet_9300.ppd.gz Binary files differindex 186cc7462..97f24d684 100644 --- a/ppd/hpcups/hp-deskjet_9300.ppd.gz +++ b/ppd/hpcups/hp-deskjet_9300.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_930c.ppd.gz b/ppd/hpcups/hp-deskjet_930c.ppd.gz Binary files differindex 60e25dc72..482a146be 100644 --- a/ppd/hpcups/hp-deskjet_930c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_930c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_932c.ppd.gz b/ppd/hpcups/hp-deskjet_932c.ppd.gz Binary files differindex f04f34ca7..eaf2b34a4 100644 --- a/ppd/hpcups/hp-deskjet_932c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_932c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_933c.ppd.gz b/ppd/hpcups/hp-deskjet_933c.ppd.gz Binary files differindex caf8b2a38..cc768d230 100644 --- a/ppd/hpcups/hp-deskjet_933c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_933c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_934c.ppd.gz b/ppd/hpcups/hp-deskjet_934c.ppd.gz Binary files differindex bc64e5f05..cdadea75d 100644 --- a/ppd/hpcups/hp-deskjet_934c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_934c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_935c.ppd.gz b/ppd/hpcups/hp-deskjet_935c.ppd.gz Binary files differindex 3f8cbe00a..65c63f75a 100644 --- a/ppd/hpcups/hp-deskjet_935c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_935c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_940c.ppd.gz b/ppd/hpcups/hp-deskjet_940c.ppd.gz Binary files differindex 2950d4aba..ef35b9d30 100644 --- a/ppd/hpcups/hp-deskjet_940c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_940c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_948c.ppd.gz b/ppd/hpcups/hp-deskjet_948c.ppd.gz Binary files differindex a4185b908..be140d01f 100644 --- a/ppd/hpcups/hp-deskjet_948c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_948c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_950c.ppd.gz b/ppd/hpcups/hp-deskjet_950c.ppd.gz Binary files differindex f83209830..1fdcd5a47 100644 --- a/ppd/hpcups/hp-deskjet_950c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_950c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_952c.ppd.gz b/ppd/hpcups/hp-deskjet_952c.ppd.gz Binary files differindex 89fab1f5e..036955991 100644 --- a/ppd/hpcups/hp-deskjet_952c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_952c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_955c.ppd.gz b/ppd/hpcups/hp-deskjet_955c.ppd.gz Binary files differindex 43430332e..e338e1474 100644 --- a/ppd/hpcups/hp-deskjet_955c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_955c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_957c.ppd.gz b/ppd/hpcups/hp-deskjet_957c.ppd.gz Binary files differindex 2ef9d8cab..5dec4ef7a 100644 --- a/ppd/hpcups/hp-deskjet_957c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_957c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_959c.ppd.gz b/ppd/hpcups/hp-deskjet_959c.ppd.gz Binary files differindex 2261c4edf..f077c6e07 100644 --- a/ppd/hpcups/hp-deskjet_959c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_959c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_9600.ppd.gz b/ppd/hpcups/hp-deskjet_9600.ppd.gz Binary files differindex b483c7a06..435ed1e87 100644 --- a/ppd/hpcups/hp-deskjet_9600.ppd.gz +++ b/ppd/hpcups/hp-deskjet_9600.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_960c.ppd.gz b/ppd/hpcups/hp-deskjet_960c.ppd.gz Binary files differindex cf6c705fc..cf59d5d4c 100644 --- a/ppd/hpcups/hp-deskjet_960c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_960c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_970c.ppd.gz b/ppd/hpcups/hp-deskjet_970c.ppd.gz Binary files differindex 643ac503b..431df52c7 100644 --- a/ppd/hpcups/hp-deskjet_970c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_970c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_975c.ppd.gz b/ppd/hpcups/hp-deskjet_975c.ppd.gz Binary files differindex a9b15d42c..0be7ca1f5 100644 --- a/ppd/hpcups/hp-deskjet_975c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_975c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_9800.ppd.gz b/ppd/hpcups/hp-deskjet_9800.ppd.gz Binary files differindex 4574174b8..29df5a662 100644 --- a/ppd/hpcups/hp-deskjet_9800.ppd.gz +++ b/ppd/hpcups/hp-deskjet_9800.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_980c.ppd.gz b/ppd/hpcups/hp-deskjet_980c.ppd.gz Binary files differindex 3d2272b92..274572528 100644 --- a/ppd/hpcups/hp-deskjet_980c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_980c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_990c.ppd.gz b/ppd/hpcups/hp-deskjet_990c.ppd.gz Binary files differindex 4e8f2fb8a..c5ec1c91a 100644 --- a/ppd/hpcups/hp-deskjet_990c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_990c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_995c.ppd.gz b/ppd/hpcups/hp-deskjet_995c.ppd.gz Binary files differindex f708e36ff..9377c4d2f 100644 --- a/ppd/hpcups/hp-deskjet_995c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_995c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d1300_series.ppd.gz b/ppd/hpcups/hp-deskjet_d1300_series.ppd.gz Binary files differindex f68ccd5dd..5a3a6d133 100644 --- a/ppd/hpcups/hp-deskjet_d1300_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d1300_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d1400_series.ppd.gz b/ppd/hpcups/hp-deskjet_d1400_series.ppd.gz Binary files differindex 1ff204cf4..bbf07e196 100644 --- a/ppd/hpcups/hp-deskjet_d1400_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d1400_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d1500_series.ppd.gz b/ppd/hpcups/hp-deskjet_d1500_series.ppd.gz Binary files differindex 9a6670488..68ead1194 100644 --- a/ppd/hpcups/hp-deskjet_d1500_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d1500_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d1600_series.ppd.gz b/ppd/hpcups/hp-deskjet_d1600_series.ppd.gz Binary files differindex a753e3c84..b9fa91927 100644 --- a/ppd/hpcups/hp-deskjet_d1600_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d1600_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d2300_series.ppd.gz b/ppd/hpcups/hp-deskjet_d2300_series.ppd.gz Binary files differindex c2f1635fe..1fc6a6780 100644 --- a/ppd/hpcups/hp-deskjet_d2300_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d2300_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d2400_series.ppd.gz b/ppd/hpcups/hp-deskjet_d2400_series.ppd.gz Binary files differindex c03ad5550..c9d007c0b 100644 --- a/ppd/hpcups/hp-deskjet_d2400_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d2400_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d2500_series.ppd.gz b/ppd/hpcups/hp-deskjet_d2500_series.ppd.gz Binary files differindex 5ab6a4e8b..d7b8cc78b 100644 --- a/ppd/hpcups/hp-deskjet_d2500_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d2500_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d2600_series.ppd.gz b/ppd/hpcups/hp-deskjet_d2600_series.ppd.gz Binary files differindex 1c938778c..5922f622a 100644 --- a/ppd/hpcups/hp-deskjet_d2600_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d2600_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d4100_series.ppd.gz b/ppd/hpcups/hp-deskjet_d4100_series.ppd.gz Binary files differindex dcad3ef10..904985226 100644 --- a/ppd/hpcups/hp-deskjet_d4100_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d4100_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d4200_series.ppd.gz b/ppd/hpcups/hp-deskjet_d4200_series.ppd.gz Binary files differindex 3c60ed14a..9d6186353 100644 --- a/ppd/hpcups/hp-deskjet_d4200_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d4200_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d4300_series.ppd.gz b/ppd/hpcups/hp-deskjet_d4300_series.ppd.gz Binary files differindex 411164151..50855ea9e 100644 --- a/ppd/hpcups/hp-deskjet_d4300_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d4300_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d5500_series.ppd.gz b/ppd/hpcups/hp-deskjet_d5500_series.ppd.gz Binary files differindex 1e5757184..5046993b9 100644 --- a/ppd/hpcups/hp-deskjet_d5500_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d5500_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d730.ppd.gz b/ppd/hpcups/hp-deskjet_d730.ppd.gz Binary files differindex 896b18911..ee5c76127 100644 --- a/ppd/hpcups/hp-deskjet_d730.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d730.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f2100_series.ppd.gz b/ppd/hpcups/hp-deskjet_f2100_series.ppd.gz Binary files differindex 5a55db4c1..2373cc7b0 100644 --- a/ppd/hpcups/hp-deskjet_f2100_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f2100_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f2200_series.ppd.gz b/ppd/hpcups/hp-deskjet_f2200_series.ppd.gz Binary files differindex f40111642..3d7a9d850 100644 --- a/ppd/hpcups/hp-deskjet_f2200_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f2200_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f2400_series.ppd.gz b/ppd/hpcups/hp-deskjet_f2400_series.ppd.gz Binary files differindex fa5471d93..401f3c459 100644 --- a/ppd/hpcups/hp-deskjet_f2400_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f2400_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f300_series.ppd.gz b/ppd/hpcups/hp-deskjet_f300_series.ppd.gz Binary files differindex 93a90ea68..24ada3446 100644 --- a/ppd/hpcups/hp-deskjet_f300_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f300_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f4100_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4100_series.ppd.gz Binary files differindex 87c78c8fc..eed3666ee 100644 --- a/ppd/hpcups/hp-deskjet_f4100_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f4100_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f4200_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4200_series.ppd.gz Binary files differindex 4d3dd3f5c..eb4280cea 100644 --- a/ppd/hpcups/hp-deskjet_f4200_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f4200_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f4210_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4210_series.ppd.gz Binary files differindex f97b7558c..c84193a74 100644 --- a/ppd/hpcups/hp-deskjet_f4210_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f4210_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f4213_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4213_series.ppd.gz Binary files differindex e5c4fca9d..f7ea73f44 100644 --- a/ppd/hpcups/hp-deskjet_f4213_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f4213_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f4400_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4400_series.ppd.gz Binary files differindex 8dcfdca8f..f95f6ab50 100644 --- a/ppd/hpcups/hp-deskjet_f4400_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f4400_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f4500_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4500_series.ppd.gz Binary files differindex aa8d59727..46262345c 100644 --- a/ppd/hpcups/hp-deskjet_f4500_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f4500_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f735.ppd.gz b/ppd/hpcups/hp-deskjet_f735.ppd.gz Binary files differindex 8dc25fc82..c32ad036e 100644 --- a/ppd/hpcups/hp-deskjet_f735.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f735.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_ink_adv_2010_k010.ppd.gz b/ppd/hpcups/hp-deskjet_ink_adv_2010_k010.ppd.gz Binary files differindex 8b0c16f40..8c70b3a0b 100644 --- a/ppd/hpcups/hp-deskjet_ink_adv_2010_k010.ppd.gz +++ b/ppd/hpcups/hp-deskjet_ink_adv_2010_k010.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_ink_adv_2060_k110.ppd.gz b/ppd/hpcups/hp-deskjet_ink_adv_2060_k110.ppd.gz Binary files differindex 2e522c63b..31e41a275 100644 --- a/ppd/hpcups/hp-deskjet_ink_adv_2060_k110.ppd.gz +++ b/ppd/hpcups/hp-deskjet_ink_adv_2060_k110.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_ink_advant_k109a-z.ppd.gz b/ppd/hpcups/hp-deskjet_ink_advant_k109a-z.ppd.gz Binary files differindex ebb7d7f95..f2e06c8b8 100644 --- a/ppd/hpcups/hp-deskjet_ink_advant_k109a-z.ppd.gz +++ b/ppd/hpcups/hp-deskjet_ink_advant_k109a-z.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_ink_advant_k209a-z.ppd.gz b/ppd/hpcups/hp-deskjet_ink_advant_k209a-z.ppd.gz Binary files differindex 9f1011bca..c1a3a6d8e 100644 --- a/ppd/hpcups/hp-deskjet_ink_advant_k209a-z.ppd.gz +++ b/ppd/hpcups/hp-deskjet_ink_advant_k209a-z.ppd.gz diff --git a/ppd/hpcups/hp-dj350.ppd.gz b/ppd/hpcups/hp-dj350.ppd.gz Binary files differindex 58dbf20b4..6c66520a9 100644 --- a/ppd/hpcups/hp-dj350.ppd.gz +++ b/ppd/hpcups/hp-dj350.ppd.gz diff --git a/ppd/hpcups/hp-dj450.ppd.gz b/ppd/hpcups/hp-dj450.ppd.gz Binary files differindex 6ab8f3e2e..2f322af93 100644 --- a/ppd/hpcups/hp-dj450.ppd.gz +++ b/ppd/hpcups/hp-dj450.ppd.gz diff --git a/ppd/hpcups/hp-envy_100_d410_series.ppd.gz b/ppd/hpcups/hp-envy_100_d410_series.ppd.gz Binary files differindex abceaba79..73582b3a1 100644 --- a/ppd/hpcups/hp-envy_100_d410_series.ppd.gz +++ b/ppd/hpcups/hp-envy_100_d410_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_110_series.ppd.gz b/ppd/hpcups/hp-envy_110_series.ppd.gz Binary files differindex 872108023..25e4edc85 100644 --- a/ppd/hpcups/hp-envy_110_series.ppd.gz +++ b/ppd/hpcups/hp-envy_110_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_120_series.ppd.gz b/ppd/hpcups/hp-envy_120_series.ppd.gz Binary files differindex eab1d44c6..d1d12cf55 100644 --- a/ppd/hpcups/hp-envy_120_series.ppd.gz +++ b/ppd/hpcups/hp-envy_120_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_4500_series.ppd.gz b/ppd/hpcups/hp-envy_4500_series.ppd.gz Binary files differindex a82a7b87b..bc5ece879 100644 --- a/ppd/hpcups/hp-envy_4500_series.ppd.gz +++ b/ppd/hpcups/hp-envy_4500_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_5530_series.ppd.gz b/ppd/hpcups/hp-envy_5530_series.ppd.gz Binary files differindex e9f85c607..a33e631f2 100644 --- a/ppd/hpcups/hp-envy_5530_series.ppd.gz +++ b/ppd/hpcups/hp-envy_5530_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1000.ppd.gz b/ppd/hpcups/hp-laserjet_1000.ppd.gz Binary files differindex 522c6204f..1eb4de106 100644 --- a/ppd/hpcups/hp-laserjet_1000.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1000.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1005_series.ppd.gz b/ppd/hpcups/hp-laserjet_1005_series.ppd.gz Binary files differindex 059d2001f..8dc3edfc2 100644 --- a/ppd/hpcups/hp-laserjet_1005_series.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1005_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1010.ppd.gz b/ppd/hpcups/hp-laserjet_1010.ppd.gz Binary files differindex 4cb5d34b3..a13c8dcf3 100644 --- a/ppd/hpcups/hp-laserjet_1010.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1010.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1012.ppd.gz b/ppd/hpcups/hp-laserjet_1012.ppd.gz Binary files differindex e5af2ee28..3088c8585 100644 --- a/ppd/hpcups/hp-laserjet_1012.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1012.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1015.ppd.gz b/ppd/hpcups/hp-laserjet_1015.ppd.gz Binary files differindex d536176d5..57b081de5 100644 --- a/ppd/hpcups/hp-laserjet_1015.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1015.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1018.ppd.gz b/ppd/hpcups/hp-laserjet_1018.ppd.gz Binary files differindex 86cca3450..9c0c977c2 100644 --- a/ppd/hpcups/hp-laserjet_1018.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1018.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1020.ppd.gz b/ppd/hpcups/hp-laserjet_1020.ppd.gz Binary files differindex fd5acb918..7be367bc1 100644 --- a/ppd/hpcups/hp-laserjet_1020.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1020.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1022-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1022-pcl3.ppd.gz Binary files differindex e0c24d622..23fc5f654 100644 --- a/ppd/hpcups/hp-laserjet_1022-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1022-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1022-zjs.ppd.gz b/ppd/hpcups/hp-laserjet_1022-zjs.ppd.gz Binary files differindex d13ba3ad2..08fc0893a 100644 --- a/ppd/hpcups/hp-laserjet_1022-zjs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1022-zjs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1022n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1022n-pcl3.ppd.gz Binary files differindex 156a8b562..d139bb974 100644 --- a/ppd/hpcups/hp-laserjet_1022n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1022n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1022n-zjs.ppd.gz b/ppd/hpcups/hp-laserjet_1022n-zjs.ppd.gz Binary files differindex 6e48d6309..b493739bc 100644 --- a/ppd/hpcups/hp-laserjet_1022n-zjs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1022n-zjs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1022nw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1022nw-pcl3.ppd.gz Binary files differindex bb281fd71..615f521dd 100644 --- a/ppd/hpcups/hp-laserjet_1022nw-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1022nw-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1022nw-zjs.ppd.gz b/ppd/hpcups/hp-laserjet_1022nw-zjs.ppd.gz Binary files differindex 3881bee14..c7cc94e4c 100644 --- a/ppd/hpcups/hp-laserjet_1022nw-zjs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1022nw-zjs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1100.ppd.gz b/ppd/hpcups/hp-laserjet_1100.ppd.gz Binary files differindex 4f71c2543..ebc46a2b8 100644 --- a/ppd/hpcups/hp-laserjet_1100.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1100.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1100a.ppd.gz b/ppd/hpcups/hp-laserjet_1100a.ppd.gz Binary files differindex 373276256..985a7dc3c 100644 --- a/ppd/hpcups/hp-laserjet_1100a.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1100a.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1100xi.ppd.gz b/ppd/hpcups/hp-laserjet_1100xi.ppd.gz Binary files differindex d5dc43d42..866588cc6 100644 --- a/ppd/hpcups/hp-laserjet_1100xi.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1100xi.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1150.ppd.gz b/ppd/hpcups/hp-laserjet_1150.ppd.gz Binary files differindex c0d4ac50a..365ebccfb 100644 --- a/ppd/hpcups/hp-laserjet_1150.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1150.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1160.ppd.gz b/ppd/hpcups/hp-laserjet_1160.ppd.gz Binary files differindex ba28592b1..240ad391a 100644 --- a/ppd/hpcups/hp-laserjet_1160.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1160.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1160_series.ppd.gz b/ppd/hpcups/hp-laserjet_1160_series.ppd.gz Binary files differindex 50d11f43c..1af3f9964 100644 --- a/ppd/hpcups/hp-laserjet_1160_series.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1160_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1200-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1200-pcl3.ppd.gz Binary files differindex 2e6332987..0513b355c 100644 --- a/ppd/hpcups/hp-laserjet_1200-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1200-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1200n.ppd.gz b/ppd/hpcups/hp-laserjet_1200n.ppd.gz Binary files differindex 252504a87..3bbfcffe3 100644 --- a/ppd/hpcups/hp-laserjet_1200n.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1200n.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1220-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1220-pcl3.ppd.gz Binary files differindex 2f90e4cfd..9da606b38 100644 --- a/ppd/hpcups/hp-laserjet_1220-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1220-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1220se.ppd.gz b/ppd/hpcups/hp-laserjet_1220se.ppd.gz Binary files differindex a7010f702..db40bab10 100644 --- a/ppd/hpcups/hp-laserjet_1220se.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1220se.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1300-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1300-pcl3.ppd.gz Binary files differindex bcfeabdae..0581dfdd0 100644 --- a/ppd/hpcups/hp-laserjet_1300-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1300-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1300n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1300n-pcl3.ppd.gz Binary files differindex b82c306f4..2fc95789e 100644 --- a/ppd/hpcups/hp-laserjet_1300n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1300n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1300xi-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1300xi-pcl3.ppd.gz Binary files differindex 2f1bfbdb9..8c1bee981 100644 --- a/ppd/hpcups/hp-laserjet_1300xi-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1300xi-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1320.ppd.gz b/ppd/hpcups/hp-laserjet_1320.ppd.gz Binary files differindex 247b17182..118259215 100644 --- a/ppd/hpcups/hp-laserjet_1320.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1320.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1320_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1320_series-pcl3.ppd.gz Binary files differindex be3fca69d..25975503b 100644 --- a/ppd/hpcups/hp-laserjet_1320_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1320_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1320n.ppd.gz b/ppd/hpcups/hp-laserjet_1320n.ppd.gz Binary files differindex dcf16aca4..52c4fb263 100644 --- a/ppd/hpcups/hp-laserjet_1320n.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1320n.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1320nw.ppd.gz b/ppd/hpcups/hp-laserjet_1320nw.ppd.gz Binary files differindex 8c692d38a..72f088a93 100644 --- a/ppd/hpcups/hp-laserjet_1320nw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1320nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1320tn.ppd.gz b/ppd/hpcups/hp-laserjet_1320tn.ppd.gz Binary files differindex b8c369869..43cc3b3b3 100644 --- a/ppd/hpcups/hp-laserjet_1320tn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1320tn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2100.ppd.gz b/ppd/hpcups/hp-laserjet_2100.ppd.gz Binary files differindex 539729c34..16baf305b 100644 --- a/ppd/hpcups/hp-laserjet_2100.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2100.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2100_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2100_series-pcl3.ppd.gz Binary files differindex 21a4f7741..e9dd17b34 100644 --- a/ppd/hpcups/hp-laserjet_2100_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2100_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2200-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2200-pcl3.ppd.gz Binary files differindex 87b7afbd5..91f0fc525 100644 --- a/ppd/hpcups/hp-laserjet_2200-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2200-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2200_series.ppd.gz b/ppd/hpcups/hp-laserjet_2200_series.ppd.gz Binary files differindex dcc46a294..51580759b 100644 --- a/ppd/hpcups/hp-laserjet_2200_series.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2200_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2300-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2300-pcl3.ppd.gz Binary files differindex 5ae5fa648..9a794d92c 100644 --- a/ppd/hpcups/hp-laserjet_2300-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2300-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2300_series.ppd.gz b/ppd/hpcups/hp-laserjet_2300_series.ppd.gz Binary files differindex 15b64ac5c..8fd5a925a 100644 --- a/ppd/hpcups/hp-laserjet_2300_series.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2300_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2410-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2410-pcl3.ppd.gz Binary files differindex 79a538a64..38e54345e 100644 --- a/ppd/hpcups/hp-laserjet_2410-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2410-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2420-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2420-pcl3.ppd.gz Binary files differindex 88cee1247..67a93719c 100644 --- a/ppd/hpcups/hp-laserjet_2420-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2420-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2430-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2430-pcl3.ppd.gz Binary files differindex 0b4bea784..a7f5e9131 100644 --- a/ppd/hpcups/hp-laserjet_2430-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2430-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3015-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3015-pcl3.ppd.gz Binary files differindex d8fc7d507..8f57f1ba1 100644 --- a/ppd/hpcups/hp-laserjet_3015-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3015-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3020-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3020-pcl3.ppd.gz Binary files differindex cfbf7caaf..a3bb78bf3 100644 --- a/ppd/hpcups/hp-laserjet_3020-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3020-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3030-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3030-pcl3.ppd.gz Binary files differindex a33c46e08..c80076410 100644 --- a/ppd/hpcups/hp-laserjet_3030-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3030-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3050-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3050-pcl3.ppd.gz Binary files differindex 4afb4b801..eeb15b62b 100644 --- a/ppd/hpcups/hp-laserjet_3050-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3050-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3052-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3052-pcl3.ppd.gz Binary files differindex 6ed018f4c..aea5735bf 100644 --- a/ppd/hpcups/hp-laserjet_3052-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3052-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3055.ppd.gz b/ppd/hpcups/hp-laserjet_3055.ppd.gz Binary files differindex aa6ea54e4..07ba6e725 100644 --- a/ppd/hpcups/hp-laserjet_3055.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3055.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3100.ppd.gz b/ppd/hpcups/hp-laserjet_3100.ppd.gz Binary files differindex b28cc5cc6..f425be173 100644 --- a/ppd/hpcups/hp-laserjet_3100.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3100.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3150.ppd.gz b/ppd/hpcups/hp-laserjet_3150.ppd.gz Binary files differindex 50bf7ddff..2eb0a1869 100644 --- a/ppd/hpcups/hp-laserjet_3150.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3150.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3200.ppd.gz b/ppd/hpcups/hp-laserjet_3200.ppd.gz Binary files differindex b9ebba6d7..1fb3d342c 100644 --- a/ppd/hpcups/hp-laserjet_3200.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3200.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3200m-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3200m-pcl3.ppd.gz Binary files differindex 36209ca53..eb7521c3c 100644 --- a/ppd/hpcups/hp-laserjet_3200m-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3200m-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3200se.ppd.gz b/ppd/hpcups/hp-laserjet_3200se.ppd.gz Binary files differindex e179d8370..5e5c9a038 100644 --- a/ppd/hpcups/hp-laserjet_3200se.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3200se.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3300_3310_3320-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3300_3310_3320-pcl3.ppd.gz Binary files differindex 9d89036ee..d84ed6d25 100644 --- a/ppd/hpcups/hp-laserjet_3300_3310_3320-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3300_3310_3320-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3330.ppd.gz b/ppd/hpcups/hp-laserjet_3330.ppd.gz Binary files differindex 045734600..f1c20eae6 100644 --- a/ppd/hpcups/hp-laserjet_3330.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3330.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3380-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3380-pcl3.ppd.gz Binary files differindex 220d3c0ec..7574ea06f 100644 --- a/ppd/hpcups/hp-laserjet_3380-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3380-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3390-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3390-pcl3.ppd.gz Binary files differindex f22abb402..88217f976 100644 --- a/ppd/hpcups/hp-laserjet_3390-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3390-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3392.ppd.gz b/ppd/hpcups/hp-laserjet_3392.ppd.gz Binary files differindex 45e7d9edc..9a5e3d5f3 100644 --- a/ppd/hpcups/hp-laserjet_3392.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3392.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4000_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4000_series-pcl3.ppd.gz Binary files differindex eda7958d8..30ef53c6d 100644 --- a/ppd/hpcups/hp-laserjet_4000_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4000_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4050_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4050_series-pcl3.ppd.gz Binary files differindex 022a15f79..ecc53824b 100644 --- a/ppd/hpcups/hp-laserjet_4050_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4050_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4100_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4100_mfp-pcl3.ppd.gz Binary files differindex 90fdd8540..b39c0325b 100644 --- a/ppd/hpcups/hp-laserjet_4100_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4100_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4100_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4100_series-pcl3.ppd.gz Binary files differindex 7cffdad15..ec92f091e 100644 --- a/ppd/hpcups/hp-laserjet_4100_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4100_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4150_series.ppd.gz b/ppd/hpcups/hp-laserjet_4150_series.ppd.gz Binary files differindex ad4d4e5a7..b559811de 100644 --- a/ppd/hpcups/hp-laserjet_4150_series.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4150_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4200-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4200-pcl3.ppd.gz Binary files differindex 10e5fff5d..e4cd2972d 100644 --- a/ppd/hpcups/hp-laserjet_4200-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4200-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4240-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4240-pcl3.ppd.gz Binary files differindex 2f2582f1c..9599ee447 100644 --- a/ppd/hpcups/hp-laserjet_4240-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4240-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4250-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4250-pcl3.ppd.gz Binary files differindex 5cbea6c13..9595d7cc3 100644 --- a/ppd/hpcups/hp-laserjet_4250-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4250-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4300-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4300-pcl3.ppd.gz Binary files differindex 52b958612..68199231e 100644 --- a/ppd/hpcups/hp-laserjet_4300-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4300-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4345_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4345_mfp-pcl3.ppd.gz Binary files differindex e2a47c66c..e8a178f03 100644 --- a/ppd/hpcups/hp-laserjet_4345_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4345_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4350-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4350-pcl3.ppd.gz Binary files differindex d02800a8c..ca5de266a 100644 --- a/ppd/hpcups/hp-laserjet_4350-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4350-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4_plus-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4_plus-pcl3.ppd.gz Binary files differindex 716a44613..4510dce66 100644 --- a/ppd/hpcups/hp-laserjet_4_plus-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4_plus-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4l.ppd.gz b/ppd/hpcups/hp-laserjet_4l.ppd.gz Binary files differindex a41cc0397..54ff4ab27 100644 --- a/ppd/hpcups/hp-laserjet_4l.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4l.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4ml.ppd.gz b/ppd/hpcups/hp-laserjet_4ml.ppd.gz Binary files differindex 49c9c14f6..0855fee3d 100644 --- a/ppd/hpcups/hp-laserjet_4ml.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4ml.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4mp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4mp-pcl3.ppd.gz Binary files differindex 0690a5908..c7d127fde 100644 --- a/ppd/hpcups/hp-laserjet_4mp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4mp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4si-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4si-pcl3.ppd.gz Binary files differindex c105eb3dc..8fc65aa60 100644 --- a/ppd/hpcups/hp-laserjet_4si-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4si-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4v-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4v-pcl3.ppd.gz Binary files differindex 7d5d4c712..b1ec6a345 100644 --- a/ppd/hpcups/hp-laserjet_4v-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4v-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5000.ppd.gz b/ppd/hpcups/hp-laserjet_5000.ppd.gz Binary files differindex e01967768..0612c534d 100644 --- a/ppd/hpcups/hp-laserjet_5000.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5000.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5000_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5000_series-pcl3.ppd.gz Binary files differindex b7966f3c7..cec1764db 100644 --- a/ppd/hpcups/hp-laserjet_5000_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5000_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5100_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5100_series-pcl3.ppd.gz Binary files differindex 189d8cb27..436d51ad0 100644 --- a/ppd/hpcups/hp-laserjet_5100_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5100_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5200-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5200-pcl3.ppd.gz Binary files differindex 3f397b334..74de1ab6c 100644 --- a/ppd/hpcups/hp-laserjet_5200-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5200-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5200l-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5200l-pcl3.ppd.gz Binary files differindex 3e003b09c..58deab796 100644 --- a/ppd/hpcups/hp-laserjet_5200l-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5200l-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5200lx.ppd.gz b/ppd/hpcups/hp-laserjet_5200lx.ppd.gz Binary files differindex 34fd2bd96..5ec419f5c 100644 --- a/ppd/hpcups/hp-laserjet_5200lx.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5200lx.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5l.ppd.gz b/ppd/hpcups/hp-laserjet_5l.ppd.gz Binary files differindex e74df0abe..a32b1fe65 100644 --- a/ppd/hpcups/hp-laserjet_5l.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5l.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5mp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5mp-pcl3.ppd.gz Binary files differindex f43317609..1cfff5430 100644 --- a/ppd/hpcups/hp-laserjet_5mp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5mp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5p.ppd.gz b/ppd/hpcups/hp-laserjet_5p.ppd.gz Binary files differindex c6c61876e..f803996eb 100644 --- a/ppd/hpcups/hp-laserjet_5p.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5p.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5si-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5si-pcl3.ppd.gz Binary files differindex 7aaf02e07..06c4d6ce6 100644 --- a/ppd/hpcups/hp-laserjet_5si-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5si-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5si_mopier-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5si_mopier-pcl3.ppd.gz Binary files differindex 52351c651..e02a2e5c1 100644 --- a/ppd/hpcups/hp-laserjet_5si_mopier-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5si_mopier-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_6l.ppd.gz b/ppd/hpcups/hp-laserjet_6l.ppd.gz Binary files differindex 1dfc3cfd1..0682c3c8c 100644 --- a/ppd/hpcups/hp-laserjet_6l.ppd.gz +++ b/ppd/hpcups/hp-laserjet_6l.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_6mp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_6mp-pcl3.ppd.gz Binary files differindex 8b5f2b15c..8ed0d05e1 100644 --- a/ppd/hpcups/hp-laserjet_6mp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_6mp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_6p.ppd.gz b/ppd/hpcups/hp-laserjet_6p.ppd.gz Binary files differindex c875230af..3021e524c 100644 --- a/ppd/hpcups/hp-laserjet_6p.ppd.gz +++ b/ppd/hpcups/hp-laserjet_6p.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_8000.ppd.gz b/ppd/hpcups/hp-laserjet_8000.ppd.gz Binary files differindex 57363706b..aaa872a26 100644 --- a/ppd/hpcups/hp-laserjet_8000.ppd.gz +++ b/ppd/hpcups/hp-laserjet_8000.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_8000_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_8000_series-pcl3.ppd.gz Binary files differindex f5ea3aedb..224bb06a4 100644 --- a/ppd/hpcups/hp-laserjet_8000_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_8000_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_8100_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_8100_mfp.ppd.gz Binary files differindex f71164fda..40249eb9a 100644 --- a/ppd/hpcups/hp-laserjet_8100_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_8100_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_8100_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_8100_series-pcl3.ppd.gz Binary files differindex 22ed4d9b9..b892bd250 100644 --- a/ppd/hpcups/hp-laserjet_8100_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_8100_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_8150_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_8150_mfp.ppd.gz Binary files differindex bf042f47f..4d0bbdb21 100644 --- a/ppd/hpcups/hp-laserjet_8150_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_8150_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_8150_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_8150_series-pcl3.ppd.gz Binary files differindex 70aeb7188..f4c54776d 100644 --- a/ppd/hpcups/hp-laserjet_8150_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_8150_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_9000_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9000_mfp-pcl3.ppd.gz Binary files differindex c88ae56cf..5aeec720a 100644 --- a/ppd/hpcups/hp-laserjet_9000_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_9000_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_9000_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9000_series-pcl3.ppd.gz Binary files differindex dfc84f8be..8e8357f77 100644 --- a/ppd/hpcups/hp-laserjet_9000_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_9000_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_9040-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9040-pcl3.ppd.gz Binary files differindex 2304f5570..597684519 100644 --- a/ppd/hpcups/hp-laserjet_9040-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_9040-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_9040_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9040_mfp-pcl3.ppd.gz Binary files differindex 7f4d53da5..43cc464f2 100644 --- a/ppd/hpcups/hp-laserjet_9040_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_9040_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_9050-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9050-pcl3.ppd.gz Binary files differindex 885b05e86..3a0062a63 100644 --- a/ppd/hpcups/hp-laserjet_9050-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_9050-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_9050_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9050_mfp-pcl3.ppd.gz Binary files differindex ca2a1c843..77510df7d 100644 --- a/ppd/hpcups/hp-laserjet_9050_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_9050_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_9055mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9055mfp-pcl3.ppd.gz Binary files differindex 9f6f83e0f..4e1074c21 100644 --- a/ppd/hpcups/hp-laserjet_9055mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_9055mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_9065mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9065mfp-pcl3.ppd.gz Binary files differindex f397e112e..d7a6c6bbe 100644 --- a/ppd/hpcups/hp-laserjet_9065mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_9065mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1411fn-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1411fn-pcl3.ppd.gz Binary files differindex 52bfbb19e..d44d15351 100644 --- a/ppd/hpcups/hp-laserjet_cm1411fn-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cm1411fn-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1412fn-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1412fn-pcl3.ppd.gz Binary files differindex 4f0b02e41..69f3ab37e 100644 --- a/ppd/hpcups/hp-laserjet_cm1412fn-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cm1412fn-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1413fn-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1413fn-pcl3.ppd.gz Binary files differindex e712449aa..9d6596682 100644 --- a/ppd/hpcups/hp-laserjet_cm1413fn-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cm1413fn-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1415fn-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1415fn-pcl3.ppd.gz Binary files differindex 61223ab26..f34a6c47d 100644 --- a/ppd/hpcups/hp-laserjet_cm1415fn-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cm1415fn-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1415fnw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1415fnw-pcl3.ppd.gz Binary files differindex 50781dcf0..3ad7ff92a 100644 --- a/ppd/hpcups/hp-laserjet_cm1415fnw-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cm1415fnw-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1416fnw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1416fnw-pcl3.ppd.gz Binary files differindex 8d1150a4d..acee820d8 100644 --- a/ppd/hpcups/hp-laserjet_cm1416fnw-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cm1416fnw-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1417fnw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1417fnw-pcl3.ppd.gz Binary files differindex 572c81fc7..2f301b8d1 100644 --- a/ppd/hpcups/hp-laserjet_cm1417fnw-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cm1417fnw-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz Binary files differindex a266cb7ef..48f27d8c3 100644 --- a/ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cp1025.ppd.gz b/ppd/hpcups/hp-laserjet_cp1025.ppd.gz Binary files differindex 945ce678b..67ce9e57e 100644 --- a/ppd/hpcups/hp-laserjet_cp1025.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cp1025.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz b/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz Binary files differindex b94b7a302..eecdd6170 100644 --- a/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cp_1025.ppd.gz b/ppd/hpcups/hp-laserjet_cp_1025.ppd.gz Binary files differindex b61eb9552..3f26c8473 100644 --- a/ppd/hpcups/hp-laserjet_cp_1025.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cp_1025.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz b/ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz Binary files differindex 4c3610d50..72f33d74f 100644 --- a/ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1005.ppd.gz b/ppd/hpcups/hp-laserjet_m1005.ppd.gz Binary files differindex f9e8548af..eb801ce53 100644 --- a/ppd/hpcups/hp-laserjet_m1005.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1005.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1120_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_m1120_mfp.ppd.gz Binary files differindex cf43ef05f..d8ee51c91 100644 --- a/ppd/hpcups/hp-laserjet_m1120_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1120_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1120n_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_m1120n_mfp.ppd.gz Binary files differindex 0cb2b1e12..0fc8f47b9 100644 --- a/ppd/hpcups/hp-laserjet_m1120n_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1120n_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1319f_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_m1319f_mfp.ppd.gz Binary files differindex 6586daf1e..1f03094af 100644 --- a/ppd/hpcups/hp-laserjet_m1319f_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1319f_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz Binary files differindex 2a5db2464..012092c5e 100644 --- a/ppd/hpcups/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz Binary files differindex afad2b7c0..6b7c854f6 100644 --- a/ppd/hpcups/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz Binary files differindex 3421c655c..872bfe1d6 100644 --- a/ppd/hpcups/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz Binary files differindex 53e7681ca..b8d565876 100644 --- a/ppd/hpcups/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m2727_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m2727_mfp-pcl3.ppd.gz Binary files differindex 96269171a..d035a2bc5 100644 --- a/ppd/hpcups/hp-laserjet_m2727_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m2727_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m3027_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m3027_mfp-pcl3.ppd.gz Binary files differindex 16c513c2e..a617a5186 100644 --- a/ppd/hpcups/hp-laserjet_m3027_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m3027_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m3035_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m3035_mfp-pcl3.ppd.gz Binary files differindex 990287276..9fd0c5306 100644 --- a/ppd/hpcups/hp-laserjet_m3035_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m3035_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m4345_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m4345_mfp-pcl3.ppd.gz Binary files differindex 134b8cfe4..20deaeb5c 100644 --- a/ppd/hpcups/hp-laserjet_m4345_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m4345_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m4349_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m4349_mfp-pcl3.ppd.gz Binary files differindex c85c7392f..ec31a6931 100644 --- a/ppd/hpcups/hp-laserjet_m4349_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m4349_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m5025_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m5025_mfp-pcl3.ppd.gz Binary files differindex 9bc4f5286..6d0255645 100644 --- a/ppd/hpcups/hp-laserjet_m5025_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m5025_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m5035_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m5035_mfp-pcl3.ppd.gz Binary files differindex e8006bfd2..350e83613 100644 --- a/ppd/hpcups/hp-laserjet_m5035_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m5035_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz Binary files differindex 91f49a39d..57f939707 100644 --- a/ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m9040_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m9040_mfp-pcl3.ppd.gz Binary files differindex 690242e1f..5380877fa 100644 --- a/ppd/hpcups/hp-laserjet_m9040_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m9040_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m9050_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m9050_mfp-pcl3.ppd.gz Binary files differindex 114dbdc5f..8bc8360fc 100644 --- a/ppd/hpcups/hp-laserjet_m9050_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m9050_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m9059_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m9059_mfp-pcl3.ppd.gz Binary files differindex 3fb7194b0..668778134 100644 --- a/ppd/hpcups/hp-laserjet_m9059_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m9059_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1005.ppd.gz b/ppd/hpcups/hp-laserjet_p1005.ppd.gz Binary files differindex cf3055820..4d0a146e4 100644 --- a/ppd/hpcups/hp-laserjet_p1005.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p1005.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1006.ppd.gz b/ppd/hpcups/hp-laserjet_p1006.ppd.gz Binary files differindex 3f903a0fe..59c2d6c7e 100644 --- a/ppd/hpcups/hp-laserjet_p1006.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p1006.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1007.ppd.gz b/ppd/hpcups/hp-laserjet_p1007.ppd.gz Binary files differindex e19f91954..7fdd02417 100644 --- a/ppd/hpcups/hp-laserjet_p1007.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p1007.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1008.ppd.gz b/ppd/hpcups/hp-laserjet_p1008.ppd.gz Binary files differindex e07b9a48e..e61565c5f 100644 --- a/ppd/hpcups/hp-laserjet_p1008.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p1008.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1009.ppd.gz b/ppd/hpcups/hp-laserjet_p1009.ppd.gz Binary files differindex 54c6e24dd..05d4c1fb9 100644 --- a/ppd/hpcups/hp-laserjet_p1009.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p1009.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1505.ppd.gz b/ppd/hpcups/hp-laserjet_p1505.ppd.gz Binary files differindex c8e1d52c7..b46e410f5 100644 --- a/ppd/hpcups/hp-laserjet_p1505.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p1505.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1505n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p1505n-pcl3.ppd.gz Binary files differindex ff87a6a0a..0fe63d2b8 100644 --- a/ppd/hpcups/hp-laserjet_p1505n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p1505n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1505n-zxs.ppd.gz b/ppd/hpcups/hp-laserjet_p1505n-zxs.ppd.gz Binary files differindex 2125ff770..bad97d5a2 100644 --- a/ppd/hpcups/hp-laserjet_p1505n-zxs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p1505n-zxs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2014-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2014-pcl3.ppd.gz Binary files differindex a3bb43020..e9f6ac401 100644 --- a/ppd/hpcups/hp-laserjet_p2014-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2014-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2014-zxs.ppd.gz b/ppd/hpcups/hp-laserjet_p2014-zxs.ppd.gz Binary files differindex 75e4e4ab5..62ec4325d 100644 --- a/ppd/hpcups/hp-laserjet_p2014-zxs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2014-zxs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2014n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2014n-pcl3.ppd.gz Binary files differindex 012b8d9c0..bdd6feda8 100644 --- a/ppd/hpcups/hp-laserjet_p2014n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2014n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2014n-zxs.ppd.gz b/ppd/hpcups/hp-laserjet_p2014n-zxs.ppd.gz Binary files differindex 08d2bdd91..236fbbdc6 100644 --- a/ppd/hpcups/hp-laserjet_p2014n-zxs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2014n-zxs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2015_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2015_series-pcl3.ppd.gz Binary files differindex 9fe556882..d97fdc2ce 100644 --- a/ppd/hpcups/hp-laserjet_p2015_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2015_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2015d_series.ppd.gz b/ppd/hpcups/hp-laserjet_p2015d_series.ppd.gz Binary files differindex 03fd18cc7..939b505ea 100644 --- a/ppd/hpcups/hp-laserjet_p2015d_series.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2015d_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2015dn_series.ppd.gz b/ppd/hpcups/hp-laserjet_p2015dn_series.ppd.gz Binary files differindex 83464bb24..8b1ee86cb 100644 --- a/ppd/hpcups/hp-laserjet_p2015dn_series.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2015dn_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2015n_series.ppd.gz b/ppd/hpcups/hp-laserjet_p2015n_series.ppd.gz Binary files differindex 3097e6f44..ffd1e3711 100644 --- a/ppd/hpcups/hp-laserjet_p2015n_series.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2015n_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2015x_series.ppd.gz b/ppd/hpcups/hp-laserjet_p2015x_series.ppd.gz Binary files differindex aa4cbc98f..5c53b3e7e 100644 --- a/ppd/hpcups/hp-laserjet_p2015x_series.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2015x_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2035-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2035-pcl3.ppd.gz Binary files differindex 078af6972..fa7a1ad30 100644 --- a/ppd/hpcups/hp-laserjet_p2035-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2035-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2035-zjs.ppd.gz b/ppd/hpcups/hp-laserjet_p2035-zjs.ppd.gz Binary files differindex 13ee573bc..c330d2981 100644 --- a/ppd/hpcups/hp-laserjet_p2035-zjs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2035-zjs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2035n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2035n-pcl3.ppd.gz Binary files differindex 43795764a..242629fe2 100644 --- a/ppd/hpcups/hp-laserjet_p2035n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2035n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2035n-zjs.ppd.gz b/ppd/hpcups/hp-laserjet_p2035n-zjs.ppd.gz Binary files differindex f8262ff4a..7c1c4b8c9 100644 --- a/ppd/hpcups/hp-laserjet_p2035n-zjs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2035n-zjs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2055-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2055-pcl3.ppd.gz Binary files differindex e30a0bfab..2264058a0 100644 --- a/ppd/hpcups/hp-laserjet_p2055-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2055-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2055d-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2055d-pcl3.ppd.gz Binary files differindex 18b982309..55c100081 100644 --- a/ppd/hpcups/hp-laserjet_p2055d-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2055d-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2055dn-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2055dn-pcl3.ppd.gz Binary files differindex 69829b29c..bbc7ca76b 100644 --- a/ppd/hpcups/hp-laserjet_p2055dn-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2055dn-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2055x-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2055x-pcl3.ppd.gz Binary files differindex 898215c33..c54c8d457 100644 --- a/ppd/hpcups/hp-laserjet_p2055x-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2055x-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p3004-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p3004-pcl3.ppd.gz Binary files differindex 257b8e2b2..df5e608d8 100644 --- a/ppd/hpcups/hp-laserjet_p3004-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p3004-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p3005-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p3005-pcl3.ppd.gz Binary files differindex 63b544913..03515cd3c 100644 --- a/ppd/hpcups/hp-laserjet_p3005-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p3005-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p3010_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p3010_series-pcl3.ppd.gz Binary files differindex 13a5e73f7..5fdaa7565 100644 --- a/ppd/hpcups/hp-laserjet_p3010_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p3010_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4014.ppd.gz b/ppd/hpcups/hp-laserjet_p4014.ppd.gz Binary files differindex e88aaf2b6..c40a40b5a 100644 --- a/ppd/hpcups/hp-laserjet_p4014.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4014.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4014dn.ppd.gz b/ppd/hpcups/hp-laserjet_p4014dn.ppd.gz Binary files differindex 1b3357c5e..03a741fd6 100644 --- a/ppd/hpcups/hp-laserjet_p4014dn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4014dn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4014n.ppd.gz b/ppd/hpcups/hp-laserjet_p4014n.ppd.gz Binary files differindex b547374a3..d62494dfc 100644 --- a/ppd/hpcups/hp-laserjet_p4014n.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4014n.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4015.ppd.gz b/ppd/hpcups/hp-laserjet_p4015.ppd.gz Binary files differindex e6cd13067..280cf0067 100644 --- a/ppd/hpcups/hp-laserjet_p4015.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4015.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4015dn.ppd.gz b/ppd/hpcups/hp-laserjet_p4015dn.ppd.gz Binary files differindex 908f49436..8f83a6084 100644 --- a/ppd/hpcups/hp-laserjet_p4015dn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4015dn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4015n.ppd.gz b/ppd/hpcups/hp-laserjet_p4015n.ppd.gz Binary files differindex 4e083abc5..4ff74775f 100644 --- a/ppd/hpcups/hp-laserjet_p4015n.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4015n.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4015tn.ppd.gz b/ppd/hpcups/hp-laserjet_p4015tn.ppd.gz Binary files differindex b5084f45d..38a3e446e 100644 --- a/ppd/hpcups/hp-laserjet_p4015tn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4015tn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4015x.ppd.gz b/ppd/hpcups/hp-laserjet_p4015x.ppd.gz Binary files differindex 76905d09c..79a2ed4e3 100644 --- a/ppd/hpcups/hp-laserjet_p4015x.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4015x.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4515.ppd.gz b/ppd/hpcups/hp-laserjet_p4515.ppd.gz Binary files differindex b2e447213..0c74d8a81 100644 --- a/ppd/hpcups/hp-laserjet_p4515.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4515.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4515n.ppd.gz b/ppd/hpcups/hp-laserjet_p4515n.ppd.gz Binary files differindex da3d9adbd..f870597cc 100644 --- a/ppd/hpcups/hp-laserjet_p4515n.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4515n.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4515tn.ppd.gz b/ppd/hpcups/hp-laserjet_p4515tn.ppd.gz Binary files differindex 1b5461510..db4ebb717 100644 --- a/ppd/hpcups/hp-laserjet_p4515tn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4515tn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4515x.ppd.gz b/ppd/hpcups/hp-laserjet_p4515x.ppd.gz Binary files differindex da1729a4f..4e48790e0 100644 --- a/ppd/hpcups/hp-laserjet_p4515x.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4515x.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4515xm.ppd.gz b/ppd/hpcups/hp-laserjet_p4515xm.ppd.gz Binary files differindex e000bf196..f77be38fd 100644 --- a/ppd/hpcups/hp-laserjet_p4515xm.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4515xm.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz Binary files differnew file mode 100644 index 000000000..90706e149 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz Binary files differnew file mode 100644 index 000000000..9dadabce3 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz Binary files differindex 69b0aa21b..352967f7c 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz Binary files differindex 185508076..9d6ab70b6 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1137_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1137_mfp.ppd.gz Binary files differindex e30ccd9ae..48c1685b9 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1137_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1137_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1138_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1138_mfp.ppd.gz Binary files differindex 555328d73..125f14ecb 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1138_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1138_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1139_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1139_mfp.ppd.gz Binary files differindex 3a814d465..684faa487 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1139_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1139_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz Binary files differindex d15087aac..d1d6d1417 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz Binary files differindex d5a80604c..1ce84d745 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1214nfh_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1214nfh_mfp.ppd.gz Binary files differindex 7597a786e..6b8f4dae6 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1214nfh_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1214nfh_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1216nfh_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1216nfh_mfp.ppd.gz Binary files differindex 7dceff396..a0610bfd0 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1216nfh_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1216nfh_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz Binary files differindex 22aa27ca3..4c49e5980 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1218nfg_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1218nfg_mfp.ppd.gz Binary files differindex 324303deb..b476a472d 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1218nfg_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1218nfg_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1218nfs_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1218nfs_mfp.ppd.gz Binary files differindex 0a66a41e3..eaab7498a 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1218nfs_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1218nfs_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1219nf_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1219nf_mfp.ppd.gz Binary files differindex 6380db481..8d26514d9 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1219nf_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1219nf_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1219nfg_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1219nfg_mfp.ppd.gz Binary files differindex 0f52d2e45..289920443 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1219nfg_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1219nfg_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1219nfs_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1219nfs_mfp.ppd.gz Binary files differindex a3ac05cb5..9a12fdf72 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1219nfs_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1219nfs_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz Binary files differindex 82f017f35..c8d81a964 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz Binary files differindex 5de0ce31e..3c9fc27c2 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1106.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1106.ppd.gz Binary files differindex 97a0066f6..064e750c2 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1106.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1106.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1106w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1106w.ppd.gz Binary files differindex 2b5755169..312af1f7e 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1106w.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1106w.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1107.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1107.ppd.gz Binary files differindex 7a1117403..5301e9c8c 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1107.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1107.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1107w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1107w.ppd.gz Binary files differindex 8deb69986..29b460094 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1107w.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1107w.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1108.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1108.ppd.gz Binary files differindex 94d834271..1bd2d6640 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1108.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1108.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1108w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1108w.ppd.gz Binary files differindex 864974a2b..6df7acdf1 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1108w.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1108w.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1109.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1109.ppd.gz Binary files differindex 69e18f07f..fc6a6b4c2 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1109.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1109.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1109w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1109w.ppd.gz Binary files differindex 6caa50aac..0c1124f73 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1109w.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1109w.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz Binary files differindex 7cfebfab3..ab1c63ce3 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1567.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1567.ppd.gz Binary files differindex bd11c7ee8..dcb456332 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1567.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1567.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1568.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1568.ppd.gz Binary files differindex 97cc9f286..4126afa7d 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1568.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1568.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1569.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1569.ppd.gz Binary files differindex 3f4012c0e..e6a22336e 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1569.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1569.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz Binary files differindex f27a8a8ed..82fd59712 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz Binary files differindex 197854d55..ed8cfbafa 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz Binary files differindex 2b5d780b2..36ac714d1 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz Binary files differindex 030059086..5dd063b7d 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz Binary files differindex 11eb9c730..9b96fb578 100644 --- a/ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz diff --git a/ppd/hpcups/hp-mopier_240-pcl3.ppd.gz b/ppd/hpcups/hp-mopier_240-pcl3.ppd.gz Binary files differindex 824398211..b93c85fe4 100644 --- a/ppd/hpcups/hp-mopier_240-pcl3.ppd.gz +++ b/ppd/hpcups/hp-mopier_240-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-mopier_320-pcl3.ppd.gz b/ppd/hpcups/hp-mopier_320-pcl3.ppd.gz Binary files differindex e5fa50b54..ce7727ff9 100644 --- a/ppd/hpcups/hp-mopier_320-pcl3.ppd.gz +++ b/ppd/hpcups/hp-mopier_320-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-officejet.ppd.gz b/ppd/hpcups/hp-officejet.ppd.gz Binary files differindex 140d56fa5..b6ecf46b1 100644 --- a/ppd/hpcups/hp-officejet.ppd.gz +++ b/ppd/hpcups/hp-officejet.ppd.gz diff --git a/ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz b/ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz Binary files differindex 9d23c2965..9829c6137 100644 --- a/ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz +++ b/ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz diff --git a/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz b/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz Binary files differindex 2329a0924..bb270543a 100644 --- a/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz +++ b/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz diff --git a/ppd/hpcups/hp-officejet_2620_series.ppd.gz b/ppd/hpcups/hp-officejet_2620_series.ppd.gz Binary files differnew file mode 100644 index 000000000..2df5d6392 --- /dev/null +++ b/ppd/hpcups/hp-officejet_2620_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4000_k210.ppd.gz b/ppd/hpcups/hp-officejet_4000_k210.ppd.gz Binary files differindex 44652803f..81427f6bc 100644 --- a/ppd/hpcups/hp-officejet_4000_k210.ppd.gz +++ b/ppd/hpcups/hp-officejet_4000_k210.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4100_series.ppd.gz b/ppd/hpcups/hp-officejet_4100_series.ppd.gz Binary files differindex 4eea58b6f..5997e7605 100644 --- a/ppd/hpcups/hp-officejet_4100_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_4100_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4105.ppd.gz b/ppd/hpcups/hp-officejet_4105.ppd.gz Binary files differindex 8b55e2e4a..00842c746 100644 --- a/ppd/hpcups/hp-officejet_4105.ppd.gz +++ b/ppd/hpcups/hp-officejet_4105.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4115_series.ppd.gz b/ppd/hpcups/hp-officejet_4115_series.ppd.gz Binary files differindex cebed268c..030691a31 100644 --- a/ppd/hpcups/hp-officejet_4115_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_4115_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4200_series.ppd.gz b/ppd/hpcups/hp-officejet_4200_series.ppd.gz Binary files differindex cbb9d4ab1..9a98ec4d1 100644 --- a/ppd/hpcups/hp-officejet_4200_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_4200_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4255.ppd.gz b/ppd/hpcups/hp-officejet_4255.ppd.gz Binary files differindex 08c2af247..ddc9a9335 100644 --- a/ppd/hpcups/hp-officejet_4255.ppd.gz +++ b/ppd/hpcups/hp-officejet_4255.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4300_series.ppd.gz b/ppd/hpcups/hp-officejet_4300_series.ppd.gz Binary files differindex 8424cc6c0..0e38d151b 100644 --- a/ppd/hpcups/hp-officejet_4300_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_4300_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4400_k410.ppd.gz b/ppd/hpcups/hp-officejet_4400_k410.ppd.gz Binary files differindex 68e8a7bd3..adc36dcd1 100644 --- a/ppd/hpcups/hp-officejet_4400_k410.ppd.gz +++ b/ppd/hpcups/hp-officejet_4400_k410.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4500_g510a-f.ppd.gz b/ppd/hpcups/hp-officejet_4500_g510a-f.ppd.gz Binary files differindex c87a7b979..3b91f09b0 100644 --- a/ppd/hpcups/hp-officejet_4500_g510a-f.ppd.gz +++ b/ppd/hpcups/hp-officejet_4500_g510a-f.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4500_g510g-m.ppd.gz b/ppd/hpcups/hp-officejet_4500_g510g-m.ppd.gz Binary files differindex 08c06d1e5..99715acc8 100644 --- a/ppd/hpcups/hp-officejet_4500_g510g-m.ppd.gz +++ b/ppd/hpcups/hp-officejet_4500_g510g-m.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4500_g510n-z.ppd.gz b/ppd/hpcups/hp-officejet_4500_g510n-z.ppd.gz Binary files differindex 69c7c9264..30788967e 100644 --- a/ppd/hpcups/hp-officejet_4500_g510n-z.ppd.gz +++ b/ppd/hpcups/hp-officejet_4500_g510n-z.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4500_k710.ppd.gz b/ppd/hpcups/hp-officejet_4500_k710.ppd.gz Binary files differindex b84672a7a..f873717fd 100644 --- a/ppd/hpcups/hp-officejet_4500_k710.ppd.gz +++ b/ppd/hpcups/hp-officejet_4500_k710.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4610_series.ppd.gz b/ppd/hpcups/hp-officejet_4610_series.ppd.gz Binary files differindex ca3d97875..ecb5d477d 100644 --- a/ppd/hpcups/hp-officejet_4610_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_4610_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4620_series.ppd.gz b/ppd/hpcups/hp-officejet_4620_series.ppd.gz Binary files differindex 62d9ba633..fc01c4ae3 100644 --- a/ppd/hpcups/hp-officejet_4620_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_4620_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4630_series.ppd.gz b/ppd/hpcups/hp-officejet_4630_series.ppd.gz Binary files differindex fd918d39a..daad25f5d 100644 --- a/ppd/hpcups/hp-officejet_4630_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_4630_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_5100_series.ppd.gz b/ppd/hpcups/hp-officejet_5100_series.ppd.gz Binary files differindex 769456872..4b53e73b6 100644 --- a/ppd/hpcups/hp-officejet_5100_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_5100_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_5105.ppd.gz b/ppd/hpcups/hp-officejet_5105.ppd.gz Binary files differindex 61eb2c66f..eaf94989d 100644 --- a/ppd/hpcups/hp-officejet_5105.ppd.gz +++ b/ppd/hpcups/hp-officejet_5105.ppd.gz diff --git a/ppd/hpcups/hp-officejet_5110.ppd.gz b/ppd/hpcups/hp-officejet_5110.ppd.gz Binary files differindex 1fc9aca71..5c83dfb94 100644 --- a/ppd/hpcups/hp-officejet_5110.ppd.gz +++ b/ppd/hpcups/hp-officejet_5110.ppd.gz diff --git a/ppd/hpcups/hp-officejet_5110v.ppd.gz b/ppd/hpcups/hp-officejet_5110v.ppd.gz Binary files differindex ad490f556..da0dc5499 100644 --- a/ppd/hpcups/hp-officejet_5110v.ppd.gz +++ b/ppd/hpcups/hp-officejet_5110v.ppd.gz diff --git a/ppd/hpcups/hp-officejet_5500_series.ppd.gz b/ppd/hpcups/hp-officejet_5500_series.ppd.gz Binary files differindex a2dfaa254..6ce28bbc3 100644 --- a/ppd/hpcups/hp-officejet_5500_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_5500_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_5600_series.ppd.gz b/ppd/hpcups/hp-officejet_5600_series.ppd.gz Binary files differindex c3e83e720..486cc8120 100644 --- a/ppd/hpcups/hp-officejet_5600_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_5600_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6000_e609a.ppd.gz b/ppd/hpcups/hp-officejet_6000_e609a.ppd.gz Binary files differindex 139538d68..ad60116d4 100644 --- a/ppd/hpcups/hp-officejet_6000_e609a.ppd.gz +++ b/ppd/hpcups/hp-officejet_6000_e609a.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6000_e609n.ppd.gz b/ppd/hpcups/hp-officejet_6000_e609n.ppd.gz Binary files differindex 21608ce58..b750122ec 100644 --- a/ppd/hpcups/hp-officejet_6000_e609n.ppd.gz +++ b/ppd/hpcups/hp-officejet_6000_e609n.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6100.ppd.gz b/ppd/hpcups/hp-officejet_6100.ppd.gz Binary files differindex ecab43392..a2e06d534 100644 --- a/ppd/hpcups/hp-officejet_6100.ppd.gz +++ b/ppd/hpcups/hp-officejet_6100.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6100_series.ppd.gz b/ppd/hpcups/hp-officejet_6100_series.ppd.gz Binary files differindex 30e1eefd8..a553f1cb0 100644 --- a/ppd/hpcups/hp-officejet_6100_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_6100_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6150_series.ppd.gz b/ppd/hpcups/hp-officejet_6150_series.ppd.gz Binary files differindex 75d885e60..e17105a50 100644 --- a/ppd/hpcups/hp-officejet_6150_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_6150_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6200_series.ppd.gz b/ppd/hpcups/hp-officejet_6200_series.ppd.gz Binary files differindex 6a0eb0520..73848ce49 100644 --- a/ppd/hpcups/hp-officejet_6200_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_6200_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6300_series.ppd.gz b/ppd/hpcups/hp-officejet_6300_series.ppd.gz Binary files differindex 60a1961a7..d50197225 100644 --- a/ppd/hpcups/hp-officejet_6300_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_6300_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6500_e709a.ppd.gz b/ppd/hpcups/hp-officejet_6500_e709a.ppd.gz Binary files differindex f9644c3c1..8ff5d338a 100644 --- a/ppd/hpcups/hp-officejet_6500_e709a.ppd.gz +++ b/ppd/hpcups/hp-officejet_6500_e709a.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6500_e709n.ppd.gz b/ppd/hpcups/hp-officejet_6500_e709n.ppd.gz Binary files differindex 79b899a5c..65db39879 100644 --- a/ppd/hpcups/hp-officejet_6500_e709n.ppd.gz +++ b/ppd/hpcups/hp-officejet_6500_e709n.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6500_e710a-f.ppd.gz b/ppd/hpcups/hp-officejet_6500_e710a-f.ppd.gz Binary files differindex d2d8a2947..9421dc9ed 100644 --- a/ppd/hpcups/hp-officejet_6500_e710a-f.ppd.gz +++ b/ppd/hpcups/hp-officejet_6500_e710a-f.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6500_e710n-z.ppd.gz b/ppd/hpcups/hp-officejet_6500_e710n-z.ppd.gz Binary files differindex f5dd1ff9e..86348d3d0 100644 --- a/ppd/hpcups/hp-officejet_6500_e710n-z.ppd.gz +++ b/ppd/hpcups/hp-officejet_6500_e710n-z.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6600.ppd.gz b/ppd/hpcups/hp-officejet_6600.ppd.gz Binary files differindex 8b0cb5cec..8cc124333 100644 --- a/ppd/hpcups/hp-officejet_6600.ppd.gz +++ b/ppd/hpcups/hp-officejet_6600.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6700.ppd.gz b/ppd/hpcups/hp-officejet_6700.ppd.gz Binary files differindex 2f412abf6..2ef9dd4ea 100644 --- a/ppd/hpcups/hp-officejet_6700.ppd.gz +++ b/ppd/hpcups/hp-officejet_6700.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7000_e809a.ppd.gz b/ppd/hpcups/hp-officejet_7000_e809a.ppd.gz Binary files differindex 5552a90f3..649dc96be 100644 --- a/ppd/hpcups/hp-officejet_7000_e809a.ppd.gz +++ b/ppd/hpcups/hp-officejet_7000_e809a.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7000_e809a_series.ppd.gz b/ppd/hpcups/hp-officejet_7000_e809a_series.ppd.gz Binary files differindex 466ea5de9..e386ef918 100644 --- a/ppd/hpcups/hp-officejet_7000_e809a_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7000_e809a_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7100_series.ppd.gz b/ppd/hpcups/hp-officejet_7100_series.ppd.gz Binary files differindex 0550d8b08..d626808f0 100644 --- a/ppd/hpcups/hp-officejet_7100_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7100_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7110_series.ppd.gz b/ppd/hpcups/hp-officejet_7110_series.ppd.gz Binary files differindex 81bca91bb..db8ae2a0c 100644 --- a/ppd/hpcups/hp-officejet_7110_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7110_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7200_series.ppd.gz b/ppd/hpcups/hp-officejet_7200_series.ppd.gz Binary files differindex 5aab67687..0fe72055d 100644 --- a/ppd/hpcups/hp-officejet_7200_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7200_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7300_series.ppd.gz b/ppd/hpcups/hp-officejet_7300_series.ppd.gz Binary files differindex e5a583fd1..7292f7980 100644 --- a/ppd/hpcups/hp-officejet_7300_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7300_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7400_series.ppd.gz b/ppd/hpcups/hp-officejet_7400_series.ppd.gz Binary files differindex 4022e1c17..6543c12d9 100644 --- a/ppd/hpcups/hp-officejet_7400_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7400_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7500_e910.ppd.gz b/ppd/hpcups/hp-officejet_7500_e910.ppd.gz Binary files differindex 17db64ebc..4d28f92b1 100644 --- a/ppd/hpcups/hp-officejet_7500_e910.ppd.gz +++ b/ppd/hpcups/hp-officejet_7500_e910.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7610_series.ppd.gz b/ppd/hpcups/hp-officejet_7610_series.ppd.gz Binary files differindex 01aa438f4..8b69b26f7 100644 --- a/ppd/hpcups/hp-officejet_7610_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7610_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_9100_series-pcl3.ppd.gz b/ppd/hpcups/hp-officejet_9100_series-pcl3.ppd.gz Binary files differindex 2c7ec1558..a4cde5045 100644 --- a/ppd/hpcups/hp-officejet_9100_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-officejet_9100_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-officejet_d_series.ppd.gz b/ppd/hpcups/hp-officejet_d_series.ppd.gz Binary files differindex eaa800824..e93e1ceb9 100644 --- a/ppd/hpcups/hp-officejet_d_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_d_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_g55.ppd.gz b/ppd/hpcups/hp-officejet_g55.ppd.gz Binary files differindex a1ac828b0..556507cbc 100644 --- a/ppd/hpcups/hp-officejet_g55.ppd.gz +++ b/ppd/hpcups/hp-officejet_g55.ppd.gz diff --git a/ppd/hpcups/hp-officejet_g55xi.ppd.gz b/ppd/hpcups/hp-officejet_g55xi.ppd.gz Binary files differindex 919a80eeb..6debda53e 100644 --- a/ppd/hpcups/hp-officejet_g55xi.ppd.gz +++ b/ppd/hpcups/hp-officejet_g55xi.ppd.gz diff --git a/ppd/hpcups/hp-officejet_g85.ppd.gz b/ppd/hpcups/hp-officejet_g85.ppd.gz Binary files differindex 45410b528..bc99d7840 100644 --- a/ppd/hpcups/hp-officejet_g85.ppd.gz +++ b/ppd/hpcups/hp-officejet_g85.ppd.gz diff --git a/ppd/hpcups/hp-officejet_g85xi.ppd.gz b/ppd/hpcups/hp-officejet_g85xi.ppd.gz Binary files differindex 6810e4c22..46b8969ad 100644 --- a/ppd/hpcups/hp-officejet_g85xi.ppd.gz +++ b/ppd/hpcups/hp-officejet_g85xi.ppd.gz diff --git a/ppd/hpcups/hp-officejet_g95.ppd.gz b/ppd/hpcups/hp-officejet_g95.ppd.gz Binary files differindex a0a23dc02..77246cf50 100644 --- a/ppd/hpcups/hp-officejet_g95.ppd.gz +++ b/ppd/hpcups/hp-officejet_g95.ppd.gz diff --git a/ppd/hpcups/hp-officejet_h470.ppd.gz b/ppd/hpcups/hp-officejet_h470.ppd.gz Binary files differindex ee589a979..6c9c39016 100644 --- a/ppd/hpcups/hp-officejet_h470.ppd.gz +++ b/ppd/hpcups/hp-officejet_h470.ppd.gz diff --git a/ppd/hpcups/hp-officejet_j3500_series.ppd.gz b/ppd/hpcups/hp-officejet_j3500_series.ppd.gz Binary files differindex 02db0f076..27676236b 100644 --- a/ppd/hpcups/hp-officejet_j3500_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_j3500_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_j3600_series.ppd.gz b/ppd/hpcups/hp-officejet_j3600_series.ppd.gz Binary files differindex 7537e6c58..1c7ed905c 100644 --- a/ppd/hpcups/hp-officejet_j3600_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_j3600_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_j4500_series.ppd.gz b/ppd/hpcups/hp-officejet_j4500_series.ppd.gz Binary files differindex 8d0360745..c92f5d271 100644 --- a/ppd/hpcups/hp-officejet_j4500_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_j4500_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_j4660_series.ppd.gz b/ppd/hpcups/hp-officejet_j4660_series.ppd.gz Binary files differindex 265bcea3f..2be5aa187 100644 --- a/ppd/hpcups/hp-officejet_j4660_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_j4660_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_j4680_series.ppd.gz b/ppd/hpcups/hp-officejet_j4680_series.ppd.gz Binary files differindex f09cbb918..a6841bffd 100644 --- a/ppd/hpcups/hp-officejet_j4680_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_j4680_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_j5500_series.ppd.gz b/ppd/hpcups/hp-officejet_j5500_series.ppd.gz Binary files differindex 12f517c5e..784f30df5 100644 --- a/ppd/hpcups/hp-officejet_j5500_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_j5500_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_j5700_series.ppd.gz b/ppd/hpcups/hp-officejet_j5700_series.ppd.gz Binary files differindex e71b85f95..784a05eac 100644 --- a/ppd/hpcups/hp-officejet_j5700_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_j5700_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_j6400_series.ppd.gz b/ppd/hpcups/hp-officejet_j6400_series.ppd.gz Binary files differindex d80f37e4d..8d5bb9df4 100644 --- a/ppd/hpcups/hp-officejet_j6400_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_j6400_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_k60.ppd.gz b/ppd/hpcups/hp-officejet_k60.ppd.gz Binary files differindex 5f29fc67b..3c1cebfb3 100644 --- a/ppd/hpcups/hp-officejet_k60.ppd.gz +++ b/ppd/hpcups/hp-officejet_k60.ppd.gz diff --git a/ppd/hpcups/hp-officejet_k60xi.ppd.gz b/ppd/hpcups/hp-officejet_k60xi.ppd.gz Binary files differindex 425433f1a..5dd878d07 100644 --- a/ppd/hpcups/hp-officejet_k60xi.ppd.gz +++ b/ppd/hpcups/hp-officejet_k60xi.ppd.gz diff --git a/ppd/hpcups/hp-officejet_k7100.ppd.gz b/ppd/hpcups/hp-officejet_k7100.ppd.gz Binary files differindex cc0f0c9cd..5aa767dfc 100644 --- a/ppd/hpcups/hp-officejet_k7100.ppd.gz +++ b/ppd/hpcups/hp-officejet_k7100.ppd.gz diff --git a/ppd/hpcups/hp-officejet_k80.ppd.gz b/ppd/hpcups/hp-officejet_k80.ppd.gz Binary files differindex 105aeeaa3..776c9b1d9 100644 --- a/ppd/hpcups/hp-officejet_k80.ppd.gz +++ b/ppd/hpcups/hp-officejet_k80.ppd.gz diff --git a/ppd/hpcups/hp-officejet_k80xi.ppd.gz b/ppd/hpcups/hp-officejet_k80xi.ppd.gz Binary files differindex 53f79d90c..71d5879ed 100644 --- a/ppd/hpcups/hp-officejet_k80xi.ppd.gz +++ b/ppd/hpcups/hp-officejet_k80xi.ppd.gz diff --git a/ppd/hpcups/hp-officejet_lx.ppd.gz b/ppd/hpcups/hp-officejet_lx.ppd.gz Binary files differindex ae1e7a186..e1e152de5 100644 --- a/ppd/hpcups/hp-officejet_lx.ppd.gz +++ b/ppd/hpcups/hp-officejet_lx.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_1150c.ppd.gz b/ppd/hpcups/hp-officejet_pro_1150c.ppd.gz Binary files differindex ac7c6e48a..0878ae5cb 100644 --- a/ppd/hpcups/hp-officejet_pro_1150c.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_1150c.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_1170c_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_1170c_series.ppd.gz Binary files differindex 2b192f2c6..fe809f546 100644 --- a/ppd/hpcups/hp-officejet_pro_1170c_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_1170c_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_3610.ppd.gz b/ppd/hpcups/hp-officejet_pro_3610.ppd.gz Binary files differindex a6b39a440..d18c2303a 100644 --- a/ppd/hpcups/hp-officejet_pro_3610.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_3610.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_3620.ppd.gz b/ppd/hpcups/hp-officejet_pro_3620.ppd.gz Binary files differindex 79c3f5fe4..d147058a7 100644 --- a/ppd/hpcups/hp-officejet_pro_3620.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_3620.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8000_a809.ppd.gz b/ppd/hpcups/hp-officejet_pro_8000_a809.ppd.gz Binary files differindex 4fbc7a03b..aabaa810f 100644 --- a/ppd/hpcups/hp-officejet_pro_8000_a809.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8000_a809.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8100.ppd.gz b/ppd/hpcups/hp-officejet_pro_8100.ppd.gz Binary files differindex 666f90afc..059e6a9e5 100644 --- a/ppd/hpcups/hp-officejet_pro_8100.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8100.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8500_a909a.ppd.gz b/ppd/hpcups/hp-officejet_pro_8500_a909a.ppd.gz Binary files differindex f35dade6d..96254be82 100644 --- a/ppd/hpcups/hp-officejet_pro_8500_a909a.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8500_a909a.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8500_a909g.ppd.gz b/ppd/hpcups/hp-officejet_pro_8500_a909g.ppd.gz Binary files differindex e26e30619..c541ee0e5 100644 --- a/ppd/hpcups/hp-officejet_pro_8500_a909g.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8500_a909g.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8500_a909n.ppd.gz b/ppd/hpcups/hp-officejet_pro_8500_a909n.ppd.gz Binary files differindex e2d9210ca..2b5f00caa 100644 --- a/ppd/hpcups/hp-officejet_pro_8500_a909n.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8500_a909n.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8500_a910.ppd.gz b/ppd/hpcups/hp-officejet_pro_8500_a910.ppd.gz Binary files differindex 0d27a6e7d..56510ad54 100644 --- a/ppd/hpcups/hp-officejet_pro_8500_a910.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8500_a910.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8600.ppd.gz b/ppd/hpcups/hp-officejet_pro_8600.ppd.gz Binary files differindex 14ebdadd8..11735620f 100644 --- a/ppd/hpcups/hp-officejet_pro_8600.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8600.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_k5300.ppd.gz b/ppd/hpcups/hp-officejet_pro_k5300.ppd.gz Binary files differindex 78e589237..a82acd65e 100644 --- a/ppd/hpcups/hp-officejet_pro_k5300.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_k5300.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_k5400.ppd.gz b/ppd/hpcups/hp-officejet_pro_k5400.ppd.gz Binary files differindex f42518311..984d1efb7 100644 --- a/ppd/hpcups/hp-officejet_pro_k5400.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_k5400.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_k550.ppd.gz b/ppd/hpcups/hp-officejet_pro_k550.ppd.gz Binary files differindex 23b82f288..0948fb332 100644 --- a/ppd/hpcups/hp-officejet_pro_k550.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_k550.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_k850.ppd.gz b/ppd/hpcups/hp-officejet_pro_k850.ppd.gz Binary files differindex 0f7d8d39e..1c51e7b98 100644 --- a/ppd/hpcups/hp-officejet_pro_k850.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_k850.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_k8600.ppd.gz b/ppd/hpcups/hp-officejet_pro_k8600.ppd.gz Binary files differindex 9dcaa1d69..882fcdec4 100644 --- a/ppd/hpcups/hp-officejet_pro_k8600.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_k8600.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_l7300.ppd.gz b/ppd/hpcups/hp-officejet_pro_l7300.ppd.gz Binary files differindex 4ec167649..aa0d77585 100644 --- a/ppd/hpcups/hp-officejet_pro_l7300.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_l7300.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_l7400.ppd.gz b/ppd/hpcups/hp-officejet_pro_l7400.ppd.gz Binary files differindex 6a227e704..fe460fe4b 100644 --- a/ppd/hpcups/hp-officejet_pro_l7400.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_l7400.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_l7500.ppd.gz b/ppd/hpcups/hp-officejet_pro_l7500.ppd.gz Binary files differindex 1fb6fda5f..a8c445d63 100644 --- a/ppd/hpcups/hp-officejet_pro_l7500.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_l7500.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_l7600.ppd.gz b/ppd/hpcups/hp-officejet_pro_l7600.ppd.gz Binary files differindex 3cc430a41..4b57ad709 100644 --- a/ppd/hpcups/hp-officejet_pro_l7600.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_l7600.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_l7700.ppd.gz b/ppd/hpcups/hp-officejet_pro_l7700.ppd.gz Binary files differindex ca041b36a..bd63ca3ca 100644 --- a/ppd/hpcups/hp-officejet_pro_l7700.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_l7700.ppd.gz diff --git a/ppd/hpcups/hp-officejet_r40.ppd.gz b/ppd/hpcups/hp-officejet_r40.ppd.gz Binary files differindex 74b32b328..acd72be8b 100644 --- a/ppd/hpcups/hp-officejet_r40.ppd.gz +++ b/ppd/hpcups/hp-officejet_r40.ppd.gz diff --git a/ppd/hpcups/hp-officejet_r40xi.ppd.gz b/ppd/hpcups/hp-officejet_r40xi.ppd.gz Binary files differindex 15a3e16ad..0e6bfde9e 100644 --- a/ppd/hpcups/hp-officejet_r40xi.ppd.gz +++ b/ppd/hpcups/hp-officejet_r40xi.ppd.gz diff --git a/ppd/hpcups/hp-officejet_r45.ppd.gz b/ppd/hpcups/hp-officejet_r45.ppd.gz Binary files differindex 79f15f9ad..8dd3dd923 100644 --- a/ppd/hpcups/hp-officejet_r45.ppd.gz +++ b/ppd/hpcups/hp-officejet_r45.ppd.gz diff --git a/ppd/hpcups/hp-officejet_r60.ppd.gz b/ppd/hpcups/hp-officejet_r60.ppd.gz Binary files differindex 256061320..ef77e0622 100644 --- a/ppd/hpcups/hp-officejet_r60.ppd.gz +++ b/ppd/hpcups/hp-officejet_r60.ppd.gz diff --git a/ppd/hpcups/hp-officejet_r65.ppd.gz b/ppd/hpcups/hp-officejet_r65.ppd.gz Binary files differindex dca903cc4..a0fffdd4d 100644 --- a/ppd/hpcups/hp-officejet_r65.ppd.gz +++ b/ppd/hpcups/hp-officejet_r65.ppd.gz diff --git a/ppd/hpcups/hp-officejet_r80.ppd.gz b/ppd/hpcups/hp-officejet_r80.ppd.gz Binary files differindex 53cb87d63..2e93f2fc2 100644 --- a/ppd/hpcups/hp-officejet_r80.ppd.gz +++ b/ppd/hpcups/hp-officejet_r80.ppd.gz diff --git a/ppd/hpcups/hp-officejet_r80xi.ppd.gz b/ppd/hpcups/hp-officejet_r80xi.ppd.gz Binary files differindex 6c3c2479b..443b03f6e 100644 --- a/ppd/hpcups/hp-officejet_r80xi.ppd.gz +++ b/ppd/hpcups/hp-officejet_r80xi.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_300.ppd.gz b/ppd/hpcups/hp-officejet_series_300.ppd.gz Binary files differindex f5c4ebce0..f0c696068 100644 --- a/ppd/hpcups/hp-officejet_series_300.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_300.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_310.ppd.gz b/ppd/hpcups/hp-officejet_series_310.ppd.gz Binary files differindex a9ed98a26..0339774ff 100644 --- a/ppd/hpcups/hp-officejet_series_310.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_310.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_320.ppd.gz b/ppd/hpcups/hp-officejet_series_320.ppd.gz Binary files differindex 8da9cf934..7f6c4a4e1 100644 --- a/ppd/hpcups/hp-officejet_series_320.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_320.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_330.ppd.gz b/ppd/hpcups/hp-officejet_series_330.ppd.gz Binary files differindex ee5dadff0..0bda9610b 100644 --- a/ppd/hpcups/hp-officejet_series_330.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_330.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_350.ppd.gz b/ppd/hpcups/hp-officejet_series_350.ppd.gz Binary files differindex 5b287803b..6ecbc7cff 100644 --- a/ppd/hpcups/hp-officejet_series_350.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_350.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_520.ppd.gz b/ppd/hpcups/hp-officejet_series_520.ppd.gz Binary files differindex 6e4097752..9972ffa84 100644 --- a/ppd/hpcups/hp-officejet_series_520.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_520.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_570.ppd.gz b/ppd/hpcups/hp-officejet_series_570.ppd.gz Binary files differindex b8c5327f1..b4c80f638 100644 --- a/ppd/hpcups/hp-officejet_series_570.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_570.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_580.ppd.gz b/ppd/hpcups/hp-officejet_series_580.ppd.gz Binary files differindex 81b9bc918..0cf52a03e 100644 --- a/ppd/hpcups/hp-officejet_series_580.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_580.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_590.ppd.gz b/ppd/hpcups/hp-officejet_series_590.ppd.gz Binary files differindex aa0999a3b..f4fdddac9 100644 --- a/ppd/hpcups/hp-officejet_series_590.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_590.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_600.ppd.gz b/ppd/hpcups/hp-officejet_series_600.ppd.gz Binary files differindex f80245bf0..c71426b2e 100644 --- a/ppd/hpcups/hp-officejet_series_600.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_600.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_610.ppd.gz b/ppd/hpcups/hp-officejet_series_610.ppd.gz Binary files differindex 8f0968e42..639b5ebc5 100644 --- a/ppd/hpcups/hp-officejet_series_610.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_610.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_630.ppd.gz b/ppd/hpcups/hp-officejet_series_630.ppd.gz Binary files differindex 8149e5ed7..4eaa4ecf0 100644 --- a/ppd/hpcups/hp-officejet_series_630.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_630.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_700.ppd.gz b/ppd/hpcups/hp-officejet_series_700.ppd.gz Binary files differindex 01e43427e..f905e4a62 100644 --- a/ppd/hpcups/hp-officejet_series_700.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_700.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_710.ppd.gz b/ppd/hpcups/hp-officejet_series_710.ppd.gz Binary files differindex d15bd928a..2f91316d6 100644 --- a/ppd/hpcups/hp-officejet_series_710.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_710.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_720.ppd.gz b/ppd/hpcups/hp-officejet_series_720.ppd.gz Binary files differindex b1b036f02..b2835fe5a 100644 --- a/ppd/hpcups/hp-officejet_series_720.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_720.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_725.ppd.gz b/ppd/hpcups/hp-officejet_series_725.ppd.gz Binary files differindex 6de78335d..472808110 100644 --- a/ppd/hpcups/hp-officejet_series_725.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_725.ppd.gz diff --git a/ppd/hpcups/hp-officejet_t_series.ppd.gz b/ppd/hpcups/hp-officejet_t_series.ppd.gz Binary files differindex 7015dca9c..ef36d5f26 100644 --- a/ppd/hpcups/hp-officejet_t_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_t_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_v30.ppd.gz b/ppd/hpcups/hp-officejet_v30.ppd.gz Binary files differindex 9c14b9814..9de87998e 100644 --- a/ppd/hpcups/hp-officejet_v30.ppd.gz +++ b/ppd/hpcups/hp-officejet_v30.ppd.gz diff --git a/ppd/hpcups/hp-officejet_v40.ppd.gz b/ppd/hpcups/hp-officejet_v40.ppd.gz Binary files differindex 5251533bc..308b0d849 100644 --- a/ppd/hpcups/hp-officejet_v40.ppd.gz +++ b/ppd/hpcups/hp-officejet_v40.ppd.gz diff --git a/ppd/hpcups/hp-officejet_v40xi.ppd.gz b/ppd/hpcups/hp-officejet_v40xi.ppd.gz Binary files differindex 52eaa19da..f82154908 100644 --- a/ppd/hpcups/hp-officejet_v40xi.ppd.gz +++ b/ppd/hpcups/hp-officejet_v40xi.ppd.gz diff --git a/ppd/hpcups/hp-officejet_v45.ppd.gz b/ppd/hpcups/hp-officejet_v45.ppd.gz Binary files differindex 5fdafc391..379c4d34c 100644 --- a/ppd/hpcups/hp-officejet_v45.ppd.gz +++ b/ppd/hpcups/hp-officejet_v45.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_100.ppd.gz b/ppd/hpcups/hp-photosmart_100.ppd.gz Binary files differindex 2811577c9..ea1033c01 100644 --- a/ppd/hpcups/hp-photosmart_100.ppd.gz +++ b/ppd/hpcups/hp-photosmart_100.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_1115.ppd.gz b/ppd/hpcups/hp-photosmart_1115.ppd.gz Binary files differindex eb3e10f72..b6b1507cb 100644 --- a/ppd/hpcups/hp-photosmart_1115.ppd.gz +++ b/ppd/hpcups/hp-photosmart_1115.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_1215.ppd.gz b/ppd/hpcups/hp-photosmart_1215.ppd.gz Binary files differindex c15ab71e0..7bf545fbb 100644 --- a/ppd/hpcups/hp-photosmart_1215.ppd.gz +++ b/ppd/hpcups/hp-photosmart_1215.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_1218.ppd.gz b/ppd/hpcups/hp-photosmart_1218.ppd.gz Binary files differindex 7e17434ba..2277302ac 100644 --- a/ppd/hpcups/hp-photosmart_1218.ppd.gz +++ b/ppd/hpcups/hp-photosmart_1218.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_130.ppd.gz b/ppd/hpcups/hp-photosmart_130.ppd.gz Binary files differindex 52873bff9..cc8628962 100644 --- a/ppd/hpcups/hp-photosmart_130.ppd.gz +++ b/ppd/hpcups/hp-photosmart_130.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_1315.ppd.gz b/ppd/hpcups/hp-photosmart_1315.ppd.gz Binary files differindex 0800fd551..c358d6295 100644 --- a/ppd/hpcups/hp-photosmart_1315.ppd.gz +++ b/ppd/hpcups/hp-photosmart_1315.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_140_series.ppd.gz b/ppd/hpcups/hp-photosmart_140_series.ppd.gz Binary files differindex d1edc70d1..4b7dcddb1 100644 --- a/ppd/hpcups/hp-photosmart_140_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_140_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_230.ppd.gz b/ppd/hpcups/hp-photosmart_230.ppd.gz Binary files differindex 35213aab4..18f649379 100644 --- a/ppd/hpcups/hp-photosmart_230.ppd.gz +++ b/ppd/hpcups/hp-photosmart_230.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_240_series.ppd.gz b/ppd/hpcups/hp-photosmart_240_series.ppd.gz Binary files differindex 643f3112d..663e080b6 100644 --- a/ppd/hpcups/hp-photosmart_240_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_240_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_2570_series.ppd.gz b/ppd/hpcups/hp-photosmart_2570_series.ppd.gz Binary files differindex f088f663a..9efeb413f 100644 --- a/ppd/hpcups/hp-photosmart_2570_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_2570_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_2600_series.ppd.gz b/ppd/hpcups/hp-photosmart_2600_series.ppd.gz Binary files differindex 95c2698df..92f479629 100644 --- a/ppd/hpcups/hp-photosmart_2600_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_2600_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_2700_series.ppd.gz b/ppd/hpcups/hp-photosmart_2700_series.ppd.gz Binary files differindex 5c52e08b5..ab2a69503 100644 --- a/ppd/hpcups/hp-photosmart_2700_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_2700_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_3100_series.ppd.gz b/ppd/hpcups/hp-photosmart_3100_series.ppd.gz Binary files differindex 4a9b6520d..d725c0af3 100644 --- a/ppd/hpcups/hp-photosmart_3100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_3100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_3200_series.ppd.gz b/ppd/hpcups/hp-photosmart_3200_series.ppd.gz Binary files differindex c30c5b41a..4d052f5e8 100644 --- a/ppd/hpcups/hp-photosmart_3200_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_3200_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_320_series.ppd.gz b/ppd/hpcups/hp-photosmart_320_series.ppd.gz Binary files differindex 4b8e5c7ca..6a0defc47 100644 --- a/ppd/hpcups/hp-photosmart_320_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_320_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_3300_series.ppd.gz b/ppd/hpcups/hp-photosmart_3300_series.ppd.gz Binary files differindex 13bc5d428..cff769fe5 100644 --- a/ppd/hpcups/hp-photosmart_3300_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_3300_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_330_series.ppd.gz b/ppd/hpcups/hp-photosmart_330_series.ppd.gz Binary files differindex c73e44d47..ad2881aa0 100644 --- a/ppd/hpcups/hp-photosmart_330_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_330_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_370_series.ppd.gz b/ppd/hpcups/hp-photosmart_370_series.ppd.gz Binary files differindex 6f1fd62d8..318080786 100644 --- a/ppd/hpcups/hp-photosmart_370_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_370_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_380_series.ppd.gz b/ppd/hpcups/hp-photosmart_380_series.ppd.gz Binary files differindex ca83de5d5..cf057ff05 100644 --- a/ppd/hpcups/hp-photosmart_380_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_380_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_420_series.ppd.gz b/ppd/hpcups/hp-photosmart_420_series.ppd.gz Binary files differindex e05387835..c3b47e9ee 100644 --- a/ppd/hpcups/hp-photosmart_420_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_420_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_470_series.ppd.gz b/ppd/hpcups/hp-photosmart_470_series.ppd.gz Binary files differindex a99dc57be..82b049bf2 100644 --- a/ppd/hpcups/hp-photosmart_470_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_470_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_5510_series.ppd.gz b/ppd/hpcups/hp-photosmart_5510_series.ppd.gz Binary files differindex 21f54ba20..11ba85b32 100644 --- a/ppd/hpcups/hp-photosmart_5510_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_5510_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_5510d_series.ppd.gz b/ppd/hpcups/hp-photosmart_5510d_series.ppd.gz Binary files differindex 5a4b4caa9..2384da7ae 100644 --- a/ppd/hpcups/hp-photosmart_5510d_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_5510d_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_5520_series.ppd.gz b/ppd/hpcups/hp-photosmart_5520_series.ppd.gz Binary files differindex 8740e2cdb..ddd5f1068 100644 --- a/ppd/hpcups/hp-photosmart_5520_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_5520_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_6510_series.ppd.gz b/ppd/hpcups/hp-photosmart_6510_series.ppd.gz Binary files differindex 663de16a6..c483b9781 100644 --- a/ppd/hpcups/hp-photosmart_6510_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_6510_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_6520_series.ppd.gz b/ppd/hpcups/hp-photosmart_6520_series.ppd.gz Binary files differindex a929fbd41..69f6e9e86 100644 --- a/ppd/hpcups/hp-photosmart_6520_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_6520_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7150.ppd.gz b/ppd/hpcups/hp-photosmart_7150.ppd.gz Binary files differindex d5f1d6e87..273c3618a 100644 --- a/ppd/hpcups/hp-photosmart_7150.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7150.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7200_series.ppd.gz b/ppd/hpcups/hp-photosmart_7200_series.ppd.gz Binary files differindex 10ddbb461..cc5b85237 100644 --- a/ppd/hpcups/hp-photosmart_7200_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7200_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7345.ppd.gz b/ppd/hpcups/hp-photosmart_7345.ppd.gz Binary files differindex c59590dc5..2d7bbe5bb 100644 --- a/ppd/hpcups/hp-photosmart_7345.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7345.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7350.ppd.gz b/ppd/hpcups/hp-photosmart_7350.ppd.gz Binary files differindex ab6a9f6a7..c77e86f26 100644 --- a/ppd/hpcups/hp-photosmart_7350.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7350.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7400_series.ppd.gz b/ppd/hpcups/hp-photosmart_7400_series.ppd.gz Binary files differindex 3c2c849bb..e2d7019cc 100644 --- a/ppd/hpcups/hp-photosmart_7400_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7400_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7510_series.ppd.gz b/ppd/hpcups/hp-photosmart_7510_series.ppd.gz Binary files differindex 967ac3ce2..db362fd71 100644 --- a/ppd/hpcups/hp-photosmart_7510_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7510_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7520_series.ppd.gz b/ppd/hpcups/hp-photosmart_7520_series.ppd.gz Binary files differindex 66c003be6..42f2d6090 100644 --- a/ppd/hpcups/hp-photosmart_7520_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7520_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7550.ppd.gz b/ppd/hpcups/hp-photosmart_7550.ppd.gz Binary files differindex 12aa35dd2..4915b3d73 100644 --- a/ppd/hpcups/hp-photosmart_7550.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7550.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7600_series.ppd.gz b/ppd/hpcups/hp-photosmart_7600_series.ppd.gz Binary files differindex e4d783db1..5e8ad83a3 100644 --- a/ppd/hpcups/hp-photosmart_7600_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7600_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7700_series.ppd.gz b/ppd/hpcups/hp-photosmart_7700_series.ppd.gz Binary files differindex d1c2f5e20..7c3f5436d 100644 --- a/ppd/hpcups/hp-photosmart_7700_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7700_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7800_series.ppd.gz b/ppd/hpcups/hp-photosmart_7800_series.ppd.gz Binary files differindex 16dad1633..a45c4e6e1 100644 --- a/ppd/hpcups/hp-photosmart_7800_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7800_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7900_series.ppd.gz b/ppd/hpcups/hp-photosmart_7900_series.ppd.gz Binary files differindex fff3ca270..8c9180678 100644 --- a/ppd/hpcups/hp-photosmart_7900_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7900_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_8000_series.ppd.gz b/ppd/hpcups/hp-photosmart_8000_series.ppd.gz Binary files differindex 24a0be975..e2a5fb2a5 100644 --- a/ppd/hpcups/hp-photosmart_8000_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_8000_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_8100_series.ppd.gz b/ppd/hpcups/hp-photosmart_8100_series.ppd.gz Binary files differindex 1715119c7..0d40ff76c 100644 --- a/ppd/hpcups/hp-photosmart_8100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_8100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_8200_series.ppd.gz b/ppd/hpcups/hp-photosmart_8200_series.ppd.gz Binary files differindex 227ed69a8..6427c1424 100644 --- a/ppd/hpcups/hp-photosmart_8200_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_8200_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_8400_series.ppd.gz b/ppd/hpcups/hp-photosmart_8400_series.ppd.gz Binary files differindex 1ecd4bf73..c33aca382 100644 --- a/ppd/hpcups/hp-photosmart_8400_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_8400_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_8700_series.ppd.gz b/ppd/hpcups/hp-photosmart_8700_series.ppd.gz Binary files differindex bfdca7380..49c7c46ed 100644 --- a/ppd/hpcups/hp-photosmart_8700_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_8700_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a310_series.ppd.gz b/ppd/hpcups/hp-photosmart_a310_series.ppd.gz Binary files differindex a30d94883..650a10486 100644 --- a/ppd/hpcups/hp-photosmart_a310_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a310_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a320_series.ppd.gz b/ppd/hpcups/hp-photosmart_a320_series.ppd.gz Binary files differindex 52b20c46d..462308a59 100644 --- a/ppd/hpcups/hp-photosmart_a320_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a320_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a430_series.ppd.gz b/ppd/hpcups/hp-photosmart_a430_series.ppd.gz Binary files differindex 17457a81a..5d19db19a 100644 --- a/ppd/hpcups/hp-photosmart_a430_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a430_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a440_series.ppd.gz b/ppd/hpcups/hp-photosmart_a440_series.ppd.gz Binary files differindex c20688727..143c39e49 100644 --- a/ppd/hpcups/hp-photosmart_a440_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a440_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a510_series.ppd.gz b/ppd/hpcups/hp-photosmart_a510_series.ppd.gz Binary files differindex c5bf19c1d..f56230865 100644 --- a/ppd/hpcups/hp-photosmart_a510_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a510_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a520_series.ppd.gz b/ppd/hpcups/hp-photosmart_a520_series.ppd.gz Binary files differindex 72448a5ef..67d69c1ad 100644 --- a/ppd/hpcups/hp-photosmart_a520_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a520_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a530_series.ppd.gz b/ppd/hpcups/hp-photosmart_a530_series.ppd.gz Binary files differindex 4d418af5c..2cbfb1da0 100644 --- a/ppd/hpcups/hp-photosmart_a530_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a530_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a610_series.ppd.gz b/ppd/hpcups/hp-photosmart_a610_series.ppd.gz Binary files differindex 766d59c16..89a5be104 100644 --- a/ppd/hpcups/hp-photosmart_a610_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a610_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a620_series.ppd.gz b/ppd/hpcups/hp-photosmart_a620_series.ppd.gz Binary files differindex 1517af928..32de7b667 100644 --- a/ppd/hpcups/hp-photosmart_a620_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a620_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a630_series.ppd.gz b/ppd/hpcups/hp-photosmart_a630_series.ppd.gz Binary files differindex ab199e74c..cc68ac787 100644 --- a/ppd/hpcups/hp-photosmart_a630_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a630_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a640_series.ppd.gz b/ppd/hpcups/hp-photosmart_a640_series.ppd.gz Binary files differindex 0aabde756..30c402eae 100644 --- a/ppd/hpcups/hp-photosmart_a640_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a640_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a710_series.ppd.gz b/ppd/hpcups/hp-photosmart_a710_series.ppd.gz Binary files differindex 2d7124f5b..55044889d 100644 --- a/ppd/hpcups/hp-photosmart_a710_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a710_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a820_series.ppd.gz b/ppd/hpcups/hp-photosmart_a820_series.ppd.gz Binary files differindex 923ed5079..de2321804 100644 --- a/ppd/hpcups/hp-photosmart_a820_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a820_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_b010_series.ppd.gz b/ppd/hpcups/hp-photosmart_b010_series.ppd.gz Binary files differindex c02a1b8b6..e59da7db1 100644 --- a/ppd/hpcups/hp-photosmart_b010_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_b010_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_b109a-m.ppd.gz b/ppd/hpcups/hp-photosmart_b109a-m.ppd.gz Binary files differindex b88461685..4320a3740 100644 --- a/ppd/hpcups/hp-photosmart_b109a-m.ppd.gz +++ b/ppd/hpcups/hp-photosmart_b109a-m.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_b109a_series.ppd.gz b/ppd/hpcups/hp-photosmart_b109a_series.ppd.gz Binary files differindex e34a120e0..50f4bf4fa 100644 --- a/ppd/hpcups/hp-photosmart_b109a_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_b109a_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_b110_series.ppd.gz b/ppd/hpcups/hp-photosmart_b110_series.ppd.gz Binary files differindex d71b176f4..aaf23b028 100644 --- a/ppd/hpcups/hp-photosmart_b110_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_b110_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_b8500_series.ppd.gz b/ppd/hpcups/hp-photosmart_b8500_series.ppd.gz Binary files differindex 315d0b901..cb83ebc3a 100644 --- a/ppd/hpcups/hp-photosmart_b8500_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_b8500_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c309a_series.ppd.gz b/ppd/hpcups/hp-photosmart_c309a_series.ppd.gz Binary files differindex 1515ea0a7..07726d275 100644 --- a/ppd/hpcups/hp-photosmart_c309a_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c309a_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c3100_series.ppd.gz b/ppd/hpcups/hp-photosmart_c3100_series.ppd.gz Binary files differindex ab194c360..f97154ae8 100644 --- a/ppd/hpcups/hp-photosmart_c3100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c3100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c4100_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4100_series.ppd.gz Binary files differindex aa84706a2..d6cfcc1a9 100644 --- a/ppd/hpcups/hp-photosmart_c4100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c4100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c4200_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4200_series.ppd.gz Binary files differindex ad9565549..0710ca047 100644 --- a/ppd/hpcups/hp-photosmart_c4200_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c4200_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c4340_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4340_series.ppd.gz Binary files differindex f4cea300c..2c61b87bd 100644 --- a/ppd/hpcups/hp-photosmart_c4340_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c4340_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c4380_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4380_series.ppd.gz Binary files differindex 420e978b3..aa37b23ec 100644 --- a/ppd/hpcups/hp-photosmart_c4380_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c4380_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c4400_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4400_series.ppd.gz Binary files differindex b4872b4fa..180348b9a 100644 --- a/ppd/hpcups/hp-photosmart_c4400_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c4400_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c4500_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4500_series.ppd.gz Binary files differindex 6ce30ad19..21e29c169 100644 --- a/ppd/hpcups/hp-photosmart_c4500_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c4500_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c4600_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4600_series.ppd.gz Binary files differindex aea0f6c97..d0c9e4dfa 100644 --- a/ppd/hpcups/hp-photosmart_c4600_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c4600_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c4700_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4700_series.ppd.gz Binary files differindex b37d18b01..8aa8d79e4 100644 --- a/ppd/hpcups/hp-photosmart_c4700_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c4700_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c5100_series.ppd.gz b/ppd/hpcups/hp-photosmart_c5100_series.ppd.gz Binary files differindex 3aa478096..952ed1534 100644 --- a/ppd/hpcups/hp-photosmart_c5100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c5100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c5200_series.ppd.gz b/ppd/hpcups/hp-photosmart_c5200_series.ppd.gz Binary files differindex 0abd88802..5965d1d86 100644 --- a/ppd/hpcups/hp-photosmart_c5200_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c5200_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c5300_series.ppd.gz b/ppd/hpcups/hp-photosmart_c5300_series.ppd.gz Binary files differindex ed9f86ee6..49500b299 100644 --- a/ppd/hpcups/hp-photosmart_c5300_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c5300_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c5500_series.ppd.gz b/ppd/hpcups/hp-photosmart_c5500_series.ppd.gz Binary files differindex 18bb8a7c1..eef5057c9 100644 --- a/ppd/hpcups/hp-photosmart_c5500_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c5500_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c6100_series.ppd.gz b/ppd/hpcups/hp-photosmart_c6100_series.ppd.gz Binary files differindex 364c96d94..d6db05222 100644 --- a/ppd/hpcups/hp-photosmart_c6100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c6100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c6200_series.ppd.gz b/ppd/hpcups/hp-photosmart_c6200_series.ppd.gz Binary files differindex 9d58420a4..d6e7792a7 100644 --- a/ppd/hpcups/hp-photosmart_c6200_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c6200_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c6300_series.ppd.gz b/ppd/hpcups/hp-photosmart_c6300_series.ppd.gz Binary files differindex b3a05794b..0c0dc9b87 100644 --- a/ppd/hpcups/hp-photosmart_c6300_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c6300_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c7100_series.ppd.gz b/ppd/hpcups/hp-photosmart_c7100_series.ppd.gz Binary files differindex 35829b487..10a5f843f 100644 --- a/ppd/hpcups/hp-photosmart_c7100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c7100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c7200_series.ppd.gz b/ppd/hpcups/hp-photosmart_c7200_series.ppd.gz Binary files differindex 46d5cada3..6e1298be3 100644 --- a/ppd/hpcups/hp-photosmart_c7200_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c7200_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c8100_series.ppd.gz b/ppd/hpcups/hp-photosmart_c8100_series.ppd.gz Binary files differindex 35c74a95e..1414af9bb 100644 --- a/ppd/hpcups/hp-photosmart_c8100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c8100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d110_series.ppd.gz b/ppd/hpcups/hp-photosmart_d110_series.ppd.gz Binary files differindex 6a97f66bf..07acfa556 100644 --- a/ppd/hpcups/hp-photosmart_d110_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d110_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d5060_series.ppd.gz b/ppd/hpcups/hp-photosmart_d5060_series.ppd.gz Binary files differindex 1df398a91..4861bda55 100644 --- a/ppd/hpcups/hp-photosmart_d5060_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d5060_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d5100_series.ppd.gz b/ppd/hpcups/hp-photosmart_d5100_series.ppd.gz Binary files differindex b4717933f..acf989409 100644 --- a/ppd/hpcups/hp-photosmart_d5100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d5100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d5300_series.ppd.gz b/ppd/hpcups/hp-photosmart_d5300_series.ppd.gz Binary files differindex b05f295ae..085442d9f 100644 --- a/ppd/hpcups/hp-photosmart_d5300_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d5300_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d5400_series.ppd.gz b/ppd/hpcups/hp-photosmart_d5400_series.ppd.gz Binary files differindex 5016c126d..9e72e2d4d 100644 --- a/ppd/hpcups/hp-photosmart_d5400_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d5400_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d6100_series.ppd.gz b/ppd/hpcups/hp-photosmart_d6100_series.ppd.gz Binary files differindex 3dd712718..4dba12905 100644 --- a/ppd/hpcups/hp-photosmart_d6100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d6100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d7100_series.ppd.gz b/ppd/hpcups/hp-photosmart_d7100_series.ppd.gz Binary files differindex 96bb7368d..409faf8b7 100644 --- a/ppd/hpcups/hp-photosmart_d7100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d7100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d7200_series.ppd.gz b/ppd/hpcups/hp-photosmart_d7200_series.ppd.gz Binary files differindex 39e525ecc..c5b4f42d0 100644 --- a/ppd/hpcups/hp-photosmart_d7200_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d7200_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d7300_series.ppd.gz b/ppd/hpcups/hp-photosmart_d7300_series.ppd.gz Binary files differindex fed68c73f..13b4d7ced 100644 --- a/ppd/hpcups/hp-photosmart_d7300_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d7300_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d7400_series.ppd.gz b/ppd/hpcups/hp-photosmart_d7400_series.ppd.gz Binary files differindex 835e16525..3a93e9c67 100644 --- a/ppd/hpcups/hp-photosmart_d7400_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d7400_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d7500_series.ppd.gz b/ppd/hpcups/hp-photosmart_d7500_series.ppd.gz Binary files differindex 17edbae42..3f265024a 100644 --- a/ppd/hpcups/hp-photosmart_d7500_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d7500_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_estn_c510_series.ppd.gz b/ppd/hpcups/hp-photosmart_estn_c510_series.ppd.gz Binary files differindex 82e639ba5..e37cc67cb 100644 --- a/ppd/hpcups/hp-photosmart_estn_c510_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_estn_c510_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_ink_adv_k510.ppd.gz b/ppd/hpcups/hp-photosmart_ink_adv_k510.ppd.gz Binary files differindex 4bee95e68..0fff8a17d 100644 --- a/ppd/hpcups/hp-photosmart_ink_adv_k510.ppd.gz +++ b/ppd/hpcups/hp-photosmart_ink_adv_k510.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_p1000.ppd.gz b/ppd/hpcups/hp-photosmart_p1000.ppd.gz Binary files differindex cbeba390d..2921b50c3 100644 --- a/ppd/hpcups/hp-photosmart_p1000.ppd.gz +++ b/ppd/hpcups/hp-photosmart_p1000.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_p1100.ppd.gz b/ppd/hpcups/hp-photosmart_p1100.ppd.gz Binary files differindex f51190db2..0a02fbd00 100644 --- a/ppd/hpcups/hp-photosmart_p1100.ppd.gz +++ b/ppd/hpcups/hp-photosmart_p1100.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_plus_b209a-m.ppd.gz b/ppd/hpcups/hp-photosmart_plus_b209a-m.ppd.gz Binary files differindex 5a6ec6f02..a99e931cd 100644 --- a/ppd/hpcups/hp-photosmart_plus_b209a-m.ppd.gz +++ b/ppd/hpcups/hp-photosmart_plus_b209a-m.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_plus_b210_series.ppd.gz b/ppd/hpcups/hp-photosmart_plus_b210_series.ppd.gz Binary files differindex 69f4ce4a2..4af8e931c 100644 --- a/ppd/hpcups/hp-photosmart_plus_b210_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_plus_b210_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_prem-web_c309n-s.ppd.gz b/ppd/hpcups/hp-photosmart_prem-web_c309n-s.ppd.gz Binary files differindex af5e90638..7da6ef3d4 100644 --- a/ppd/hpcups/hp-photosmart_prem-web_c309n-s.ppd.gz +++ b/ppd/hpcups/hp-photosmart_prem-web_c309n-s.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_prem_c310_series.ppd.gz b/ppd/hpcups/hp-photosmart_prem_c310_series.ppd.gz Binary files differindex c4f7afdb6..b9b405773 100644 --- a/ppd/hpcups/hp-photosmart_prem_c310_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_prem_c310_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_prem_c410_series.ppd.gz b/ppd/hpcups/hp-photosmart_prem_c410_series.ppd.gz Binary files differindex a57312ecf..704cde40f 100644 --- a/ppd/hpcups/hp-photosmart_prem_c410_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_prem_c410_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_premium_c309g-m.ppd.gz b/ppd/hpcups/hp-photosmart_premium_c309g-m.ppd.gz Binary files differindex d0aedcefe..596d0ef37 100644 --- a/ppd/hpcups/hp-photosmart_premium_c309g-m.ppd.gz +++ b/ppd/hpcups/hp-photosmart_premium_c309g-m.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_pro_b8300_series.ppd.gz b/ppd/hpcups/hp-photosmart_pro_b8300_series.ppd.gz Binary files differindex a9f065fa6..2a900367b 100644 --- a/ppd/hpcups/hp-photosmart_pro_b8300_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_pro_b8300_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_pro_b8800_series.ppd.gz b/ppd/hpcups/hp-photosmart_pro_b8800_series.ppd.gz Binary files differindex f36cf9b07..001099131 100644 --- a/ppd/hpcups/hp-photosmart_pro_b8800_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_pro_b8800_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_wireless_b109n-z.ppd.gz b/ppd/hpcups/hp-photosmart_wireless_b109n-z.ppd.gz Binary files differindex 3e07eb31c..42a2a663a 100644 --- a/ppd/hpcups/hp-photosmart_wireless_b109n-z.ppd.gz +++ b/ppd/hpcups/hp-photosmart_wireless_b109n-z.ppd.gz diff --git a/ppd/hpcups/hp-printer_scanner_copier_300.ppd.gz b/ppd/hpcups/hp-printer_scanner_copier_300.ppd.gz Binary files differindex 12ff6dddf..701f55bb4 100644 --- a/ppd/hpcups/hp-printer_scanner_copier_300.ppd.gz +++ b/ppd/hpcups/hp-printer_scanner_copier_300.ppd.gz diff --git a/ppd/hpcups/hp-psc_1000_series.ppd.gz b/ppd/hpcups/hp-psc_1000_series.ppd.gz Binary files differindex 811ba5ae9..5a4481243 100644 --- a/ppd/hpcups/hp-psc_1000_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1000_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_1100_series.ppd.gz b/ppd/hpcups/hp-psc_1100_series.ppd.gz Binary files differindex 37c91dee8..6e95acdfb 100644 --- a/ppd/hpcups/hp-psc_1100_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1100_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_1200_series.ppd.gz b/ppd/hpcups/hp-psc_1200_series.ppd.gz Binary files differindex 0b9deb845..c5cafe80f 100644 --- a/ppd/hpcups/hp-psc_1200_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1200_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_1300_series.ppd.gz b/ppd/hpcups/hp-psc_1300_series.ppd.gz Binary files differindex 43a1a4b04..a07d56032 100644 --- a/ppd/hpcups/hp-psc_1300_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1300_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_1310_series.ppd.gz b/ppd/hpcups/hp-psc_1310_series.ppd.gz Binary files differindex cbb1f39c9..366a516d1 100644 --- a/ppd/hpcups/hp-psc_1310_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1310_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_1358_series.ppd.gz b/ppd/hpcups/hp-psc_1358_series.ppd.gz Binary files differindex 46c6c2d0a..f49dd898b 100644 --- a/ppd/hpcups/hp-psc_1358_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1358_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_1400_series.ppd.gz b/ppd/hpcups/hp-psc_1400_series.ppd.gz Binary files differindex dce1748d4..b4f703ea2 100644 --- a/ppd/hpcups/hp-psc_1400_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1400_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_1500_series.ppd.gz b/ppd/hpcups/hp-psc_1500_series.ppd.gz Binary files differindex 58ed7bb1d..fded82c5e 100644 --- a/ppd/hpcups/hp-psc_1500_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1500_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_1510_series.ppd.gz b/ppd/hpcups/hp-psc_1510_series.ppd.gz Binary files differindex 3cfe4315e..47c1046e0 100644 --- a/ppd/hpcups/hp-psc_1510_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1510_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_1600_series.ppd.gz b/ppd/hpcups/hp-psc_1600_series.ppd.gz Binary files differindex fde8831d2..fe18c1bcc 100644 --- a/ppd/hpcups/hp-psc_1600_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1600_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_2100_series.ppd.gz b/ppd/hpcups/hp-psc_2100_series.ppd.gz Binary files differindex 67cc137c6..be8bca40b 100644 --- a/ppd/hpcups/hp-psc_2100_series.ppd.gz +++ b/ppd/hpcups/hp-psc_2100_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_2150_series.ppd.gz b/ppd/hpcups/hp-psc_2150_series.ppd.gz Binary files differindex 0244d4397..31214fbe1 100644 --- a/ppd/hpcups/hp-psc_2150_series.ppd.gz +++ b/ppd/hpcups/hp-psc_2150_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_2170_series.ppd.gz b/ppd/hpcups/hp-psc_2170_series.ppd.gz Binary files differindex b6b13311d..ecab22627 100644 --- a/ppd/hpcups/hp-psc_2170_series.ppd.gz +++ b/ppd/hpcups/hp-psc_2170_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_2200_series.ppd.gz b/ppd/hpcups/hp-psc_2200_series.ppd.gz Binary files differindex c107cf744..59d067fde 100644 --- a/ppd/hpcups/hp-psc_2200_series.ppd.gz +++ b/ppd/hpcups/hp-psc_2200_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_2210_series.ppd.gz b/ppd/hpcups/hp-psc_2210_series.ppd.gz Binary files differindex 09455d1d2..68b7cbb13 100644 --- a/ppd/hpcups/hp-psc_2210_series.ppd.gz +++ b/ppd/hpcups/hp-psc_2210_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_2300_series.ppd.gz b/ppd/hpcups/hp-psc_2300_series.ppd.gz Binary files differindex 28870fc15..fbef750c4 100644 --- a/ppd/hpcups/hp-psc_2300_series.ppd.gz +++ b/ppd/hpcups/hp-psc_2300_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_2350_series.ppd.gz b/ppd/hpcups/hp-psc_2350_series.ppd.gz Binary files differindex e660a3fee..1ed0c0800 100644 --- a/ppd/hpcups/hp-psc_2350_series.ppd.gz +++ b/ppd/hpcups/hp-psc_2350_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_2400_series.ppd.gz b/ppd/hpcups/hp-psc_2400_series.ppd.gz Binary files differindex 6f6c36e1e..e8f111278 100644 --- a/ppd/hpcups/hp-psc_2400_series.ppd.gz +++ b/ppd/hpcups/hp-psc_2400_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_2500_series.ppd.gz b/ppd/hpcups/hp-psc_2500_series.ppd.gz Binary files differindex dcaafdb8b..3b1aa7841 100644 --- a/ppd/hpcups/hp-psc_2500_series.ppd.gz +++ b/ppd/hpcups/hp-psc_2500_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_500.ppd.gz b/ppd/hpcups/hp-psc_500.ppd.gz Binary files differindex 7e714747e..0b9260af1 100644 --- a/ppd/hpcups/hp-psc_500.ppd.gz +++ b/ppd/hpcups/hp-psc_500.ppd.gz diff --git a/ppd/hpcups/hp-psc_720.ppd.gz b/ppd/hpcups/hp-psc_720.ppd.gz Binary files differindex d6ca0f146..8d2678f0d 100644 --- a/ppd/hpcups/hp-psc_720.ppd.gz +++ b/ppd/hpcups/hp-psc_720.ppd.gz diff --git a/ppd/hpcups/hp-psc_750.ppd.gz b/ppd/hpcups/hp-psc_750.ppd.gz Binary files differindex c10888e8b..885ad8318 100644 --- a/ppd/hpcups/hp-psc_750.ppd.gz +++ b/ppd/hpcups/hp-psc_750.ppd.gz diff --git a/ppd/hpcups/hp-psc_750xi.ppd.gz b/ppd/hpcups/hp-psc_750xi.ppd.gz Binary files differindex 23ea73c1c..27743fa37 100644 --- a/ppd/hpcups/hp-psc_750xi.ppd.gz +++ b/ppd/hpcups/hp-psc_750xi.ppd.gz diff --git a/ppd/hpcups/hp-psc_760.ppd.gz b/ppd/hpcups/hp-psc_760.ppd.gz Binary files differindex c3b0f2b2a..fc741f40b 100644 --- a/ppd/hpcups/hp-psc_760.ppd.gz +++ b/ppd/hpcups/hp-psc_760.ppd.gz diff --git a/ppd/hpcups/hp-psc_780.ppd.gz b/ppd/hpcups/hp-psc_780.ppd.gz Binary files differindex 6512b7b14..c4591140c 100644 --- a/ppd/hpcups/hp-psc_780.ppd.gz +++ b/ppd/hpcups/hp-psc_780.ppd.gz diff --git a/ppd/hpcups/hp-psc_780xi.ppd.gz b/ppd/hpcups/hp-psc_780xi.ppd.gz Binary files differindex 52922d455..b57de8ad1 100644 --- a/ppd/hpcups/hp-psc_780xi.ppd.gz +++ b/ppd/hpcups/hp-psc_780xi.ppd.gz diff --git a/ppd/hpcups/hp-psc_900_series.ppd.gz b/ppd/hpcups/hp-psc_900_series.ppd.gz Binary files differindex 05de3fe79..650e89884 100644 --- a/ppd/hpcups/hp-psc_900_series.ppd.gz +++ b/ppd/hpcups/hp-psc_900_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_920.ppd.gz b/ppd/hpcups/hp-psc_920.ppd.gz Binary files differindex f6489bf0d..d4f2996d5 100644 --- a/ppd/hpcups/hp-psc_920.ppd.gz +++ b/ppd/hpcups/hp-psc_920.ppd.gz diff --git a/ppd/hpcups/hp-psc_950.ppd.gz b/ppd/hpcups/hp-psc_950.ppd.gz Binary files differindex 8b69848e0..6f1f2554d 100644 --- a/ppd/hpcups/hp-psc_950.ppd.gz +++ b/ppd/hpcups/hp-psc_950.ppd.gz diff --git a/ppd/hpcups/hp-psc_950vr.ppd.gz b/ppd/hpcups/hp-psc_950vr.ppd.gz Binary files differindex 13072e8f8..818d08fec 100644 --- a/ppd/hpcups/hp-psc_950vr.ppd.gz +++ b/ppd/hpcups/hp-psc_950vr.ppd.gz diff --git a/ppd/hpcups/hp-psc_950xi.ppd.gz b/ppd/hpcups/hp-psc_950xi.ppd.gz Binary files differindex 9f4b22416..d7a397e73 100644 --- a/ppd/hpcups/hp-psc_950xi.ppd.gz +++ b/ppd/hpcups/hp-psc_950xi.ppd.gz diff --git a/ppd/hpijs/hp-2000c-hpijs.ppd.gz b/ppd/hpijs/hp-2000c-hpijs.ppd.gz Binary files differindex 140052494..fd0676cb1 100644 --- a/ppd/hpijs/hp-2000c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-2000c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-2500c-hpijs.ppd.gz b/ppd/hpijs/hp-2500c-hpijs.ppd.gz Binary files differindex 5371ad9bc..8f4487af4 100644 --- a/ppd/hpijs/hp-2500c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-2500c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-910-hpijs.ppd.gz b/ppd/hpijs/hp-910-hpijs.ppd.gz Binary files differindex 5173704d8..a939f2e33 100644 --- a/ppd/hpijs/hp-910-hpijs.ppd.gz +++ b/ppd/hpijs/hp-910-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-915-hpijs.ppd.gz b/ppd/hpijs/hp-915-hpijs.ppd.gz Binary files differindex ca626b7c9..1bb5b208c 100644 --- a/ppd/hpijs/hp-915-hpijs.ppd.gz +++ b/ppd/hpijs/hp-915-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_1000-hpijs.ppd.gz b/ppd/hpijs/hp-business_inkjet_1000-hpijs.ppd.gz Binary files differindex 7490ffb9a..49f3a0eae 100644 --- a/ppd/hpijs/hp-business_inkjet_1000-hpijs.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_1000-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_1100-hpijs.ppd.gz b/ppd/hpijs/hp-business_inkjet_1100-hpijs.ppd.gz Binary files differindex 9836cdb04..b7caf48ab 100644 --- a/ppd/hpijs/hp-business_inkjet_1100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_1100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_1200-hpijs.ppd.gz b/ppd/hpijs/hp-business_inkjet_1200-hpijs.ppd.gz Binary files differindex 201e2744e..b92e8fbce 100644 --- a/ppd/hpijs/hp-business_inkjet_1200-hpijs.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_1200-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2200-hpijs.ppd.gz b/ppd/hpijs/hp-business_inkjet_2200-hpijs.ppd.gz Binary files differindex 4e9fb3ef9..8118f256f 100644 --- a/ppd/hpijs/hp-business_inkjet_2200-hpijs.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2200-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2230-hpijs.ppd.gz b/ppd/hpijs/hp-business_inkjet_2230-hpijs.ppd.gz Binary files differindex 6a83b2237..86a8bea51 100644 --- a/ppd/hpijs/hp-business_inkjet_2230-hpijs.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2230-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz Binary files differindex f7b6576fb..0ff3a7066 100644 --- a/ppd/hpijs/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2280-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-business_inkjet_2280-hpijs-pcl3.ppd.gz Binary files differindex 3a4f7fa22..c2c7434a2 100644 --- a/ppd/hpijs/hp-business_inkjet_2280-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2280-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2300-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-business_inkjet_2300-hpijs-pcl3.ppd.gz Binary files differindex 0ec1710d9..d8494d0df 100644 --- a/ppd/hpijs/hp-business_inkjet_2300-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2300-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2600-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-business_inkjet_2600-hpijs-pcl3.ppd.gz Binary files differindex a709a692a..83f0ddb3f 100644 --- a/ppd/hpijs/hp-business_inkjet_2600-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2600-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2800-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-business_inkjet_2800-hpijs-pcl3.ppd.gz Binary files differindex 8253812b6..199e74612 100644 --- a/ppd/hpijs/hp-business_inkjet_2800-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2800-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz Binary files differindex 5e3ca591b..cecf8d634 100644 --- a/ppd/hpijs/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_inkjet_cp1700-hpijs.ppd.gz b/ppd/hpijs/hp-color_inkjet_cp1700-hpijs.ppd.gz Binary files differindex 04531f3c7..3afae34fa 100644 --- a/ppd/hpijs/hp-color_inkjet_cp1700-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_inkjet_cp1700-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_inkjet_printer_cp1700-hpijs.ppd.gz b/ppd/hpijs/hp-color_inkjet_printer_cp1700-hpijs.ppd.gz Binary files differindex 8dcd73a16..f934d18ef 100644 --- a/ppd/hpijs/hp-color_inkjet_printer_cp1700-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_inkjet_printer_cp1700-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_1600-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_1600-hpijs.ppd.gz Binary files differindex df19d3ac1..bb31ff5a9 100644 --- a/ppd/hpijs/hp-color_laserjet_1600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_1600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_2500-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_2500-hpijs-pcl3.ppd.gz Binary files differindex f81c2bbba..41516fd3d 100644 --- a/ppd/hpijs/hp-color_laserjet_2500-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_2500-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_2500_series-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_2500_series-hpijs.ppd.gz Binary files differindex bd020f5cc..fb401229a 100644 --- a/ppd/hpijs/hp-color_laserjet_2500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_2500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_2600n-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_2600n-hpijs.ppd.gz Binary files differindex 0a65e26ba..813a141a9 100644 --- a/ppd/hpijs/hp-color_laserjet_2600n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_2600n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3000-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_3000-hpijs-pcl3.ppd.gz Binary files differindex ffe52b8e9..d9616572b 100644 --- a/ppd/hpijs/hp-color_laserjet_3000-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3000-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3500-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_3500-hpijs.ppd.gz Binary files differindex 4382c65ab..3b1856c0b 100644 --- a/ppd/hpijs/hp-color_laserjet_3500-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3500-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3500n-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_3500n-hpijs.ppd.gz Binary files differindex be0143c1a..37dbef360 100644 --- a/ppd/hpijs/hp-color_laserjet_3500n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3500n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3550-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_3550-hpijs.ppd.gz Binary files differindex 4bac2d5de..e81df9aab 100644 --- a/ppd/hpijs/hp-color_laserjet_3550-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3550-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3550n-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_3550n-hpijs.ppd.gz Binary files differindex b1176a029..b50159046 100644 --- a/ppd/hpijs/hp-color_laserjet_3550n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3550n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3600-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_3600-hpijs.ppd.gz Binary files differindex 16342e7a2..886a24dab 100644 --- a/ppd/hpijs/hp-color_laserjet_3600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3700-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_3700-hpijs-pcl3.ppd.gz Binary files differindex 1887a7265..ac4f4fa1a 100644 --- a/ppd/hpijs/hp-color_laserjet_3700-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3700-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3700n-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_3700n-hpijs.ppd.gz Binary files differindex aef5b4d75..0cf3628f6 100644 --- a/ppd/hpijs/hp-color_laserjet_3700n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3700n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3800-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_3800-hpijs-pcl3.ppd.gz Binary files differindex ed35b6a4f..42786844e 100644 --- a/ppd/hpijs/hp-color_laserjet_3800-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3800-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4500-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4500-hpijs-pcl3.ppd.gz Binary files differindex f19485188..6fb99f902 100644 --- a/ppd/hpijs/hp-color_laserjet_4500-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4500-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4550-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4550-hpijs-pcl3.ppd.gz Binary files differindex 21f07eca8..4bce2abce 100644 --- a/ppd/hpijs/hp-color_laserjet_4550-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4550-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4600-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4600-hpijs-pcl3.ppd.gz Binary files differindex 0d5b25d17..02cecffd0 100644 --- a/ppd/hpijs/hp-color_laserjet_4600-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4600-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4600_series-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_4600_series-hpijs.ppd.gz Binary files differindex b27fa4783..1dbd7e51b 100644 --- a/ppd/hpijs/hp-color_laserjet_4600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4610-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4610-hpijs-pcl3.ppd.gz Binary files differindex 06a9604c7..4f5807d8b 100644 --- a/ppd/hpijs/hp-color_laserjet_4610-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4610-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4650-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4650-hpijs-pcl3.ppd.gz Binary files differindex 357fc6203..cc41b4cb9 100644 --- a/ppd/hpijs/hp-color_laserjet_4650-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4650-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz Binary files differindex 1c4983ca4..6c6717e17 100644 --- a/ppd/hpijs/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4730mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4730mfp-hpijs-pcl3.ppd.gz Binary files differindex d11145cd7..83f3874c6 100644 --- a/ppd/hpijs/hp-color_laserjet_4730mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4730mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_5-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_5-hpijs.ppd.gz Binary files differindex b1af29fb6..6c058249d 100644 --- a/ppd/hpijs/hp-color_laserjet_5-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_5-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_5500-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_5500-hpijs-pcl3.ppd.gz Binary files differindex 3e4e0c184..1b98aae50 100644 --- a/ppd/hpijs/hp-color_laserjet_5500-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_5500-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz Binary files differindex 9b9858da6..3d8336d95 100644 --- a/ppd/hpijs/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_5m-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_5m-hpijs-pcl3.ppd.gz Binary files differindex bb77ce728..42132531a 100644 --- a/ppd/hpijs/hp-color_laserjet_5m-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_5m-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_8500-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_8500-hpijs-pcl3.ppd.gz Binary files differindex f0f5c754e..1a441a728 100644 --- a/ppd/hpijs/hp-color_laserjet_8500-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_8500-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_8550-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_8550-hpijs-pcl3.ppd.gz Binary files differindex 33371df3a..dcb7a77f8 100644 --- a/ppd/hpijs/hp-color_laserjet_8550-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_8550-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_9500-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_9500-hpijs-pcl3.ppd.gz Binary files differindex dff14df6b..71ecd0ec8 100644 --- a/ppd/hpijs/hp-color_laserjet_9500-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_9500-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_9500_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_9500_mfp-hpijs-pcl3.ppd.gz Binary files differindex 850154dbf..b2fd486ee 100644 --- a/ppd/hpijs/hp-color_laserjet_9500_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_9500_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm1312_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm1312_mfp-hpijs-pcl3.ppd.gz Binary files differindex fafdf21a1..c1d724eb2 100644 --- a/ppd/hpijs/hp-color_laserjet_cm1312_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm1312_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm1312nfi_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm1312nfi_mfp-hpijs-pcl3.ppd.gz Binary files differindex 5b8999e39..342df34e5 100644 --- a/ppd/hpijs/hp-color_laserjet_cm1312nfi_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm1312nfi_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm2320_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm2320_mfp-hpijs-pcl3.ppd.gz Binary files differindex c4cf06d00..0633358cf 100644 --- a/ppd/hpijs/hp-color_laserjet_cm2320_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm2320_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm2320fxi_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm2320fxi_mfp-hpijs-pcl3.ppd.gz Binary files differindex f885438d7..2cce25baf 100644 --- a/ppd/hpijs/hp-color_laserjet_cm2320fxi_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm2320fxi_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd.gz Binary files differindex 209e201bc..7a93809f1 100644 --- a/ppd/hpijs/hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm2320nf_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm2320nf_mfp-hpijs-pcl3.ppd.gz Binary files differindex daa859bee..052dee8d5 100644 --- a/ppd/hpijs/hp-color_laserjet_cm2320nf_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm2320nf_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz Binary files differindex 15ca5169c..9fb060abc 100644 --- a/ppd/hpijs/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm4540_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm4540_mfp-hpijs-pcl3.ppd.gz Binary files differindex f5133c934..298fbfa2d 100644 --- a/ppd/hpijs/hp-color_laserjet_cm4540_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm4540_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm4730_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm4730_mfp-hpijs-pcl3.ppd.gz Binary files differindex 3f64bdedf..07592d0ba 100644 --- a/ppd/hpijs/hp-color_laserjet_cm4730_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm4730_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm6030_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm6030_mfp-hpijs-pcl3.ppd.gz Binary files differindex b24cd5930..674ac80af 100644 --- a/ppd/hpijs/hp-color_laserjet_cm6030_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm6030_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm6040_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm6040_mfp-hpijs.ppd.gz Binary files differindex 1d290b91e..895d91264 100644 --- a/ppd/hpijs/hp-color_laserjet_cm6040_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm6040_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz Binary files differindex b5ef8c001..69acbd32e 100644 --- a/ppd/hpijs/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp1215-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp1215-hpijs.ppd.gz Binary files differindex 8765b66ee..24333868d 100644 --- a/ppd/hpijs/hp-color_laserjet_cp1215-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp1215-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp1217-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp1217-hpijs.ppd.gz Binary files differindex 3ea87f16c..5b76c59f6 100644 --- a/ppd/hpijs/hp-color_laserjet_cp1217-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp1217-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp1514n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp1514n-hpijs-pcl3.ppd.gz Binary files differindex 104f45500..4a3065fb2 100644 --- a/ppd/hpijs/hp-color_laserjet_cp1514n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp1514n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp1515n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp1515n-hpijs-pcl3.ppd.gz Binary files differindex 92517f91b..5c4408e0b 100644 --- a/ppd/hpijs/hp-color_laserjet_cp1515n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp1515n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp1518ni-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp1518ni-hpijs-pcl3.ppd.gz Binary files differindex 4f65ac05b..e2ccb5a69 100644 --- a/ppd/hpijs/hp-color_laserjet_cp1518ni-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp1518ni-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp2025-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp2025-hpijs-pcl3.ppd.gz Binary files differindex 9662b6ad2..c3276e2fa 100644 --- a/ppd/hpijs/hp-color_laserjet_cp2025-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp2025-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp2025dn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp2025dn-hpijs-pcl3.ppd.gz Binary files differindex dd66c1dec..863c421bd 100644 --- a/ppd/hpijs/hp-color_laserjet_cp2025dn-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp2025dn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp2025n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp2025n-hpijs-pcl3.ppd.gz Binary files differindex 51120c6fc..5f565da80 100644 --- a/ppd/hpijs/hp-color_laserjet_cp2025n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp2025n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz Binary files differindex a087bf075..9b120fc5a 100644 --- a/ppd/hpijs/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz Binary files differindex 46043d5a7..d05ddc293 100644 --- a/ppd/hpijs/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz Binary files differindex f0e6801f4..41193dd39 100644 --- a/ppd/hpijs/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz Binary files differindex c02f9b2c7..f3a09e483 100644 --- a/ppd/hpijs/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz Binary files differindex 4d3973cab..6e853f8b9 100644 --- a/ppd/hpijs/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz Binary files differindex 39bedbbd7..b0a93502f 100644 --- a/ppd/hpijs/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp5225-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp5225-hpijs-pcl3.ppd.gz Binary files differindex d28ccfb5d..2fbfb67c3 100644 --- a/ppd/hpijs/hp-color_laserjet_cp5225-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp5225-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz Binary files differindex d20bfe826..0da7814de 100644 --- a/ppd/hpijs/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz Binary files differindex 827989738..95b99aea2 100644 --- a/ppd/hpijs/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp5520_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp5520_series-hpijs-pcl3.ppd.gz Binary files differindex 16c98bb16..6cb0d411e 100644 --- a/ppd/hpijs/hp-color_laserjet_cp5520_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp5520_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz Binary files differindex 05c0282e5..aeb956ed6 100644 --- a/ppd/hpijs/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_pro_mfp_m176n-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_pro_mfp_m176n-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..9357671c8 --- /dev/null +++ b/ppd/hpijs/hp-color_laserjet_pro_mfp_m176n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_pro_mfp_m177fw-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_pro_mfp_m177fw-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..8c927a6d3 --- /dev/null +++ b/ppd/hpijs/hp-color_laserjet_pro_mfp_m177fw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-cp1160-hpijs.ppd.gz b/ppd/hpijs/hp-cp1160-hpijs.ppd.gz Binary files differindex 0aca3e4e2..3cc7365dd 100644 --- a/ppd/hpijs/hp-cp1160-hpijs.ppd.gz +++ b/ppd/hpijs/hp-cp1160-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1000_j110_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1000_j110_series-hpijs.ppd.gz Binary files differindex 51bf06381..863241fe0 100644 --- a/ppd/hpijs/hp-deskjet_1000_j110_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1000_j110_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1010_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1010_series-hpijs.ppd.gz Binary files differindex b79d9574b..4a8058924 100644 --- a/ppd/hpijs/hp-deskjet_1010_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1010_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1050_j410_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1050_j410_series-hpijs.ppd.gz Binary files differindex 38febc9e8..9cdd7514d 100644 --- a/ppd/hpijs/hp-deskjet_1050_j410_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1050_j410_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1100-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1100-hpijs.ppd.gz Binary files differindex be39befc2..cf8bab0a7 100644 --- a/ppd/hpijs/hp-deskjet_1100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1120-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1120-hpijs.ppd.gz Binary files differindex 69b684d60..3dfa3c638 100644 --- a/ppd/hpijs/hp-deskjet_1120-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1120-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1125-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1125-hpijs.ppd.gz Binary files differindex ebcaea329..231db3209 100644 --- a/ppd/hpijs/hp-deskjet_1125-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1125-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1200c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1200c-hpijs.ppd.gz Binary files differindex 7f4d26768..9e9aee236 100644 --- a/ppd/hpijs/hp-deskjet_1200c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1200c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1220c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1220c-hpijs.ppd.gz Binary files differindex 89e2b3d01..0a9842fd9 100644 --- a/ppd/hpijs/hp-deskjet_1220c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1220c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1280-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1280-hpijs.ppd.gz Binary files differindex 560866e0c..2138d6b2c 100644 --- a/ppd/hpijs/hp-deskjet_1280-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1280-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1510_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1510_series-hpijs.ppd.gz Binary files differindex fe5ae9c35..706507c2e 100644 --- a/ppd/hpijs/hp-deskjet_1510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1600c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1600c-hpijs.ppd.gz Binary files differindex 1337648ab..c9bc3cf6d 100644 --- a/ppd/hpijs/hp-deskjet_1600c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1600c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1600cm-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1600cm-hpijs.ppd.gz Binary files differindex e1691ed49..f716ab4d1 100644 --- a/ppd/hpijs/hp-deskjet_1600cm-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1600cm-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1600cn-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1600cn-hpijs.ppd.gz Binary files differindex 231f26c96..ddf841eea 100644 --- a/ppd/hpijs/hp-deskjet_1600cn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1600cn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_2000_j210_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_2000_j210_series-hpijs.ppd.gz Binary files differindex 0860b9ca5..7139f47cc 100644 --- a/ppd/hpijs/hp-deskjet_2000_j210_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_2000_j210_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_2020_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_2020_series-hpijs.ppd.gz Binary files differindex 04dbb9822..705e738b3 100644 --- a/ppd/hpijs/hp-deskjet_2020_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_2020_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_2050_j510_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_2050_j510_series-hpijs.ppd.gz Binary files differindex a6454ead2..2ce796941 100644 --- a/ppd/hpijs/hp-deskjet_2050_j510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_2050_j510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_2510_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_2510_series-hpijs.ppd.gz Binary files differindex 80cc69967..196084fac 100644 --- a/ppd/hpijs/hp-deskjet_2510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_2510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_2520_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_2520_series-hpijs.ppd.gz Binary files differindex 6e8b1c245..e99da6cd1 100644 --- a/ppd/hpijs/hp-deskjet_2520_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_2520_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_2540_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_2540_series-hpijs.ppd.gz Binary files differindex 3da41973b..fb97e8272 100644 --- a/ppd/hpijs/hp-deskjet_2540_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_2540_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_2640_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_2640_series-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..2dfb7efc7 --- /dev/null +++ b/ppd/hpijs/hp-deskjet_2640_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3000_j310_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3000_j310_series-hpijs.ppd.gz Binary files differindex f51dc7fa4..6fa9293c2 100644 --- a/ppd/hpijs/hp-deskjet_3000_j310_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3000_j310_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3050_j610_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3050_j610_series-hpijs.ppd.gz Binary files differindex c116507b3..10375e0af 100644 --- a/ppd/hpijs/hp-deskjet_3050_j610_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3050_j610_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3050a_j611_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3050a_j611_series-hpijs.ppd.gz Binary files differindex 703724c76..e82f7dcb4 100644 --- a/ppd/hpijs/hp-deskjet_3050a_j611_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3050a_j611_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3070_b611_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3070_b611_series-hpijs.ppd.gz Binary files differindex 292a8f624..594d9d9d3 100644 --- a/ppd/hpijs/hp-deskjet_3070_b611_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3070_b611_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3320-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3320-hpijs.ppd.gz Binary files differindex 1b99bde74..efe2ab01f 100644 --- a/ppd/hpijs/hp-deskjet_3320-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3320-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3325-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3325-hpijs.ppd.gz Binary files differindex fcd937288..48778ec6d 100644 --- a/ppd/hpijs/hp-deskjet_3325-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3325-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3420-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3420-hpijs.ppd.gz Binary files differindex f60d05d00..c3eaa1c81 100644 --- a/ppd/hpijs/hp-deskjet_3420-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3420-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3425-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3425-hpijs.ppd.gz Binary files differindex 821a43a36..04c214497 100644 --- a/ppd/hpijs/hp-deskjet_3425-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3425-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3450-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3450-hpijs.ppd.gz Binary files differindex 12ff8bd85..7105c17d8 100644 --- a/ppd/hpijs/hp-deskjet_3450-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3450-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3500-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3500-hpijs.ppd.gz Binary files differindex aefecb037..be42575cf 100644 --- a/ppd/hpijs/hp-deskjet_3500-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3500-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3510_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3510_series-hpijs.ppd.gz Binary files differindex c167d1029..7c38d4a7c 100644 --- a/ppd/hpijs/hp-deskjet_3510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3520_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3520_series-hpijs.ppd.gz Binary files differindex 5b71d3202..1dac2f1bd 100644 --- a/ppd/hpijs/hp-deskjet_3520_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3520_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3540_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3540_series-hpijs.ppd.gz Binary files differindex 15f793fae..1a06fc564 100644 --- a/ppd/hpijs/hp-deskjet_3540_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3540_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3550-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3550-hpijs.ppd.gz Binary files differindex b5fa3884a..632ed8662 100644 --- a/ppd/hpijs/hp-deskjet_3550-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3550-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3600-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3600-hpijs.ppd.gz Binary files differindex d2bbb62dc..984b92a70 100644 --- a/ppd/hpijs/hp-deskjet_3600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3650-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3650-hpijs.ppd.gz Binary files differindex be36507a1..473a19a6a 100644 --- a/ppd/hpijs/hp-deskjet_3650-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3650-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3740-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3740-hpijs.ppd.gz Binary files differindex f5f90bc25..69e643a50 100644 --- a/ppd/hpijs/hp-deskjet_3740-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3740-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3810-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3810-hpijs.ppd.gz Binary files differindex f7d398a76..701139e4e 100644 --- a/ppd/hpijs/hp-deskjet_3810-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3810-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3816-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3816-hpijs.ppd.gz Binary files differindex a614aa172..5b3fbe722 100644 --- a/ppd/hpijs/hp-deskjet_3816-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3816-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3819-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3819-hpijs.ppd.gz Binary files differindex f0a869478..4a65bcd6f 100644 --- a/ppd/hpijs/hp-deskjet_3819-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3819-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3820-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3820-hpijs.ppd.gz Binary files differindex 18c2886e1..a2062c9db 100644 --- a/ppd/hpijs/hp-deskjet_3820-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3820-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3822-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3822-hpijs.ppd.gz Binary files differindex 9088799e1..0c38e69ae 100644 --- a/ppd/hpijs/hp-deskjet_3822-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3822-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3840-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3840-hpijs.ppd.gz Binary files differindex 5a20c3ea6..a6fbc799d 100644 --- a/ppd/hpijs/hp-deskjet_3840-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3840-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3870-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3870-hpijs.ppd.gz Binary files differindex 859c9e231..fe1373d5e 100644 --- a/ppd/hpijs/hp-deskjet_3870-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3870-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3900-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3900-hpijs.ppd.gz Binary files differindex 77ebb5b9e..23ddb7494 100644 --- a/ppd/hpijs/hp-deskjet_3900-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3900-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3910-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3910-hpijs.ppd.gz Binary files differindex 75e368f97..948bb2adc 100644 --- a/ppd/hpijs/hp-deskjet_3910-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3910-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3920-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3920-hpijs.ppd.gz Binary files differindex 35f22243b..7932fa182 100644 --- a/ppd/hpijs/hp-deskjet_3920-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3920-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3940-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3940-hpijs.ppd.gz Binary files differindex 63cda60e5..e9f9894bb 100644 --- a/ppd/hpijs/hp-deskjet_3940-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3940-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_400-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_400-hpijs.ppd.gz Binary files differindex 45bb5759f..8a1e02783 100644 --- a/ppd/hpijs/hp-deskjet_400-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_400-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_400l-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_400l-hpijs.ppd.gz Binary files differindex 8ab9062fd..2aa05a22d 100644 --- a/ppd/hpijs/hp-deskjet_400l-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_400l-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_4510_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_4510_series-hpijs.ppd.gz Binary files differindex 5b98f44ff..0924bd2b3 100644 --- a/ppd/hpijs/hp-deskjet_4510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_4510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_460-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_460-hpijs.ppd.gz Binary files differindex ad4fff2b8..c3102cf9d 100644 --- a/ppd/hpijs/hp-deskjet_460-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_460-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_4610_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_4610_series-hpijs.ppd.gz Binary files differindex e14305902..5f8148c9e 100644 --- a/ppd/hpijs/hp-deskjet_4610_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_4610_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_4620_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_4620_series-hpijs.ppd.gz Binary files differindex a0c19d607..91b68d6e3 100644 --- a/ppd/hpijs/hp-deskjet_4620_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_4620_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_500-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_500-hpijs.ppd.gz Binary files differindex 38e3a84ca..afd6e96e2 100644 --- a/ppd/hpijs/hp-deskjet_500-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_500-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_500c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_500c-hpijs.ppd.gz Binary files differindex ef01351de..715c8a42a 100644 --- a/ppd/hpijs/hp-deskjet_500c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_500c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_505j-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_505j-hpijs.ppd.gz Binary files differindex 3655b6d2f..f2089337d 100644 --- a/ppd/hpijs/hp-deskjet_505j-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_505j-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_510-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_510-hpijs.ppd.gz Binary files differindex 748fc18af..74622a209 100644 --- a/ppd/hpijs/hp-deskjet_510-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_510-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5100-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5100-hpijs.ppd.gz Binary files differindex eb119ee68..c699d7fd6 100644 --- a/ppd/hpijs/hp-deskjet_5100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_520-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_520-hpijs.ppd.gz Binary files differindex a79976301..1391dd7bd 100644 --- a/ppd/hpijs/hp-deskjet_520-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_520-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_540-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_540-hpijs.ppd.gz Binary files differindex 86c9d95a3..187d7e729 100644 --- a/ppd/hpijs/hp-deskjet_540-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_540-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5400_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5400_series-hpijs.ppd.gz Binary files differindex 79d18731e..831a6e1d3 100644 --- a/ppd/hpijs/hp-deskjet_5400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_550c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_550c-hpijs.ppd.gz Binary files differindex 020d0233a..b21675e4a 100644 --- a/ppd/hpijs/hp-deskjet_550c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_550c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5520_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5520_series-hpijs.ppd.gz Binary files differindex 1393fc274..7fd2e1750 100644 --- a/ppd/hpijs/hp-deskjet_5520_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5520_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5550-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5550-hpijs.ppd.gz Binary files differindex 9239df171..dd670c4f5 100644 --- a/ppd/hpijs/hp-deskjet_5550-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5550-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5551-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5551-hpijs.ppd.gz Binary files differindex 0114bebc9..600e170a2 100644 --- a/ppd/hpijs/hp-deskjet_5551-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5551-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5552-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5552-hpijs.ppd.gz Binary files differindex b8943c870..6f49809ee 100644 --- a/ppd/hpijs/hp-deskjet_5552-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5552-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5600-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5600-hpijs.ppd.gz Binary files differindex 7e671434d..98a917e69 100644 --- a/ppd/hpijs/hp-deskjet_5600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5650-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5650-hpijs.ppd.gz Binary files differindex 9286c5f82..794811bdd 100644 --- a/ppd/hpijs/hp-deskjet_5650-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5650-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5652-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5652-hpijs.ppd.gz Binary files differindex 93388cf79..09796693d 100644 --- a/ppd/hpijs/hp-deskjet_5652-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5652-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5700-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5700-hpijs.ppd.gz Binary files differindex d91a70944..467d0b34d 100644 --- a/ppd/hpijs/hp-deskjet_5700-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5700-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5800-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5800-hpijs.ppd.gz Binary files differindex 718ca97a6..013b11259 100644 --- a/ppd/hpijs/hp-deskjet_5800-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5800-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5850-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5850-hpijs.ppd.gz Binary files differindex 562392122..f3bc34895 100644 --- a/ppd/hpijs/hp-deskjet_5850-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5850-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5900_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5900_series-hpijs.ppd.gz Binary files differindex f344f10dd..8b3f5eaba 100644 --- a/ppd/hpijs/hp-deskjet_5900_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5900_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_600-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_600-hpijs.ppd.gz Binary files differindex 69955ca03..1fe8d655a 100644 --- a/ppd/hpijs/hp-deskjet_600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_610c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_610c-hpijs.ppd.gz Binary files differindex 652ce76a5..4fa15d5b1 100644 --- a/ppd/hpijs/hp-deskjet_610c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_610c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_610cl-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_610cl-hpijs.ppd.gz Binary files differindex 2e39fb488..9eac5b606 100644 --- a/ppd/hpijs/hp-deskjet_610cl-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_610cl-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6120-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6120-hpijs.ppd.gz Binary files differindex 914fc825c..ad3b95741 100644 --- a/ppd/hpijs/hp-deskjet_6120-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6120-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6122-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6122-hpijs.ppd.gz Binary files differindex 02898ee7b..b273182a2 100644 --- a/ppd/hpijs/hp-deskjet_6122-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6122-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6127-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6127-hpijs.ppd.gz Binary files differindex 359e875bf..e52613c68 100644 --- a/ppd/hpijs/hp-deskjet_6127-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6127-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_612c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_612c-hpijs.ppd.gz Binary files differindex 2505973a3..79738ff34 100644 --- a/ppd/hpijs/hp-deskjet_612c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_612c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_630c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_630c-hpijs.ppd.gz Binary files differindex 861a75ef2..e0ebdce41 100644 --- a/ppd/hpijs/hp-deskjet_630c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_630c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_632c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_632c-hpijs.ppd.gz Binary files differindex 99bb7a7b8..d9f5cff15 100644 --- a/ppd/hpijs/hp-deskjet_632c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_632c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_640c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_640c-hpijs.ppd.gz Binary files differindex 7bf06db37..47ee83c06 100644 --- a/ppd/hpijs/hp-deskjet_640c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_640c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_648c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_648c-hpijs.ppd.gz Binary files differindex 85a484903..238133432 100644 --- a/ppd/hpijs/hp-deskjet_648c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_648c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6500-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6500-hpijs.ppd.gz Binary files differindex 69b3ece86..ab56169b0 100644 --- a/ppd/hpijs/hp-deskjet_6500-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6500-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6520_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6520_series-hpijs.ppd.gz Binary files differindex 4295a215d..a6a364f9b 100644 --- a/ppd/hpijs/hp-deskjet_6520_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6520_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_656c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_656c-hpijs.ppd.gz Binary files differindex 28e718eb0..8c7d73791 100644 --- a/ppd/hpijs/hp-deskjet_656c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_656c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_660-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_660-hpijs.ppd.gz Binary files differindex cb7ebfaec..6ac18be58 100644 --- a/ppd/hpijs/hp-deskjet_660-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_660-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6600-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6600-hpijs.ppd.gz Binary files differindex ce3138298..7d14f3e29 100644 --- a/ppd/hpijs/hp-deskjet_6600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_670-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_670-hpijs.ppd.gz Binary files differindex 75afca6de..5e204ad75 100644 --- a/ppd/hpijs/hp-deskjet_670-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_670-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_670c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_670c-hpijs.ppd.gz Binary files differindex fd06f4109..7981ae946 100644 --- a/ppd/hpijs/hp-deskjet_670c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_670c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_670tv-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_670tv-hpijs.ppd.gz Binary files differindex d07e6ab9c..2adabfff8 100644 --- a/ppd/hpijs/hp-deskjet_670tv-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_670tv-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_672c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_672c-hpijs.ppd.gz Binary files differindex 1b90a6b1f..d66f6bf39 100644 --- a/ppd/hpijs/hp-deskjet_672c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_672c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_680-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_680-hpijs.ppd.gz Binary files differindex 44731685e..efa5e0ab2 100644 --- a/ppd/hpijs/hp-deskjet_680-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_680-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6800-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6800-hpijs.ppd.gz Binary files differindex bd8c8c11a..3b9e55bd3 100644 --- a/ppd/hpijs/hp-deskjet_6800-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6800-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_682-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_682-hpijs.ppd.gz Binary files differindex cd09ba758..f534cdf83 100644 --- a/ppd/hpijs/hp-deskjet_682-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_682-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_690-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_690-hpijs.ppd.gz Binary files differindex 671eb1069..bf8bef89d 100644 --- a/ppd/hpijs/hp-deskjet_690-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_690-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_690c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_690c-hpijs.ppd.gz Binary files differindex 728d7dd69..babd88030 100644 --- a/ppd/hpijs/hp-deskjet_690c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_690c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_692-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_692-hpijs.ppd.gz Binary files differindex 5b0da4150..54348376c 100644 --- a/ppd/hpijs/hp-deskjet_692-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_692-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_693-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_693-hpijs.ppd.gz Binary files differindex 25bb0607d..be4ad886a 100644 --- a/ppd/hpijs/hp-deskjet_693-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_693-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_694-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_694-hpijs.ppd.gz Binary files differindex b773697d8..752f1b3a3 100644 --- a/ppd/hpijs/hp-deskjet_694-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_694-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6940_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6940_series-hpijs.ppd.gz Binary files differindex 9e12efef1..8c46e45f9 100644 --- a/ppd/hpijs/hp-deskjet_6940_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6940_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_695-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_695-hpijs.ppd.gz Binary files differindex 5b6b24fee..44cf4e5eb 100644 --- a/ppd/hpijs/hp-deskjet_695-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_695-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_697-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_697-hpijs.ppd.gz Binary files differindex dcae5e4cf..ba806fa22 100644 --- a/ppd/hpijs/hp-deskjet_697-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_697-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6980_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6980_series-hpijs.ppd.gz Binary files differindex 0f1fff001..c726a5eaf 100644 --- a/ppd/hpijs/hp-deskjet_6980_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6980_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_810c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_810c-hpijs.ppd.gz Binary files differindex ecbc31141..cdd1f2e4b 100644 --- a/ppd/hpijs/hp-deskjet_810c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_810c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_812c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_812c-hpijs.ppd.gz Binary files differindex d77e9122a..8f0f54206 100644 --- a/ppd/hpijs/hp-deskjet_812c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_812c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz Binary files differindex 879b6a462..6ff610658 100644 --- a/ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_816c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_816c-hpijs.ppd.gz Binary files differindex 41bc77208..c3eeac6c3 100644 --- a/ppd/hpijs/hp-deskjet_816c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_816c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_825c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_825c-hpijs.ppd.gz Binary files differindex 0b00e4fd3..a8fc5df2e 100644 --- a/ppd/hpijs/hp-deskjet_825c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_825c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_830c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_830c-hpijs.ppd.gz Binary files differindex 35d7e392c..ae98ccbff 100644 --- a/ppd/hpijs/hp-deskjet_830c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_830c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_832c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_832c-hpijs.ppd.gz Binary files differindex 9c93ab1ac..85aecfc3f 100644 --- a/ppd/hpijs/hp-deskjet_832c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_832c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_840c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_840c-hpijs.ppd.gz Binary files differindex e786d385e..125af8606 100644 --- a/ppd/hpijs/hp-deskjet_840c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_840c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_841c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_841c-hpijs.ppd.gz Binary files differindex 4c75e06a5..72a235088 100644 --- a/ppd/hpijs/hp-deskjet_841c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_841c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_842c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_842c-hpijs.ppd.gz Binary files differindex fb60fc309..1bb605982 100644 --- a/ppd/hpijs/hp-deskjet_842c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_842c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_843c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_843c-hpijs.ppd.gz Binary files differindex 0a38c3ad0..15d58dcd7 100644 --- a/ppd/hpijs/hp-deskjet_843c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_843c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_845c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_845c-hpijs.ppd.gz Binary files differindex 0f2596df9..12b39a8e1 100644 --- a/ppd/hpijs/hp-deskjet_845c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_845c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_850c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_850c-hpijs.ppd.gz Binary files differindex 5a8d3e071..1b37027d5 100644 --- a/ppd/hpijs/hp-deskjet_850c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_850c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_855c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_855c-hpijs.ppd.gz Binary files differindex 7ef31c90f..e6d039f00 100644 --- a/ppd/hpijs/hp-deskjet_855c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_855c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_870c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_870c-hpijs.ppd.gz Binary files differindex 756a63540..48376703c 100644 --- a/ppd/hpijs/hp-deskjet_870c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_870c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_880c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_880c-hpijs.ppd.gz Binary files differindex bfc64861d..f13eff1a3 100644 --- a/ppd/hpijs/hp-deskjet_880c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_880c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_882c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_882c-hpijs.ppd.gz Binary files differindex bfa1f9e67..578bb83ca 100644 --- a/ppd/hpijs/hp-deskjet_882c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_882c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_890c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_890c-hpijs.ppd.gz Binary files differindex 7f5148f0c..9558a44a4 100644 --- a/ppd/hpijs/hp-deskjet_890c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_890c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_895c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_895c-hpijs.ppd.gz Binary files differindex 29f735e27..8a15dd5b2 100644 --- a/ppd/hpijs/hp-deskjet_895c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_895c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_916c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_916c-hpijs.ppd.gz Binary files differindex 5279d33e7..663ee85d9 100644 --- a/ppd/hpijs/hp-deskjet_916c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_916c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_920c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_920c-hpijs.ppd.gz Binary files differindex 24bf54414..095a1c728 100644 --- a/ppd/hpijs/hp-deskjet_920c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_920c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_9300-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_9300-hpijs.ppd.gz Binary files differindex 69c67d07e..82a565b6b 100644 --- a/ppd/hpijs/hp-deskjet_9300-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_9300-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_930c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_930c-hpijs.ppd.gz Binary files differindex 91f554c79..6017a6900 100644 --- a/ppd/hpijs/hp-deskjet_930c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_930c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_932c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_932c-hpijs.ppd.gz Binary files differindex 4a58cdd9c..1a079b67e 100644 --- a/ppd/hpijs/hp-deskjet_932c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_932c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_933c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_933c-hpijs.ppd.gz Binary files differindex a5fd0b2bf..e964e459f 100644 --- a/ppd/hpijs/hp-deskjet_933c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_933c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_934c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_934c-hpijs.ppd.gz Binary files differindex 3599d32c9..b37ecb36a 100644 --- a/ppd/hpijs/hp-deskjet_934c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_934c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_935c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_935c-hpijs.ppd.gz Binary files differindex b541b341e..1f67aad70 100644 --- a/ppd/hpijs/hp-deskjet_935c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_935c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_940c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_940c-hpijs.ppd.gz Binary files differindex c431fe212..a771d5526 100644 --- a/ppd/hpijs/hp-deskjet_940c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_940c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_948c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_948c-hpijs.ppd.gz Binary files differindex 32e10d3cb..b1ad07eb2 100644 --- a/ppd/hpijs/hp-deskjet_948c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_948c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_950c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_950c-hpijs.ppd.gz Binary files differindex a0b1dbfea..9fcec3f07 100644 --- a/ppd/hpijs/hp-deskjet_950c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_950c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_952c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_952c-hpijs.ppd.gz Binary files differindex 5383694a9..95090e8c6 100644 --- a/ppd/hpijs/hp-deskjet_952c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_952c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_955c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_955c-hpijs.ppd.gz Binary files differindex 6f1c240a7..e07949eb0 100644 --- a/ppd/hpijs/hp-deskjet_955c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_955c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_957c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_957c-hpijs.ppd.gz Binary files differindex dabb24880..1010c4dc1 100644 --- a/ppd/hpijs/hp-deskjet_957c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_957c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_959c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_959c-hpijs.ppd.gz Binary files differindex 4b7bab28d..833cd70c8 100644 --- a/ppd/hpijs/hp-deskjet_959c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_959c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_9600-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_9600-hpijs.ppd.gz Binary files differindex 764e13915..27675fa43 100644 --- a/ppd/hpijs/hp-deskjet_9600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_9600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_960c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_960c-hpijs.ppd.gz Binary files differindex 50f497abe..f8c12abd7 100644 --- a/ppd/hpijs/hp-deskjet_960c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_960c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_970c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_970c-hpijs.ppd.gz Binary files differindex d5549ea4f..062a6757f 100644 --- a/ppd/hpijs/hp-deskjet_970c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_970c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_975c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_975c-hpijs.ppd.gz Binary files differindex 5fe6f96c4..e0af3cd8a 100644 --- a/ppd/hpijs/hp-deskjet_975c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_975c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_9800-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_9800-hpijs.ppd.gz Binary files differindex fbdd061c6..5a32016e9 100644 --- a/ppd/hpijs/hp-deskjet_9800-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_9800-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_980c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_980c-hpijs.ppd.gz Binary files differindex 54017c92f..d608d7368 100644 --- a/ppd/hpijs/hp-deskjet_980c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_980c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_990c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_990c-hpijs.ppd.gz Binary files differindex 4fe20ed5b..74ea5d100 100644 --- a/ppd/hpijs/hp-deskjet_990c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_990c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_995c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_995c-hpijs.ppd.gz Binary files differindex 3a3de4127..4295d7cbf 100644 --- a/ppd/hpijs/hp-deskjet_995c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_995c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d1300_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d1300_series-hpijs.ppd.gz Binary files differindex 9234a8254..6ca47be48 100644 --- a/ppd/hpijs/hp-deskjet_d1300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d1300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d1400_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d1400_series-hpijs.ppd.gz Binary files differindex c0b3bdc49..5da63e41b 100644 --- a/ppd/hpijs/hp-deskjet_d1400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d1400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d1500_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d1500_series-hpijs.ppd.gz Binary files differindex d22b5aa9d..cb45de715 100644 --- a/ppd/hpijs/hp-deskjet_d1500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d1500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d1600_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d1600_series-hpijs.ppd.gz Binary files differindex 437ccd50f..ac8423a28 100644 --- a/ppd/hpijs/hp-deskjet_d1600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d1600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d2300_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d2300_series-hpijs.ppd.gz Binary files differindex 6d080df55..b1e815fa3 100644 --- a/ppd/hpijs/hp-deskjet_d2300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d2300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d2400_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d2400_series-hpijs.ppd.gz Binary files differindex 78d9c14ca..e6481a28e 100644 --- a/ppd/hpijs/hp-deskjet_d2400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d2400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d2500_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d2500_series-hpijs.ppd.gz Binary files differindex c87f6b583..4f587275e 100644 --- a/ppd/hpijs/hp-deskjet_d2500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d2500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d2600_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d2600_series-hpijs.ppd.gz Binary files differindex 9c95ffa87..97c51ea51 100644 --- a/ppd/hpijs/hp-deskjet_d2600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d2600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d4100_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d4100_series-hpijs.ppd.gz Binary files differindex 4e2ff0a66..a70712281 100644 --- a/ppd/hpijs/hp-deskjet_d4100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d4100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d4200_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d4200_series-hpijs.ppd.gz Binary files differindex 9e4ce82d0..341f0a857 100644 --- a/ppd/hpijs/hp-deskjet_d4200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d4200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d4300_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d4300_series-hpijs.ppd.gz Binary files differindex 0bf06158d..5608722f2 100644 --- a/ppd/hpijs/hp-deskjet_d4300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d4300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d5500_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d5500_series-hpijs.ppd.gz Binary files differindex b47e6e6b2..ba1f6f0e8 100644 --- a/ppd/hpijs/hp-deskjet_d5500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d5500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d730-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d730-hpijs.ppd.gz Binary files differindex 94ed06817..8460381ee 100644 --- a/ppd/hpijs/hp-deskjet_d730-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d730-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f2100_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f2100_series-hpijs.ppd.gz Binary files differindex 8f329be15..9cc7da283 100644 --- a/ppd/hpijs/hp-deskjet_f2100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f2100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f2200_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f2200_series-hpijs.ppd.gz Binary files differindex 28f36b76d..85998261a 100644 --- a/ppd/hpijs/hp-deskjet_f2200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f2200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f2400_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f2400_series-hpijs.ppd.gz Binary files differindex fad3dff3f..d898cb34e 100644 --- a/ppd/hpijs/hp-deskjet_f2400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f2400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f300_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f300_series-hpijs.ppd.gz Binary files differindex 8aa3cae31..6110ce6f2 100644 --- a/ppd/hpijs/hp-deskjet_f300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f4100_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f4100_series-hpijs.ppd.gz Binary files differindex 0755af13a..73ef852bb 100644 --- a/ppd/hpijs/hp-deskjet_f4100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f4100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f4200_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f4200_series-hpijs.ppd.gz Binary files differindex e4535ff6c..f6abc6e42 100644 --- a/ppd/hpijs/hp-deskjet_f4200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f4200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f4210_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f4210_series-hpijs.ppd.gz Binary files differindex 376a9c6a0..b8449a375 100644 --- a/ppd/hpijs/hp-deskjet_f4210_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f4210_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f4213_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f4213_series-hpijs.ppd.gz Binary files differindex 5c2aa92a5..ea82beacc 100644 --- a/ppd/hpijs/hp-deskjet_f4213_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f4213_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f4400_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f4400_series-hpijs.ppd.gz Binary files differindex 6b93b1ae2..9d50d4daa 100644 --- a/ppd/hpijs/hp-deskjet_f4400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f4400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f4500_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f4500_series-hpijs.ppd.gz Binary files differindex 5da3ae71c..35bc9b2ee 100644 --- a/ppd/hpijs/hp-deskjet_f4500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f4500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f735-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f735-hpijs.ppd.gz Binary files differindex 9ff68bde5..8ca289271 100644 --- a/ppd/hpijs/hp-deskjet_f735-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f735-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_ink_adv_2010_k010-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_ink_adv_2010_k010-hpijs.ppd.gz Binary files differindex c6a5183df..2979eebe5 100644 --- a/ppd/hpijs/hp-deskjet_ink_adv_2010_k010-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_ink_adv_2010_k010-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_ink_adv_2060_k110-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_ink_adv_2060_k110-hpijs.ppd.gz Binary files differindex ae682b0df..79f016f02 100644 --- a/ppd/hpijs/hp-deskjet_ink_adv_2060_k110-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_ink_adv_2060_k110-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz Binary files differindex 65911724b..d5f583dbc 100644 --- a/ppd/hpijs/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz Binary files differindex 000387b7f..0698bcaeb 100644 --- a/ppd/hpijs/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-dj350-hpijs.ppd.gz b/ppd/hpijs/hp-dj350-hpijs.ppd.gz Binary files differindex 3525d8b8f..a79704f62 100644 --- a/ppd/hpijs/hp-dj350-hpijs.ppd.gz +++ b/ppd/hpijs/hp-dj350-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-dj450-hpijs.ppd.gz b/ppd/hpijs/hp-dj450-hpijs.ppd.gz Binary files differindex c89dbce5f..573c2c1aa 100644 --- a/ppd/hpijs/hp-dj450-hpijs.ppd.gz +++ b/ppd/hpijs/hp-dj450-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-envy_100_d410_series-hpijs.ppd.gz b/ppd/hpijs/hp-envy_100_d410_series-hpijs.ppd.gz Binary files differindex 948f71c94..25705bd71 100644 --- a/ppd/hpijs/hp-envy_100_d410_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-envy_100_d410_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-envy_110_series-hpijs.ppd.gz b/ppd/hpijs/hp-envy_110_series-hpijs.ppd.gz Binary files differindex 004d43e37..973e66ab2 100644 --- a/ppd/hpijs/hp-envy_110_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-envy_110_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-envy_120_series-hpijs.ppd.gz b/ppd/hpijs/hp-envy_120_series-hpijs.ppd.gz Binary files differindex 5abae8785..ffa196e23 100644 --- a/ppd/hpijs/hp-envy_120_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-envy_120_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-envy_4500_series-hpijs.ppd.gz b/ppd/hpijs/hp-envy_4500_series-hpijs.ppd.gz Binary files differindex 5e581d683..a5f3e7389 100644 --- a/ppd/hpijs/hp-envy_4500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-envy_4500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-envy_5530_series-hpijs.ppd.gz b/ppd/hpijs/hp-envy_5530_series-hpijs.ppd.gz Binary files differindex 9894f143d..99582b67e 100644 --- a/ppd/hpijs/hp-envy_5530_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-envy_5530_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1000-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1000-hpijs.ppd.gz Binary files differindex d23cb40f6..31f7faa2e 100644 --- a/ppd/hpijs/hp-laserjet_1000-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1000-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1005_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1005_series-hpijs.ppd.gz Binary files differindex 777b9f6dc..f170613c5 100644 --- a/ppd/hpijs/hp-laserjet_1005_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1005_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1010-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1010-hpijs.ppd.gz Binary files differindex ddbea464c..ebb85306e 100644 --- a/ppd/hpijs/hp-laserjet_1010-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1010-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1012-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1012-hpijs.ppd.gz Binary files differindex b7b013a18..01271fc7b 100644 --- a/ppd/hpijs/hp-laserjet_1012-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1012-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1015-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1015-hpijs.ppd.gz Binary files differindex f677c5bd2..9751becc5 100644 --- a/ppd/hpijs/hp-laserjet_1015-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1015-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1018-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1018-hpijs.ppd.gz Binary files differindex 30eb383c9..87bc84f73 100644 --- a/ppd/hpijs/hp-laserjet_1018-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1018-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1020-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1020-hpijs.ppd.gz Binary files differindex 5a7a85858..c6c1f7736 100644 --- a/ppd/hpijs/hp-laserjet_1020-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1020-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1022-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1022-hpijs-pcl3.ppd.gz Binary files differindex a4ddfd621..b51035185 100644 --- a/ppd/hpijs/hp-laserjet_1022-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1022-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1022-hpijs-zjs.ppd.gz b/ppd/hpijs/hp-laserjet_1022-hpijs-zjs.ppd.gz Binary files differindex 1ab6122d2..966bbbf4c 100644 --- a/ppd/hpijs/hp-laserjet_1022-hpijs-zjs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1022-hpijs-zjs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1022n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1022n-hpijs-pcl3.ppd.gz Binary files differindex 6c3f3c40c..6c9c49d98 100644 --- a/ppd/hpijs/hp-laserjet_1022n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1022n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1022n-hpijs-zjs.ppd.gz b/ppd/hpijs/hp-laserjet_1022n-hpijs-zjs.ppd.gz Binary files differindex 856d69b4e..2cfd96c3f 100644 --- a/ppd/hpijs/hp-laserjet_1022n-hpijs-zjs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1022n-hpijs-zjs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz Binary files differindex 74d2603e9..b584675a0 100644 --- a/ppd/hpijs/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1022nw-hpijs-zjs.ppd.gz b/ppd/hpijs/hp-laserjet_1022nw-hpijs-zjs.ppd.gz Binary files differindex 45bb1d5b5..47b1bf097 100644 --- a/ppd/hpijs/hp-laserjet_1022nw-hpijs-zjs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1022nw-hpijs-zjs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1100-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1100-hpijs.ppd.gz Binary files differindex 3d862bfa5..1693adf23 100644 --- a/ppd/hpijs/hp-laserjet_1100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1100a-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1100a-hpijs.ppd.gz Binary files differindex 2125311f5..8a9dbb518 100644 --- a/ppd/hpijs/hp-laserjet_1100a-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1100a-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1100xi-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1100xi-hpijs.ppd.gz Binary files differindex 81f5a9f5d..eb6672ae4 100644 --- a/ppd/hpijs/hp-laserjet_1100xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1100xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1150-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1150-hpijs.ppd.gz Binary files differindex 01a324c0a..b3d5bd50f 100644 --- a/ppd/hpijs/hp-laserjet_1150-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1150-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1160-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1160-hpijs.ppd.gz Binary files differindex aff46b85d..58ae32a74 100644 --- a/ppd/hpijs/hp-laserjet_1160-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1160-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1160_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1160_series-hpijs.ppd.gz Binary files differindex ad3390d83..8e69e7670 100644 --- a/ppd/hpijs/hp-laserjet_1160_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1160_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1200-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1200-hpijs-pcl3.ppd.gz Binary files differindex a96e7ec19..d16a55ee3 100644 --- a/ppd/hpijs/hp-laserjet_1200-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1200-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1200n-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1200n-hpijs.ppd.gz Binary files differindex fa5d0e3a6..5fb32eaf2 100644 --- a/ppd/hpijs/hp-laserjet_1200n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1200n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1220-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1220-hpijs-pcl3.ppd.gz Binary files differindex af5508441..0dc8c3a79 100644 --- a/ppd/hpijs/hp-laserjet_1220-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1220-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1220se-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1220se-hpijs.ppd.gz Binary files differindex f3843b5cc..e737055f1 100644 --- a/ppd/hpijs/hp-laserjet_1220se-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1220se-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1300-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1300-hpijs-pcl3.ppd.gz Binary files differindex 5c9c7003a..c0fa4443f 100644 --- a/ppd/hpijs/hp-laserjet_1300-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1300-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1300n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1300n-hpijs-pcl3.ppd.gz Binary files differindex e859b8cb0..d7220d2fd 100644 --- a/ppd/hpijs/hp-laserjet_1300n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1300n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1300xi-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1300xi-hpijs-pcl3.ppd.gz Binary files differindex 4fe589c06..2b50b49bd 100644 --- a/ppd/hpijs/hp-laserjet_1300xi-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1300xi-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1320-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1320-hpijs.ppd.gz Binary files differindex 8a6a120a1..c00fb061c 100644 --- a/ppd/hpijs/hp-laserjet_1320-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1320-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1320_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1320_series-hpijs-pcl3.ppd.gz Binary files differindex 98428f3d3..1ae32a5bf 100644 --- a/ppd/hpijs/hp-laserjet_1320_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1320_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1320n-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1320n-hpijs.ppd.gz Binary files differindex e9a72cc24..7add5657d 100644 --- a/ppd/hpijs/hp-laserjet_1320n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1320n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1320nw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1320nw-hpijs.ppd.gz Binary files differindex d476000e0..04da567f2 100644 --- a/ppd/hpijs/hp-laserjet_1320nw-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1320nw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1320tn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1320tn-hpijs.ppd.gz Binary files differindex 4b6e1ce73..f72250b15 100644 --- a/ppd/hpijs/hp-laserjet_1320tn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1320tn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2100-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_2100-hpijs.ppd.gz Binary files differindex 401d09fd5..8b21b7388 100644 --- a/ppd/hpijs/hp-laserjet_2100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz Binary files differindex 18b0e84f7..30c0ba1a0 100644 --- a/ppd/hpijs/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2200-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_2200-hpijs-pcl3.ppd.gz Binary files differindex 081f3c10d..da85b86a7 100644 --- a/ppd/hpijs/hp-laserjet_2200-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2200-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2200_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_2200_series-hpijs.ppd.gz Binary files differindex caa2bd8ac..962b26abe 100644 --- a/ppd/hpijs/hp-laserjet_2200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2300-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_2300-hpijs-pcl3.ppd.gz Binary files differindex c2716edd9..6b92d2356 100644 --- a/ppd/hpijs/hp-laserjet_2300-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2300-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2300_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_2300_series-hpijs.ppd.gz Binary files differindex 5a881f8a6..95549ad5c 100644 --- a/ppd/hpijs/hp-laserjet_2300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2410-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_2410-hpijs-pcl3.ppd.gz Binary files differindex a903bb000..9411c58d6 100644 --- a/ppd/hpijs/hp-laserjet_2410-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2410-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2420-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_2420-hpijs-pcl3.ppd.gz Binary files differindex 83354ba7b..2466d4edc 100644 --- a/ppd/hpijs/hp-laserjet_2420-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2420-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2430-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_2430-hpijs-pcl3.ppd.gz Binary files differindex e6ccdb354..5bed55530 100644 --- a/ppd/hpijs/hp-laserjet_2430-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2430-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3015-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3015-hpijs-pcl3.ppd.gz Binary files differindex c783f3bdb..b31689e33 100644 --- a/ppd/hpijs/hp-laserjet_3015-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3015-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3020-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3020-hpijs-pcl3.ppd.gz Binary files differindex 3ab37aa73..4a1cfd68a 100644 --- a/ppd/hpijs/hp-laserjet_3020-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3020-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3030-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3030-hpijs-pcl3.ppd.gz Binary files differindex 101ff6109..8b9c19e78 100644 --- a/ppd/hpijs/hp-laserjet_3030-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3030-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3050-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3050-hpijs-pcl3.ppd.gz Binary files differindex 86473bb77..7ed7711a6 100644 --- a/ppd/hpijs/hp-laserjet_3050-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3050-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3052-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3052-hpijs-pcl3.ppd.gz Binary files differindex d345cf2e1..9042be1a0 100644 --- a/ppd/hpijs/hp-laserjet_3052-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3052-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3055-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3055-hpijs.ppd.gz Binary files differindex 538bc2609..92154ea49 100644 --- a/ppd/hpijs/hp-laserjet_3055-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3055-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3100-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3100-hpijs.ppd.gz Binary files differindex 347514849..1b2caf327 100644 --- a/ppd/hpijs/hp-laserjet_3100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3150-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3150-hpijs.ppd.gz Binary files differindex b7fa358a8..97dcadfbd 100644 --- a/ppd/hpijs/hp-laserjet_3150-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3150-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3200-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3200-hpijs.ppd.gz Binary files differindex 430029dcc..82b03007d 100644 --- a/ppd/hpijs/hp-laserjet_3200-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3200-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3200m-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3200m-hpijs-pcl3.ppd.gz Binary files differindex b1714b4f0..2bc0890f6 100644 --- a/ppd/hpijs/hp-laserjet_3200m-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3200m-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3200se-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3200se-hpijs.ppd.gz Binary files differindex db92392a9..6b7bae721 100644 --- a/ppd/hpijs/hp-laserjet_3200se-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3200se-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz Binary files differindex 12ed0e032..2555e300f 100644 --- a/ppd/hpijs/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3330-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3330-hpijs.ppd.gz Binary files differindex 1e0e83e22..0b02651d5 100644 --- a/ppd/hpijs/hp-laserjet_3330-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3330-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3380-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3380-hpijs-pcl3.ppd.gz Binary files differindex a7b7fd096..188742ff7 100644 --- a/ppd/hpijs/hp-laserjet_3380-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3380-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3390-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3390-hpijs-pcl3.ppd.gz Binary files differindex 0cd022f91..09659dac0 100644 --- a/ppd/hpijs/hp-laserjet_3390-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3390-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3392-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3392-hpijs.ppd.gz Binary files differindex 1056585a9..6e28632b0 100644 --- a/ppd/hpijs/hp-laserjet_3392-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3392-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4000_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4000_series-hpijs-pcl3.ppd.gz Binary files differindex d2d044535..9b22481b8 100644 --- a/ppd/hpijs/hp-laserjet_4000_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4000_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4050_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4050_series-hpijs-pcl3.ppd.gz Binary files differindex 2ef685fe7..1f3c0ba9a 100644 --- a/ppd/hpijs/hp-laserjet_4050_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4050_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4100_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4100_mfp-hpijs-pcl3.ppd.gz Binary files differindex ca3baa7ec..fb07533e9 100644 --- a/ppd/hpijs/hp-laserjet_4100_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4100_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4100_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4100_series-hpijs-pcl3.ppd.gz Binary files differindex f0f37c98a..cbc840d04 100644 --- a/ppd/hpijs/hp-laserjet_4100_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4100_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4150_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_4150_series-hpijs.ppd.gz Binary files differindex 4410f5ee4..d7a845aa6 100644 --- a/ppd/hpijs/hp-laserjet_4150_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4150_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4200-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4200-hpijs-pcl3.ppd.gz Binary files differindex 04aa4f233..a56b90af6 100644 --- a/ppd/hpijs/hp-laserjet_4200-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4200-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4240-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4240-hpijs-pcl3.ppd.gz Binary files differindex dbb6aad2f..66f95d92d 100644 --- a/ppd/hpijs/hp-laserjet_4240-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4240-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4250-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4250-hpijs-pcl3.ppd.gz Binary files differindex 66ebba57a..e52e164aa 100644 --- a/ppd/hpijs/hp-laserjet_4250-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4250-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4300-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4300-hpijs-pcl3.ppd.gz Binary files differindex f2ae7fa46..6eb290356 100644 --- a/ppd/hpijs/hp-laserjet_4300-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4300-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4345_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4345_mfp-hpijs-pcl3.ppd.gz Binary files differindex 84998fc8c..075212309 100644 --- a/ppd/hpijs/hp-laserjet_4345_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4345_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4350-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4350-hpijs-pcl3.ppd.gz Binary files differindex 6c38c3034..2933fcaf7 100644 --- a/ppd/hpijs/hp-laserjet_4350-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4350-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4_plus-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4_plus-hpijs-pcl3.ppd.gz Binary files differindex 24ea4a946..b8cbb2bb8 100644 --- a/ppd/hpijs/hp-laserjet_4_plus-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4_plus-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4l-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_4l-hpijs.ppd.gz Binary files differindex 469b36782..51604ede5 100644 --- a/ppd/hpijs/hp-laserjet_4l-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4l-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4ml-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_4ml-hpijs.ppd.gz Binary files differindex 812f10b9b..8d9c402dd 100644 --- a/ppd/hpijs/hp-laserjet_4ml-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4ml-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4mp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4mp-hpijs-pcl3.ppd.gz Binary files differindex 2cc2c1a5c..4f8d7ad4f 100644 --- a/ppd/hpijs/hp-laserjet_4mp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4mp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4si-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4si-hpijs-pcl3.ppd.gz Binary files differindex b7843d370..089d5a328 100644 --- a/ppd/hpijs/hp-laserjet_4si-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4si-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4v-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4v-hpijs-pcl3.ppd.gz Binary files differindex d3e9e10b8..e101ced2e 100644 --- a/ppd/hpijs/hp-laserjet_4v-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4v-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5000-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_5000-hpijs.ppd.gz Binary files differindex 60b301b94..ff16f7bdd 100644 --- a/ppd/hpijs/hp-laserjet_5000-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5000-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz Binary files differindex 758ad58a0..4c17fc528 100644 --- a/ppd/hpijs/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz Binary files differindex f8a9059c4..19323293b 100644 --- a/ppd/hpijs/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5200-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5200-hpijs-pcl3.ppd.gz Binary files differindex 08009ba1c..f0a976b8f 100644 --- a/ppd/hpijs/hp-laserjet_5200-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5200-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5200l-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5200l-hpijs-pcl3.ppd.gz Binary files differindex d821c8426..54799b6ce 100644 --- a/ppd/hpijs/hp-laserjet_5200l-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5200l-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5200lx-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_5200lx-hpijs.ppd.gz Binary files differindex 08d65d215..7e12dba92 100644 --- a/ppd/hpijs/hp-laserjet_5200lx-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5200lx-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5l-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_5l-hpijs.ppd.gz Binary files differindex a347a35b1..42d5ad114 100644 --- a/ppd/hpijs/hp-laserjet_5l-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5l-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5mp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5mp-hpijs-pcl3.ppd.gz Binary files differindex 05e9972a2..5adaa91c3 100644 --- a/ppd/hpijs/hp-laserjet_5mp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5mp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5p-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_5p-hpijs.ppd.gz Binary files differindex b6a5fe38d..31ec4a9c2 100644 --- a/ppd/hpijs/hp-laserjet_5p-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5p-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5si-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5si-hpijs-pcl3.ppd.gz Binary files differindex ec06c4e3c..0c009772e 100644 --- a/ppd/hpijs/hp-laserjet_5si-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5si-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz Binary files differindex c39e81c66..c93210762 100644 --- a/ppd/hpijs/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_6l-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_6l-hpijs.ppd.gz Binary files differindex ee4164253..a1426ee51 100644 --- a/ppd/hpijs/hp-laserjet_6l-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_6l-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_6mp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_6mp-hpijs-pcl3.ppd.gz Binary files differindex 94a617f7f..b5baeab19 100644 --- a/ppd/hpijs/hp-laserjet_6mp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_6mp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_6p-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_6p-hpijs.ppd.gz Binary files differindex 582f1553a..b194de269 100644 --- a/ppd/hpijs/hp-laserjet_6p-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_6p-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_8000-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_8000-hpijs.ppd.gz Binary files differindex 144e50d6d..c6464ee7b 100644 --- a/ppd/hpijs/hp-laserjet_8000-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_8000-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz Binary files differindex 6a8b03911..a32b1c62f 100644 --- a/ppd/hpijs/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_8100_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_8100_mfp-hpijs.ppd.gz Binary files differindex 30fc0a412..da8d647fd 100644 --- a/ppd/hpijs/hp-laserjet_8100_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_8100_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz Binary files differindex ca9c3a715..9279060c4 100644 --- a/ppd/hpijs/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_8150_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_8150_mfp-hpijs.ppd.gz Binary files differindex 6007f807f..5616bc208 100644 --- a/ppd/hpijs/hp-laserjet_8150_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_8150_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_8150_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_8150_series-hpijs-pcl3.ppd.gz Binary files differindex 8d1905a3c..ae2285ddd 100644 --- a/ppd/hpijs/hp-laserjet_8150_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_8150_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9000_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9000_mfp-hpijs-pcl3.ppd.gz Binary files differindex 18c1946c6..b6d846505 100644 --- a/ppd/hpijs/hp-laserjet_9000_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9000_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9000_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9000_series-hpijs-pcl3.ppd.gz Binary files differindex f8b008df3..d5e1c9093 100644 --- a/ppd/hpijs/hp-laserjet_9000_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9000_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9040-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9040-hpijs-pcl3.ppd.gz Binary files differindex c43b8d050..457d8c1b3 100644 --- a/ppd/hpijs/hp-laserjet_9040-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9040-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9040_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9040_mfp-hpijs-pcl3.ppd.gz Binary files differindex 21db17526..92a6cbbe5 100644 --- a/ppd/hpijs/hp-laserjet_9040_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9040_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9050-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9050-hpijs-pcl3.ppd.gz Binary files differindex d3248d8fe..df6ea40b9 100644 --- a/ppd/hpijs/hp-laserjet_9050-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9050-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9050_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9050_mfp-hpijs-pcl3.ppd.gz Binary files differindex 3424ef355..502f36fab 100644 --- a/ppd/hpijs/hp-laserjet_9050_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9050_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9055mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9055mfp-hpijs-pcl3.ppd.gz Binary files differindex d01e1b313..d1c02e8aa 100644 --- a/ppd/hpijs/hp-laserjet_9055mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9055mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz Binary files differindex da0b16304..ed7078230 100644 --- a/ppd/hpijs/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1411fn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1411fn-hpijs-pcl3.ppd.gz Binary files differindex 91a9d7491..359662a25 100644 --- a/ppd/hpijs/hp-laserjet_cm1411fn-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cm1411fn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1412fn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1412fn-hpijs-pcl3.ppd.gz Binary files differindex aa41ebef9..5dce09cf1 100644 --- a/ppd/hpijs/hp-laserjet_cm1412fn-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cm1412fn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1413fn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1413fn-hpijs-pcl3.ppd.gz Binary files differindex 76556d719..ae49bacc2 100644 --- a/ppd/hpijs/hp-laserjet_cm1413fn-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cm1413fn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1415fn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1415fn-hpijs-pcl3.ppd.gz Binary files differindex e7bc9e68d..c1c121c44 100644 --- a/ppd/hpijs/hp-laserjet_cm1415fn-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cm1415fn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1415fnw-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1415fnw-hpijs-pcl3.ppd.gz Binary files differindex cfe984757..1ba4db36e 100644 --- a/ppd/hpijs/hp-laserjet_cm1415fnw-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cm1415fnw-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1416fnw-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1416fnw-hpijs-pcl3.ppd.gz Binary files differindex f66eb05b7..adc3ed141 100644 --- a/ppd/hpijs/hp-laserjet_cm1416fnw-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cm1416fnw-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1417fnw-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1417fnw-hpijs-pcl3.ppd.gz Binary files differindex 0f730f85e..20b130243 100644 --- a/ppd/hpijs/hp-laserjet_cm1417fnw-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cm1417fnw-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz Binary files differindex 17b8a661a..102b1c52a 100644 --- a/ppd/hpijs/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cp1025-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_cp1025-hpijs.ppd.gz Binary files differindex 340c3b5a8..6841d5bdb 100644 --- a/ppd/hpijs/hp-laserjet_cp1025-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cp1025-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cp1025nw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_cp1025nw-hpijs.ppd.gz Binary files differindex ab62a3280..eec660944 100644 --- a/ppd/hpijs/hp-laserjet_cp1025nw-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cp1025nw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cp_1025-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_cp_1025-hpijs.ppd.gz Binary files differindex 47b6d0bfe..e6db030a7 100644 --- a/ppd/hpijs/hp-laserjet_cp_1025-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cp_1025-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cp_1025nw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_cp_1025nw-hpijs.ppd.gz Binary files differindex c4bcf3f64..819ed85f0 100644 --- a/ppd/hpijs/hp-laserjet_cp_1025nw-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cp_1025nw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1005-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_m1005-hpijs.ppd.gz Binary files differindex f0fe1c8c4..09cc09685 100644 --- a/ppd/hpijs/hp-laserjet_m1005-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1005-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1120_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_m1120_mfp-hpijs.ppd.gz Binary files differindex 818a34289..383e86f03 100644 --- a/ppd/hpijs/hp-laserjet_m1120_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1120_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1120n_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_m1120n_mfp-hpijs.ppd.gz Binary files differindex d4d879485..1a91b09a7 100644 --- a/ppd/hpijs/hp-laserjet_m1120n_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1120n_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1319f_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_m1319f_mfp-hpijs.ppd.gz Binary files differindex 93d16cb05..b03da383d 100644 --- a/ppd/hpijs/hp-laserjet_m1319f_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1319f_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz Binary files differindex d4fc1c93c..d4748d601 100644 --- a/ppd/hpijs/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz Binary files differindex 687b8dfed..e2f2d7312 100644 --- a/ppd/hpijs/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz Binary files differindex 120c182f5..434a862de 100644 --- a/ppd/hpijs/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz Binary files differindex 119b1a8fa..9a90fbaba 100644 --- a/ppd/hpijs/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m2727_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m2727_mfp-hpijs-pcl3.ppd.gz Binary files differindex bb8aa50bc..4dcd34d4e 100644 --- a/ppd/hpijs/hp-laserjet_m2727_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m2727_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz Binary files differindex 3d1b6af02..7d2ea7458 100644 --- a/ppd/hpijs/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz Binary files differindex 770a45219..8c89175b0 100644 --- a/ppd/hpijs/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz Binary files differindex e8de604f9..0e6b5805e 100644 --- a/ppd/hpijs/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz Binary files differindex d6113ea2b..5dd1bbbf0 100644 --- a/ppd/hpijs/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m5025_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m5025_mfp-hpijs-pcl3.ppd.gz Binary files differindex 38eff7bcf..00ac508dc 100644 --- a/ppd/hpijs/hp-laserjet_m5025_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m5025_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz Binary files differindex f5fb1c81b..d83fe422c 100644 --- a/ppd/hpijs/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz Binary files differindex ee9fb532b..6f64fc13d 100644 --- a/ppd/hpijs/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz Binary files differindex e786f2514..db11c1725 100644 --- a/ppd/hpijs/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz Binary files differindex 0366bb655..b149fd7ab 100644 --- a/ppd/hpijs/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz Binary files differindex da580e306..777742970 100644 --- a/ppd/hpijs/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1005-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p1005-hpijs.ppd.gz Binary files differindex e1b69d3e5..026313da7 100644 --- a/ppd/hpijs/hp-laserjet_p1005-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1005-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1006-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p1006-hpijs.ppd.gz Binary files differindex 0710208f3..c366bc468 100644 --- a/ppd/hpijs/hp-laserjet_p1006-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1006-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1007-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p1007-hpijs.ppd.gz Binary files differindex 2a49483e0..c4c81406c 100644 --- a/ppd/hpijs/hp-laserjet_p1007-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1007-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1008-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p1008-hpijs.ppd.gz Binary files differindex af70df72a..59a9a1eaf 100644 --- a/ppd/hpijs/hp-laserjet_p1008-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1008-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1009-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p1009-hpijs.ppd.gz Binary files differindex 8eed688c0..2cc84f59d 100644 --- a/ppd/hpijs/hp-laserjet_p1009-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1009-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1505-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p1505-hpijs.ppd.gz Binary files differindex ced50c359..8445e0f17 100644 --- a/ppd/hpijs/hp-laserjet_p1505-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1505-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1505n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p1505n-hpijs-pcl3.ppd.gz Binary files differindex c0f2ec18c..205bc2317 100644 --- a/ppd/hpijs/hp-laserjet_p1505n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1505n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1505n-hpijs-zxs.ppd.gz b/ppd/hpijs/hp-laserjet_p1505n-hpijs-zxs.ppd.gz Binary files differindex 4f47d1dcd..6832d839b 100644 --- a/ppd/hpijs/hp-laserjet_p1505n-hpijs-zxs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1505n-hpijs-zxs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2014-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2014-hpijs-pcl3.ppd.gz Binary files differindex b53a03a05..86e1b285c 100644 --- a/ppd/hpijs/hp-laserjet_p2014-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2014-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2014-hpijs-zxs.ppd.gz b/ppd/hpijs/hp-laserjet_p2014-hpijs-zxs.ppd.gz Binary files differindex 5cfa032ef..8b62103a0 100644 --- a/ppd/hpijs/hp-laserjet_p2014-hpijs-zxs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2014-hpijs-zxs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2014n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2014n-hpijs-pcl3.ppd.gz Binary files differindex ccbe89cf0..53e5e3c50 100644 --- a/ppd/hpijs/hp-laserjet_p2014n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2014n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2014n-hpijs-zxs.ppd.gz b/ppd/hpijs/hp-laserjet_p2014n-hpijs-zxs.ppd.gz Binary files differindex 7617c1517..1ded03a36 100644 --- a/ppd/hpijs/hp-laserjet_p2014n-hpijs-zxs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2014n-hpijs-zxs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz Binary files differindex be5d8bb44..0ebd324ee 100644 --- a/ppd/hpijs/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2015d_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p2015d_series-hpijs.ppd.gz Binary files differindex 31622b4b7..e26fdd49d 100644 --- a/ppd/hpijs/hp-laserjet_p2015d_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2015d_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2015dn_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p2015dn_series-hpijs.ppd.gz Binary files differindex f910ceefa..72d4094c2 100644 --- a/ppd/hpijs/hp-laserjet_p2015dn_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2015dn_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2015n_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p2015n_series-hpijs.ppd.gz Binary files differindex 422ff6623..8f05b7bbb 100644 --- a/ppd/hpijs/hp-laserjet_p2015n_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2015n_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2015x_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p2015x_series-hpijs.ppd.gz Binary files differindex 66a479467..04ec0b2f5 100644 --- a/ppd/hpijs/hp-laserjet_p2015x_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2015x_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2035-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2035-hpijs-pcl3.ppd.gz Binary files differindex 0ec20a860..2657fd06b 100644 --- a/ppd/hpijs/hp-laserjet_p2035-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2035-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2035-hpijs-zjs.ppd.gz b/ppd/hpijs/hp-laserjet_p2035-hpijs-zjs.ppd.gz Binary files differindex b55005b42..4c4cf8dc1 100644 --- a/ppd/hpijs/hp-laserjet_p2035-hpijs-zjs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2035-hpijs-zjs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz Binary files differindex fa390f9c0..b5d28454f 100644 --- a/ppd/hpijs/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2035n-hpijs-zjs.ppd.gz b/ppd/hpijs/hp-laserjet_p2035n-hpijs-zjs.ppd.gz Binary files differindex b4329b441..51a226c2c 100644 --- a/ppd/hpijs/hp-laserjet_p2035n-hpijs-zjs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2035n-hpijs-zjs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2055-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2055-hpijs-pcl3.ppd.gz Binary files differindex 032a72fab..cc1747ef5 100644 --- a/ppd/hpijs/hp-laserjet_p2055-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2055-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2055d-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2055d-hpijs-pcl3.ppd.gz Binary files differindex 372301c6c..aab2a5a68 100644 --- a/ppd/hpijs/hp-laserjet_p2055d-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2055d-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz Binary files differindex 61a874e3a..bbc72a2bc 100644 --- a/ppd/hpijs/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2055x-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2055x-hpijs-pcl3.ppd.gz Binary files differindex e501dc605..7825140fb 100644 --- a/ppd/hpijs/hp-laserjet_p2055x-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2055x-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p3004-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p3004-hpijs-pcl3.ppd.gz Binary files differindex 0fa3e9164..82d725485 100644 --- a/ppd/hpijs/hp-laserjet_p3004-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p3004-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p3005-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p3005-hpijs-pcl3.ppd.gz Binary files differindex aefefd62f..f7692523d 100644 --- a/ppd/hpijs/hp-laserjet_p3005-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p3005-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p3010_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p3010_series-hpijs-pcl3.ppd.gz Binary files differindex 93344ef97..06d56d889 100644 --- a/ppd/hpijs/hp-laserjet_p3010_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p3010_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4014-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4014-hpijs.ppd.gz Binary files differindex 1860f25c3..15a818bcd 100644 --- a/ppd/hpijs/hp-laserjet_p4014-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4014-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4014dn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4014dn-hpijs.ppd.gz Binary files differindex 99ab2188b..83dba8c99 100644 --- a/ppd/hpijs/hp-laserjet_p4014dn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4014dn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4014n-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4014n-hpijs.ppd.gz Binary files differindex a783097ac..b36069ef4 100644 --- a/ppd/hpijs/hp-laserjet_p4014n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4014n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4015-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4015-hpijs.ppd.gz Binary files differindex 95ed96b10..9d889064c 100644 --- a/ppd/hpijs/hp-laserjet_p4015-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4015-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4015dn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4015dn-hpijs.ppd.gz Binary files differindex d28683a77..0f41ed3c4 100644 --- a/ppd/hpijs/hp-laserjet_p4015dn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4015dn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4015n-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4015n-hpijs.ppd.gz Binary files differindex 0c758e58a..203620afa 100644 --- a/ppd/hpijs/hp-laserjet_p4015n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4015n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4015tn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4015tn-hpijs.ppd.gz Binary files differindex 56eb643ad..894b085f3 100644 --- a/ppd/hpijs/hp-laserjet_p4015tn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4015tn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4015x-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4015x-hpijs.ppd.gz Binary files differindex 1024b6a2d..27b480cde 100644 --- a/ppd/hpijs/hp-laserjet_p4015x-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4015x-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4515-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4515-hpijs.ppd.gz Binary files differindex 1088cb22a..739c14cba 100644 --- a/ppd/hpijs/hp-laserjet_p4515-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4515-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4515n-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4515n-hpijs.ppd.gz Binary files differindex 651800ad0..8dd6748a1 100644 --- a/ppd/hpijs/hp-laserjet_p4515n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4515n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4515tn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4515tn-hpijs.ppd.gz Binary files differindex 7fc70830c..9164ea05f 100644 --- a/ppd/hpijs/hp-laserjet_p4515tn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4515tn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4515x-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4515x-hpijs.ppd.gz Binary files differindex e4678741b..401d6a1a1 100644 --- a/ppd/hpijs/hp-laserjet_p4515x-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4515x-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4515xm-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4515xm-hpijs.ppd.gz Binary files differindex e3f05d7a4..912a0aa9f 100644 --- a/ppd/hpijs/hp-laserjet_p4515xm-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4515xm-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m127fn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m127fn-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..607907de0 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m127fn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m127fw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m127fw-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..6b42009e9 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m127fw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz Binary files differindex 9f6559713..21681c472 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz Binary files differindex 35d59864f..7a74b7906 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1137_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1137_mfp-hpijs.ppd.gz Binary files differindex e1ff17ab7..b2b15d04a 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1137_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1137_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1138_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1138_mfp-hpijs.ppd.gz Binary files differindex c47a37d3e..f3c347d92 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1138_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1138_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1139_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1139_mfp-hpijs.ppd.gz Binary files differindex daadd8242..88d48227c 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1139_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1139_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz Binary files differindex ff1d4e312..f0ce0a881 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz Binary files differindex e036bc08a..92ef76451 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz Binary files differindex a7ffefb2c..155ccc743 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1216nfh_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1216nfh_mfp-hpijs.ppd.gz Binary files differindex 6203c0d3d..ee7eedc80 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1216nfh_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1216nfh_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz Binary files differindex d06a0bd4b..28a220d9e 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1218nfg_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1218nfg_mfp-hpijs.ppd.gz Binary files differindex 346cee861..a647ca086 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1218nfg_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1218nfg_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1218nfs_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1218nfs_mfp-hpijs.ppd.gz Binary files differindex fd29e575a..964cbbe73 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1218nfs_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1218nfs_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1219nf_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1219nf_mfp-hpijs.ppd.gz Binary files differindex 90f1e781a..de108de9f 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1219nf_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1219nf_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1219nfg_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1219nfg_mfp-hpijs.ppd.gz Binary files differindex 9e1148c97..bf8566491 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1219nfg_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1219nfg_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1219nfs_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1219nfs_mfp-hpijs.ppd.gz Binary files differindex 7d353ac91..3d3c0dc17 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1219nfs_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1219nfs_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1102-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1102-hpijs.ppd.gz Binary files differindex 946552cc6..a1fa67838 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1102-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1102-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz Binary files differindex 6cedfe48e..9e2c771af 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1106-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1106-hpijs.ppd.gz Binary files differindex 978607353..11499a0c4 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1106-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1106-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1106w-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1106w-hpijs.ppd.gz Binary files differindex 834e525ef..3650b1f2b 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1106w-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1106w-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1107-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1107-hpijs.ppd.gz Binary files differindex db4559e26..41af65a0c 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1107-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1107-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1107w-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1107w-hpijs.ppd.gz Binary files differindex bc597b3e2..f765e2f8c 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1107w-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1107w-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1108-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1108-hpijs.ppd.gz Binary files differindex 83c172e26..c83eb17f6 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1108-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1108-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1108w-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1108w-hpijs.ppd.gz Binary files differindex b465476c9..1368a8d70 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1108w-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1108w-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1109-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1109-hpijs.ppd.gz Binary files differindex 981ddbd63..7a388d598 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1109-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1109-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1109w-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1109w-hpijs.ppd.gz Binary files differindex 7342ccbb0..0e0e90abd 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1109w-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1109w-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1566-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1566-hpijs.ppd.gz Binary files differindex c38118565..8cc929cd7 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1566-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1566-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1567-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1567-hpijs.ppd.gz Binary files differindex 63d7e18e7..54005cc45 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1567-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1567-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1568-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1568-hpijs.ppd.gz Binary files differindex fe26b474d..1b7621290 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1568-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1568-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1569-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1569-hpijs.ppd.gz Binary files differindex 81c51707b..0aa239b68 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1569-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1569-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1606dn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1606dn-hpijs.ppd.gz Binary files differindex afc7449c6..38398a1ba 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1606dn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1606dn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1607dn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1607dn-hpijs.ppd.gz Binary files differindex 8d72ad775..30dcfc8dd 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1607dn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1607dn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1608dn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1608dn-hpijs.ppd.gz Binary files differindex d8de27c99..d3828e463 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1608dn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1608dn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1609dn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1609dn-hpijs.ppd.gz Binary files differindex b57d0703f..c83140e2c 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1609dn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1609dn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p_1102w-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p_1102w-hpijs.ppd.gz Binary files differindex 71bda6a18..b3be2ccd4 100644 --- a/ppd/hpijs/hp-laserjet_professional_p_1102w-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p_1102w-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-mopier_240-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-mopier_240-hpijs-pcl3.ppd.gz Binary files differindex 0d1209ba1..fcbb47981 100644 --- a/ppd/hpijs/hp-mopier_240-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-mopier_240-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-mopier_320-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-mopier_320-hpijs-pcl3.ppd.gz Binary files differindex 2fe2ac77d..86c490525 100644 --- a/ppd/hpijs/hp-mopier_320-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-mopier_320-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-officejet-hpijs.ppd.gz b/ppd/hpijs/hp-officejet-hpijs.ppd.gz Binary files differindex 120eb05ce..2d526346f 100644 --- a/ppd/hpijs/hp-officejet-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_100_mobile_l411-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_100_mobile_l411-hpijs.ppd.gz Binary files differindex d3c3e1fa4..e69d56eb5 100644 --- a/ppd/hpijs/hp-officejet_100_mobile_l411-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_100_mobile_l411-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_150_mobile_l511-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_150_mobile_l511-hpijs.ppd.gz Binary files differindex 7bac89de2..52fbba1b2 100644 --- a/ppd/hpijs/hp-officejet_150_mobile_l511-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_150_mobile_l511-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_2620_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_2620_series-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..0267c0e01 --- /dev/null +++ b/ppd/hpijs/hp-officejet_2620_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4000_k210-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4000_k210-hpijs.ppd.gz Binary files differindex 56b46cb24..2d8139a58 100644 --- a/ppd/hpijs/hp-officejet_4000_k210-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4000_k210-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4100_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4100_series-hpijs.ppd.gz Binary files differindex ce0bae3f7..1617a2cfb 100644 --- a/ppd/hpijs/hp-officejet_4100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4105-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4105-hpijs.ppd.gz Binary files differindex fa539561d..b579701b3 100644 --- a/ppd/hpijs/hp-officejet_4105-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4105-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4115_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4115_series-hpijs.ppd.gz Binary files differindex 3bbfc7326..6571bc31a 100644 --- a/ppd/hpijs/hp-officejet_4115_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4115_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4200_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4200_series-hpijs.ppd.gz Binary files differindex 68ba5bea7..6854adda6 100644 --- a/ppd/hpijs/hp-officejet_4200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4255-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4255-hpijs.ppd.gz Binary files differindex c319def82..276050680 100644 --- a/ppd/hpijs/hp-officejet_4255-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4255-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4300_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4300_series-hpijs.ppd.gz Binary files differindex 74164bfca..4675ccb7f 100644 --- a/ppd/hpijs/hp-officejet_4300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4400_k410-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4400_k410-hpijs.ppd.gz Binary files differindex 232d24610..b993f3afc 100644 --- a/ppd/hpijs/hp-officejet_4400_k410-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4400_k410-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4500_g510a-f-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4500_g510a-f-hpijs.ppd.gz Binary files differindex 2bb2511b3..613a90888 100644 --- a/ppd/hpijs/hp-officejet_4500_g510a-f-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4500_g510a-f-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4500_g510g-m-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4500_g510g-m-hpijs.ppd.gz Binary files differindex ba4e20f53..ed84893fc 100644 --- a/ppd/hpijs/hp-officejet_4500_g510g-m-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4500_g510g-m-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4500_g510n-z-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4500_g510n-z-hpijs.ppd.gz Binary files differindex c0a008447..6dcf486fc 100644 --- a/ppd/hpijs/hp-officejet_4500_g510n-z-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4500_g510n-z-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4500_k710-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4500_k710-hpijs.ppd.gz Binary files differindex c07b85b3a..f8e7b1844 100644 --- a/ppd/hpijs/hp-officejet_4500_k710-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4500_k710-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4610_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4610_series-hpijs.ppd.gz Binary files differindex 5df6a4624..cc47e5725 100644 --- a/ppd/hpijs/hp-officejet_4610_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4610_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4620_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4620_series-hpijs.ppd.gz Binary files differindex 2a66a079f..1ddfe7c37 100644 --- a/ppd/hpijs/hp-officejet_4620_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4620_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4630_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4630_series-hpijs.ppd.gz Binary files differindex 6df760fee..e7acc23f0 100644 --- a/ppd/hpijs/hp-officejet_4630_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4630_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_5100_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_5100_series-hpijs.ppd.gz Binary files differindex 0b8f41b50..99326e6b0 100644 --- a/ppd/hpijs/hp-officejet_5100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_5100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_5105-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_5105-hpijs.ppd.gz Binary files differindex e151bda36..5c2aad705 100644 --- a/ppd/hpijs/hp-officejet_5105-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_5105-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_5110-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_5110-hpijs.ppd.gz Binary files differindex e3f6e3b25..b4ec93461 100644 --- a/ppd/hpijs/hp-officejet_5110-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_5110-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_5110v-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_5110v-hpijs.ppd.gz Binary files differindex e6225e3b0..7203e6391 100644 --- a/ppd/hpijs/hp-officejet_5110v-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_5110v-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_5500_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_5500_series-hpijs.ppd.gz Binary files differindex e3eb1061a..0b5a9d5f0 100644 --- a/ppd/hpijs/hp-officejet_5500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_5500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_5600_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_5600_series-hpijs.ppd.gz Binary files differindex e481eb27a..f101acaa6 100644 --- a/ppd/hpijs/hp-officejet_5600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_5600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6000_e609a-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6000_e609a-hpijs.ppd.gz Binary files differindex 1f175e4e0..56f889f2b 100644 --- a/ppd/hpijs/hp-officejet_6000_e609a-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6000_e609a-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6000_e609n-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6000_e609n-hpijs.ppd.gz Binary files differindex e2a430715..67f6d1bdb 100644 --- a/ppd/hpijs/hp-officejet_6000_e609n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6000_e609n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6100-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6100-hpijs.ppd.gz Binary files differindex 6f38b1ca8..171019320 100644 --- a/ppd/hpijs/hp-officejet_6100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6100_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6100_series-hpijs.ppd.gz Binary files differindex 777d5e521..f9fac7e7f 100644 --- a/ppd/hpijs/hp-officejet_6100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6150_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6150_series-hpijs.ppd.gz Binary files differindex de4cd15ce..4a2914d60 100644 --- a/ppd/hpijs/hp-officejet_6150_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6150_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6200_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6200_series-hpijs.ppd.gz Binary files differindex 2f1fd7791..ce535a957 100644 --- a/ppd/hpijs/hp-officejet_6200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6300_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6300_series-hpijs.ppd.gz Binary files differindex 6da58de64..3b148ea47 100644 --- a/ppd/hpijs/hp-officejet_6300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6500_e709a-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6500_e709a-hpijs.ppd.gz Binary files differindex 03dc89f39..ab02415bf 100644 --- a/ppd/hpijs/hp-officejet_6500_e709a-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6500_e709a-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6500_e709n-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6500_e709n-hpijs.ppd.gz Binary files differindex c6d3fac06..5e3411990 100644 --- a/ppd/hpijs/hp-officejet_6500_e709n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6500_e709n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6500_e710a-f-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6500_e710a-f-hpijs.ppd.gz Binary files differindex 21dbb75a1..1fe719e24 100644 --- a/ppd/hpijs/hp-officejet_6500_e710a-f-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6500_e710a-f-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6500_e710n-z-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6500_e710n-z-hpijs.ppd.gz Binary files differindex f0ab018f3..57cc73ccf 100644 --- a/ppd/hpijs/hp-officejet_6500_e710n-z-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6500_e710n-z-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6600-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6600-hpijs.ppd.gz Binary files differindex 9acb98f81..85989baff 100644 --- a/ppd/hpijs/hp-officejet_6600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6700-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6700-hpijs.ppd.gz Binary files differindex 445689ad6..29d7565c4 100644 --- a/ppd/hpijs/hp-officejet_6700-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6700-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7000_e809a-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7000_e809a-hpijs.ppd.gz Binary files differindex d86315211..0098d6b5a 100644 --- a/ppd/hpijs/hp-officejet_7000_e809a-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7000_e809a-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7000_e809a_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7000_e809a_series-hpijs.ppd.gz Binary files differindex 2c69082c7..238e62faf 100644 --- a/ppd/hpijs/hp-officejet_7000_e809a_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7000_e809a_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7100_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7100_series-hpijs.ppd.gz Binary files differindex 80f3f3334..0b5794bea 100644 --- a/ppd/hpijs/hp-officejet_7100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7110_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7110_series-hpijs.ppd.gz Binary files differindex 50695d1f4..ffdc6435f 100644 --- a/ppd/hpijs/hp-officejet_7110_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7110_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7200_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7200_series-hpijs.ppd.gz Binary files differindex 83ffc7164..72d3d92a0 100644 --- a/ppd/hpijs/hp-officejet_7200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7300_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7300_series-hpijs.ppd.gz Binary files differindex 766f7da01..b06ecb2d9 100644 --- a/ppd/hpijs/hp-officejet_7300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7400_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7400_series-hpijs.ppd.gz Binary files differindex 8d61950a7..3cbf36320 100644 --- a/ppd/hpijs/hp-officejet_7400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7500_e910-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7500_e910-hpijs.ppd.gz Binary files differindex c71fe9bd8..83cc21a04 100644 --- a/ppd/hpijs/hp-officejet_7500_e910-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7500_e910-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7610_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7610_series-hpijs.ppd.gz Binary files differindex 348221010..3e3b24716 100644 --- a/ppd/hpijs/hp-officejet_7610_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7610_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_9100_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-officejet_9100_series-hpijs-pcl3.ppd.gz Binary files differindex 8226fc864..6f4f44859 100644 --- a/ppd/hpijs/hp-officejet_9100_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-officejet_9100_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-officejet_d_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_d_series-hpijs.ppd.gz Binary files differindex 4efc0d9bc..45f97c726 100644 --- a/ppd/hpijs/hp-officejet_d_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_d_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_g55-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_g55-hpijs.ppd.gz Binary files differindex a63e38492..39098e1db 100644 --- a/ppd/hpijs/hp-officejet_g55-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_g55-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_g55xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_g55xi-hpijs.ppd.gz Binary files differindex 9a4a86fd2..57ec4ece1 100644 --- a/ppd/hpijs/hp-officejet_g55xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_g55xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_g85-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_g85-hpijs.ppd.gz Binary files differindex 8ca76017c..3ea56dedb 100644 --- a/ppd/hpijs/hp-officejet_g85-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_g85-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_g85xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_g85xi-hpijs.ppd.gz Binary files differindex d147b35e5..6f89e0e8e 100644 --- a/ppd/hpijs/hp-officejet_g85xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_g85xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_g95-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_g95-hpijs.ppd.gz Binary files differindex 38459f8e1..d2b1b7edf 100644 --- a/ppd/hpijs/hp-officejet_g95-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_g95-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_h470-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_h470-hpijs.ppd.gz Binary files differindex 5a6c8b4f2..1b4e2dffe 100644 --- a/ppd/hpijs/hp-officejet_h470-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_h470-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j3500_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j3500_series-hpijs.ppd.gz Binary files differindex 254a2085e..e53709cde 100644 --- a/ppd/hpijs/hp-officejet_j3500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j3500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j3600_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j3600_series-hpijs.ppd.gz Binary files differindex 53940dd93..ba7b688fc 100644 --- a/ppd/hpijs/hp-officejet_j3600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j3600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j4500_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j4500_series-hpijs.ppd.gz Binary files differindex efb7179ea..1df93b8a4 100644 --- a/ppd/hpijs/hp-officejet_j4500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j4500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j4660_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j4660_series-hpijs.ppd.gz Binary files differindex 3b22ff200..b58bd949d 100644 --- a/ppd/hpijs/hp-officejet_j4660_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j4660_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j4680_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j4680_series-hpijs.ppd.gz Binary files differindex 9f323605b..adcc24cd4 100644 --- a/ppd/hpijs/hp-officejet_j4680_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j4680_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j5500_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j5500_series-hpijs.ppd.gz Binary files differindex 324ba0d8f..8e986883f 100644 --- a/ppd/hpijs/hp-officejet_j5500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j5500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j5700_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j5700_series-hpijs.ppd.gz Binary files differindex 620f89843..7a2fa6077 100644 --- a/ppd/hpijs/hp-officejet_j5700_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j5700_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j6400_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j6400_series-hpijs.ppd.gz Binary files differindex 45113c6b5..6e538f569 100644 --- a/ppd/hpijs/hp-officejet_j6400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j6400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_k60-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_k60-hpijs.ppd.gz Binary files differindex b99623a66..76b1d1aba 100644 --- a/ppd/hpijs/hp-officejet_k60-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_k60-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_k60xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_k60xi-hpijs.ppd.gz Binary files differindex e5b84b4a2..c915541a8 100644 --- a/ppd/hpijs/hp-officejet_k60xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_k60xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_k7100-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_k7100-hpijs.ppd.gz Binary files differindex 215ac0b6d..86a12297f 100644 --- a/ppd/hpijs/hp-officejet_k7100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_k7100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_k80-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_k80-hpijs.ppd.gz Binary files differindex 38cd4e280..0ee222126 100644 --- a/ppd/hpijs/hp-officejet_k80-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_k80-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_k80xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_k80xi-hpijs.ppd.gz Binary files differindex fe54be719..c3c913b61 100644 --- a/ppd/hpijs/hp-officejet_k80xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_k80xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_lx-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_lx-hpijs.ppd.gz Binary files differindex a945782a3..9549b0f43 100644 --- a/ppd/hpijs/hp-officejet_lx-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_lx-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_1150c-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_1150c-hpijs.ppd.gz Binary files differindex 4b785698e..415b13f87 100644 --- a/ppd/hpijs/hp-officejet_pro_1150c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_1150c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_1170c_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_1170c_series-hpijs.ppd.gz Binary files differindex 46f8052db..2d3f66bb9 100644 --- a/ppd/hpijs/hp-officejet_pro_1170c_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_1170c_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_3610-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_3610-hpijs.ppd.gz Binary files differindex acf024436..823a6aaeb 100644 --- a/ppd/hpijs/hp-officejet_pro_3610-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_3610-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_3620-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_3620-hpijs.ppd.gz Binary files differindex 98b965423..90cb651c5 100644 --- a/ppd/hpijs/hp-officejet_pro_3620-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_3620-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8000_a809-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8000_a809-hpijs.ppd.gz Binary files differindex 41d0101b6..d95784d34 100644 --- a/ppd/hpijs/hp-officejet_pro_8000_a809-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8000_a809-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8100-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8100-hpijs.ppd.gz Binary files differindex 762a85e07..69766b4a2 100644 --- a/ppd/hpijs/hp-officejet_pro_8100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8500_a909a-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8500_a909a-hpijs.ppd.gz Binary files differindex 00d48b208..c753cfc5e 100644 --- a/ppd/hpijs/hp-officejet_pro_8500_a909a-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8500_a909a-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8500_a909g-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8500_a909g-hpijs.ppd.gz Binary files differindex b76251758..224e8a62d 100644 --- a/ppd/hpijs/hp-officejet_pro_8500_a909g-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8500_a909g-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8500_a909n-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8500_a909n-hpijs.ppd.gz Binary files differindex f37137859..b1a89d4f0 100644 --- a/ppd/hpijs/hp-officejet_pro_8500_a909n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8500_a909n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8500_a910-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8500_a910-hpijs.ppd.gz Binary files differindex 2528ef6e9..b94317d73 100644 --- a/ppd/hpijs/hp-officejet_pro_8500_a910-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8500_a910-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8600-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8600-hpijs.ppd.gz Binary files differindex 7ed1e95fa..f9f213a31 100644 --- a/ppd/hpijs/hp-officejet_pro_8600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_k5300-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_k5300-hpijs.ppd.gz Binary files differindex f6d7e86e3..f81d4023e 100644 --- a/ppd/hpijs/hp-officejet_pro_k5300-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_k5300-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_k5400-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_k5400-hpijs.ppd.gz Binary files differindex dc4bc5cd4..ebc80fea8 100644 --- a/ppd/hpijs/hp-officejet_pro_k5400-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_k5400-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_k550-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_k550-hpijs.ppd.gz Binary files differindex 9227d0bea..424301b75 100644 --- a/ppd/hpijs/hp-officejet_pro_k550-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_k550-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_k850-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_k850-hpijs.ppd.gz Binary files differindex 545af5ac1..8903c0367 100644 --- a/ppd/hpijs/hp-officejet_pro_k850-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_k850-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_k8600-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_k8600-hpijs.ppd.gz Binary files differindex 9c30d01c3..54c967147 100644 --- a/ppd/hpijs/hp-officejet_pro_k8600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_k8600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_l7300-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_l7300-hpijs.ppd.gz Binary files differindex f07959f84..19be5afe8 100644 --- a/ppd/hpijs/hp-officejet_pro_l7300-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_l7300-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_l7400-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_l7400-hpijs.ppd.gz Binary files differindex 0f0c107a6..ff80d2390 100644 --- a/ppd/hpijs/hp-officejet_pro_l7400-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_l7400-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_l7500-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_l7500-hpijs.ppd.gz Binary files differindex bb05677a9..318badac4 100644 --- a/ppd/hpijs/hp-officejet_pro_l7500-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_l7500-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_l7600-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_l7600-hpijs.ppd.gz Binary files differindex c99c3048a..702f33c3d 100644 --- a/ppd/hpijs/hp-officejet_pro_l7600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_l7600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_l7700-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_l7700-hpijs.ppd.gz Binary files differindex f8203ec2a..f0bd4bd59 100644 --- a/ppd/hpijs/hp-officejet_pro_l7700-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_l7700-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r40-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r40-hpijs.ppd.gz Binary files differindex bf3bfa5fd..c17016dc0 100644 --- a/ppd/hpijs/hp-officejet_r40-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r40-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r40xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r40xi-hpijs.ppd.gz Binary files differindex ec493b44d..caf19a483 100644 --- a/ppd/hpijs/hp-officejet_r40xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r40xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r45-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r45-hpijs.ppd.gz Binary files differindex bd5d0a9ba..95c0ec1b8 100644 --- a/ppd/hpijs/hp-officejet_r45-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r45-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r60-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r60-hpijs.ppd.gz Binary files differindex 4d704a2ac..d1e88bc07 100644 --- a/ppd/hpijs/hp-officejet_r60-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r60-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r65-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r65-hpijs.ppd.gz Binary files differindex 79904395e..1ca32e05f 100644 --- a/ppd/hpijs/hp-officejet_r65-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r65-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r80-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r80-hpijs.ppd.gz Binary files differindex 0c350c340..8b2986de0 100644 --- a/ppd/hpijs/hp-officejet_r80-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r80-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r80xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r80xi-hpijs.ppd.gz Binary files differindex 6beabcd00..c0487c223 100644 --- a/ppd/hpijs/hp-officejet_r80xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r80xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_300-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_300-hpijs.ppd.gz Binary files differindex 0ea14e8da..fabf676bf 100644 --- a/ppd/hpijs/hp-officejet_series_300-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_300-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_310-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_310-hpijs.ppd.gz Binary files differindex d50400262..25a4bfb36 100644 --- a/ppd/hpijs/hp-officejet_series_310-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_310-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_320-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_320-hpijs.ppd.gz Binary files differindex 540f40692..669c952ee 100644 --- a/ppd/hpijs/hp-officejet_series_320-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_320-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_330-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_330-hpijs.ppd.gz Binary files differindex c6e945f8f..1086beda9 100644 --- a/ppd/hpijs/hp-officejet_series_330-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_330-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_350-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_350-hpijs.ppd.gz Binary files differindex f3832c449..8408d127e 100644 --- a/ppd/hpijs/hp-officejet_series_350-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_350-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_520-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_520-hpijs.ppd.gz Binary files differindex 5cb782036..dd4675ac9 100644 --- a/ppd/hpijs/hp-officejet_series_520-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_520-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_570-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_570-hpijs.ppd.gz Binary files differindex 8e7f2f3fe..adf85395b 100644 --- a/ppd/hpijs/hp-officejet_series_570-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_570-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_580-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_580-hpijs.ppd.gz Binary files differindex 25f49db2e..600b695a2 100644 --- a/ppd/hpijs/hp-officejet_series_580-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_580-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_590-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_590-hpijs.ppd.gz Binary files differindex a3655568f..da0da687b 100644 --- a/ppd/hpijs/hp-officejet_series_590-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_590-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_600-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_600-hpijs.ppd.gz Binary files differindex 4a1187afb..68fd06e42 100644 --- a/ppd/hpijs/hp-officejet_series_600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_610-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_610-hpijs.ppd.gz Binary files differindex c29c45530..9e8ea3621 100644 --- a/ppd/hpijs/hp-officejet_series_610-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_610-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_630-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_630-hpijs.ppd.gz Binary files differindex fc9b68dde..84f3503fc 100644 --- a/ppd/hpijs/hp-officejet_series_630-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_630-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_700-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_700-hpijs.ppd.gz Binary files differindex 88c499f24..1b779d30e 100644 --- a/ppd/hpijs/hp-officejet_series_700-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_700-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_710-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_710-hpijs.ppd.gz Binary files differindex 6f5296264..c3d4bdbe7 100644 --- a/ppd/hpijs/hp-officejet_series_710-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_710-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_720-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_720-hpijs.ppd.gz Binary files differindex 5ae8a54b1..aed5d2945 100644 --- a/ppd/hpijs/hp-officejet_series_720-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_720-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_725-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_725-hpijs.ppd.gz Binary files differindex fd7026c2b..eb7b01208 100644 --- a/ppd/hpijs/hp-officejet_series_725-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_725-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_t_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_t_series-hpijs.ppd.gz Binary files differindex 4fdc9edbc..fff3a3626 100644 --- a/ppd/hpijs/hp-officejet_t_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_t_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_v30-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_v30-hpijs.ppd.gz Binary files differindex 9628d3c2e..7c3d1e158 100644 --- a/ppd/hpijs/hp-officejet_v30-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_v30-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_v40-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_v40-hpijs.ppd.gz Binary files differindex dbb099f28..6eb2d341c 100644 --- a/ppd/hpijs/hp-officejet_v40-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_v40-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_v40xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_v40xi-hpijs.ppd.gz Binary files differindex f84257cd8..b6fd96379 100644 --- a/ppd/hpijs/hp-officejet_v40xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_v40xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_v45-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_v45-hpijs.ppd.gz Binary files differindex 4bdad790e..cf32339c6 100644 --- a/ppd/hpijs/hp-officejet_v45-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_v45-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_100-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_100-hpijs.ppd.gz Binary files differindex 3e0c6609e..41c0cf894 100644 --- a/ppd/hpijs/hp-photosmart_100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_1115-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_1115-hpijs.ppd.gz Binary files differindex 0657820b6..015b35d9a 100644 --- a/ppd/hpijs/hp-photosmart_1115-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_1115-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_1215-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_1215-hpijs.ppd.gz Binary files differindex 814a78156..e3dea11c1 100644 --- a/ppd/hpijs/hp-photosmart_1215-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_1215-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_1218-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_1218-hpijs.ppd.gz Binary files differindex ce11e9381..809d3c996 100644 --- a/ppd/hpijs/hp-photosmart_1218-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_1218-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_130-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_130-hpijs.ppd.gz Binary files differindex 4f5638027..694999c84 100644 --- a/ppd/hpijs/hp-photosmart_130-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_130-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_1315-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_1315-hpijs.ppd.gz Binary files differindex 375222ee1..2c45164f1 100644 --- a/ppd/hpijs/hp-photosmart_1315-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_1315-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_140_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_140_series-hpijs.ppd.gz Binary files differindex 479702c39..53fd36cf0 100644 --- a/ppd/hpijs/hp-photosmart_140_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_140_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_230-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_230-hpijs.ppd.gz Binary files differindex 9dc15e291..f071d9b86 100644 --- a/ppd/hpijs/hp-photosmart_230-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_230-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_240_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_240_series-hpijs.ppd.gz Binary files differindex 73f5934b0..a50b7bc8f 100644 --- a/ppd/hpijs/hp-photosmart_240_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_240_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_2570_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_2570_series-hpijs.ppd.gz Binary files differindex 1c5574423..9f1e7d3d9 100644 --- a/ppd/hpijs/hp-photosmart_2570_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_2570_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_2600_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_2600_series-hpijs.ppd.gz Binary files differindex 3b1fa2c2f..bd351a439 100644 --- a/ppd/hpijs/hp-photosmart_2600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_2600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_2700_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_2700_series-hpijs.ppd.gz Binary files differindex e49731314..74368f572 100644 --- a/ppd/hpijs/hp-photosmart_2700_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_2700_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_3100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_3100_series-hpijs.ppd.gz Binary files differindex 9202b3d1b..7e16e50ed 100644 --- a/ppd/hpijs/hp-photosmart_3100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_3100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_3200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_3200_series-hpijs.ppd.gz Binary files differindex 5f136b7b9..d5f9c297e 100644 --- a/ppd/hpijs/hp-photosmart_3200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_3200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_320_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_320_series-hpijs.ppd.gz Binary files differindex f2c2cea09..458e8419a 100644 --- a/ppd/hpijs/hp-photosmart_320_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_320_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_3300_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_3300_series-hpijs.ppd.gz Binary files differindex 3c0d8ea1e..d5582a333 100644 --- a/ppd/hpijs/hp-photosmart_3300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_3300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_330_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_330_series-hpijs.ppd.gz Binary files differindex 26cf21caf..1babe38c1 100644 --- a/ppd/hpijs/hp-photosmart_330_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_330_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_370_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_370_series-hpijs.ppd.gz Binary files differindex 05542f511..4f1d04a0d 100644 --- a/ppd/hpijs/hp-photosmart_370_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_370_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_380_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_380_series-hpijs.ppd.gz Binary files differindex 8da8be08a..7097bf83d 100644 --- a/ppd/hpijs/hp-photosmart_380_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_380_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_420_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_420_series-hpijs.ppd.gz Binary files differindex 8567f1ba1..773895dd5 100644 --- a/ppd/hpijs/hp-photosmart_420_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_420_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_470_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_470_series-hpijs.ppd.gz Binary files differindex f7558cf69..db83106bd 100644 --- a/ppd/hpijs/hp-photosmart_470_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_470_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_5510_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_5510_series-hpijs.ppd.gz Binary files differindex 9f36bd96e..ae8bfb356 100644 --- a/ppd/hpijs/hp-photosmart_5510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_5510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_5510d_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_5510d_series-hpijs.ppd.gz Binary files differindex 3011bcef8..fe7908a95 100644 --- a/ppd/hpijs/hp-photosmart_5510d_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_5510d_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_5520_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_5520_series-hpijs.ppd.gz Binary files differindex 422f3cf90..211284079 100644 --- a/ppd/hpijs/hp-photosmart_5520_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_5520_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_6510_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_6510_series-hpijs.ppd.gz Binary files differindex 5d742f7f4..a33edd8df 100644 --- a/ppd/hpijs/hp-photosmart_6510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_6510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_6520_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_6520_series-hpijs.ppd.gz Binary files differindex d40b431f5..c90df308f 100644 --- a/ppd/hpijs/hp-photosmart_6520_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_6520_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7150-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7150-hpijs.ppd.gz Binary files differindex 03dfdfaa4..ce1130642 100644 --- a/ppd/hpijs/hp-photosmart_7150-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7150-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7200_series-hpijs.ppd.gz Binary files differindex 567d84ed6..f74c69107 100644 --- a/ppd/hpijs/hp-photosmart_7200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7345-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7345-hpijs.ppd.gz Binary files differindex be7b80184..3813c5e01 100644 --- a/ppd/hpijs/hp-photosmart_7345-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7345-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7350-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7350-hpijs.ppd.gz Binary files differindex d9bc93ade..d4837bd4a 100644 --- a/ppd/hpijs/hp-photosmart_7350-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7350-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7400_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7400_series-hpijs.ppd.gz Binary files differindex 4ab9f365d..7b513ca5c 100644 --- a/ppd/hpijs/hp-photosmart_7400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7510_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7510_series-hpijs.ppd.gz Binary files differindex 0e1e5c305..8084688ff 100644 --- a/ppd/hpijs/hp-photosmart_7510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7520_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7520_series-hpijs.ppd.gz Binary files differindex e943fcaa3..e951a0413 100644 --- a/ppd/hpijs/hp-photosmart_7520_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7520_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7550-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7550-hpijs.ppd.gz Binary files differindex fd68d5cf2..ce6fbabf2 100644 --- a/ppd/hpijs/hp-photosmart_7550-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7550-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7600_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7600_series-hpijs.ppd.gz Binary files differindex 4c964c3ce..055ad6ac0 100644 --- a/ppd/hpijs/hp-photosmart_7600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7700_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7700_series-hpijs.ppd.gz Binary files differindex 25352a71a..af2f06603 100644 --- a/ppd/hpijs/hp-photosmart_7700_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7700_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7800_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7800_series-hpijs.ppd.gz Binary files differindex de7f1f0eb..e4909eec5 100644 --- a/ppd/hpijs/hp-photosmart_7800_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7800_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7900_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7900_series-hpijs.ppd.gz Binary files differindex 5cc3b42a9..bbcf16a28 100644 --- a/ppd/hpijs/hp-photosmart_7900_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7900_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_8000_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_8000_series-hpijs.ppd.gz Binary files differindex 950005afe..1495f5755 100644 --- a/ppd/hpijs/hp-photosmart_8000_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_8000_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_8100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_8100_series-hpijs.ppd.gz Binary files differindex 8aecda8cc..b0448005e 100644 --- a/ppd/hpijs/hp-photosmart_8100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_8100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_8200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_8200_series-hpijs.ppd.gz Binary files differindex 018464834..3e22d8611 100644 --- a/ppd/hpijs/hp-photosmart_8200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_8200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_8400_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_8400_series-hpijs.ppd.gz Binary files differindex b3dba53e9..852d6eb71 100644 --- a/ppd/hpijs/hp-photosmart_8400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_8400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_8700_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_8700_series-hpijs.ppd.gz Binary files differindex dcdc3f684..6f8f3d626 100644 --- a/ppd/hpijs/hp-photosmart_8700_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_8700_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a310_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a310_series-hpijs.ppd.gz Binary files differindex dd977478c..441200e4b 100644 --- a/ppd/hpijs/hp-photosmart_a310_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a310_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a320_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a320_series-hpijs.ppd.gz Binary files differindex 0df2041cd..8e84d23b6 100644 --- a/ppd/hpijs/hp-photosmart_a320_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a320_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a430_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a430_series-hpijs.ppd.gz Binary files differindex 8cf421c1e..9337ac57c 100644 --- a/ppd/hpijs/hp-photosmart_a430_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a430_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a440_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a440_series-hpijs.ppd.gz Binary files differindex d7a7017fc..e96f33207 100644 --- a/ppd/hpijs/hp-photosmart_a440_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a440_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a510_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a510_series-hpijs.ppd.gz Binary files differindex da7fb746f..81fa41da8 100644 --- a/ppd/hpijs/hp-photosmart_a510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a520_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a520_series-hpijs.ppd.gz Binary files differindex cc3e639a5..f0e80ecee 100644 --- a/ppd/hpijs/hp-photosmart_a520_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a520_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a530_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a530_series-hpijs.ppd.gz Binary files differindex 89a9e3a56..55a01c736 100644 --- a/ppd/hpijs/hp-photosmart_a530_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a530_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a610_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a610_series-hpijs.ppd.gz Binary files differindex 6ad9f69eb..1ce61441e 100644 --- a/ppd/hpijs/hp-photosmart_a610_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a610_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a620_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a620_series-hpijs.ppd.gz Binary files differindex b67f152c8..72d696abd 100644 --- a/ppd/hpijs/hp-photosmart_a620_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a620_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a630_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a630_series-hpijs.ppd.gz Binary files differindex e3408a591..e7389c983 100644 --- a/ppd/hpijs/hp-photosmart_a630_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a630_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a640_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a640_series-hpijs.ppd.gz Binary files differindex 94fb49dcd..3d126150c 100644 --- a/ppd/hpijs/hp-photosmart_a640_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a640_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a710_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a710_series-hpijs.ppd.gz Binary files differindex 4cd6d9a9d..44ed1db97 100644 --- a/ppd/hpijs/hp-photosmart_a710_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a710_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a820_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a820_series-hpijs.ppd.gz Binary files differindex 9e1b2e977..c49a36716 100644 --- a/ppd/hpijs/hp-photosmart_a820_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a820_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_b010_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_b010_series-hpijs.ppd.gz Binary files differindex abf343b11..faf8437ba 100644 --- a/ppd/hpijs/hp-photosmart_b010_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_b010_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_b109a-m-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_b109a-m-hpijs.ppd.gz Binary files differindex 7655bc8f2..634272379 100644 --- a/ppd/hpijs/hp-photosmart_b109a-m-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_b109a-m-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_b109a_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_b109a_series-hpijs.ppd.gz Binary files differindex 7d5364a84..38686ecf4 100644 --- a/ppd/hpijs/hp-photosmart_b109a_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_b109a_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_b110_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_b110_series-hpijs.ppd.gz Binary files differindex b0f8aa94b..5c5526e37 100644 --- a/ppd/hpijs/hp-photosmart_b110_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_b110_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_b8500_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_b8500_series-hpijs.ppd.gz Binary files differindex 1b8440af2..a4bc5ea90 100644 --- a/ppd/hpijs/hp-photosmart_b8500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_b8500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c309a_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c309a_series-hpijs.ppd.gz Binary files differindex 460f0e48e..c6a375ef4 100644 --- a/ppd/hpijs/hp-photosmart_c309a_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c309a_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c3100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c3100_series-hpijs.ppd.gz Binary files differindex 6203d7a44..bb81ee605 100644 --- a/ppd/hpijs/hp-photosmart_c3100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c3100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4100_series-hpijs.ppd.gz Binary files differindex 31a9c24bb..e1a38e271 100644 --- a/ppd/hpijs/hp-photosmart_c4100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4200_series-hpijs.ppd.gz Binary files differindex b49def00e..bdb8613ed 100644 --- a/ppd/hpijs/hp-photosmart_c4200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4340_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4340_series-hpijs.ppd.gz Binary files differindex 0a38b5425..a06868b49 100644 --- a/ppd/hpijs/hp-photosmart_c4340_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4340_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4380_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4380_series-hpijs.ppd.gz Binary files differindex ac3d3aa48..8e896b20e 100644 --- a/ppd/hpijs/hp-photosmart_c4380_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4380_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz Binary files differindex 80bc84f55..e70d12af0 100644 --- a/ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4500_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4500_series-hpijs.ppd.gz Binary files differindex 7bd6ff523..c073ac822 100644 --- a/ppd/hpijs/hp-photosmart_c4500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4600_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4600_series-hpijs.ppd.gz Binary files differindex b0ca1f78b..6c3e82bd1 100644 --- a/ppd/hpijs/hp-photosmart_c4600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4700_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4700_series-hpijs.ppd.gz Binary files differindex 663e7bfb3..29816cf42 100644 --- a/ppd/hpijs/hp-photosmart_c4700_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4700_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c5100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c5100_series-hpijs.ppd.gz Binary files differindex e5aeb9dc8..3b32ff7c3 100644 --- a/ppd/hpijs/hp-photosmart_c5100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c5100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c5200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c5200_series-hpijs.ppd.gz Binary files differindex 69f897d53..38fa66642 100644 --- a/ppd/hpijs/hp-photosmart_c5200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c5200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c5300_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c5300_series-hpijs.ppd.gz Binary files differindex 8a7c2036d..192b3a4c2 100644 --- a/ppd/hpijs/hp-photosmart_c5300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c5300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c5500_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c5500_series-hpijs.ppd.gz Binary files differindex 22fb7d73d..d5d3d6820 100644 --- a/ppd/hpijs/hp-photosmart_c5500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c5500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c6100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c6100_series-hpijs.ppd.gz Binary files differindex 817394ff2..a19ab5a96 100644 --- a/ppd/hpijs/hp-photosmart_c6100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c6100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c6200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c6200_series-hpijs.ppd.gz Binary files differindex 688e87dc0..8e1984b41 100644 --- a/ppd/hpijs/hp-photosmart_c6200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c6200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c6300_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c6300_series-hpijs.ppd.gz Binary files differindex 167042e0e..1f641b7f2 100644 --- a/ppd/hpijs/hp-photosmart_c6300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c6300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c7100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c7100_series-hpijs.ppd.gz Binary files differindex a69877a17..a8cbbeb07 100644 --- a/ppd/hpijs/hp-photosmart_c7100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c7100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c7200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c7200_series-hpijs.ppd.gz Binary files differindex d391c0f2a..d57a5ec31 100644 --- a/ppd/hpijs/hp-photosmart_c7200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c7200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c8100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c8100_series-hpijs.ppd.gz Binary files differindex 52bb0ded9..ad2b58251 100644 --- a/ppd/hpijs/hp-photosmart_c8100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c8100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d110_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d110_series-hpijs.ppd.gz Binary files differindex 781069526..828e212c2 100644 --- a/ppd/hpijs/hp-photosmart_d110_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d110_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d5060_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d5060_series-hpijs.ppd.gz Binary files differindex 9f78cc594..0e7689afa 100644 --- a/ppd/hpijs/hp-photosmart_d5060_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d5060_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d5100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d5100_series-hpijs.ppd.gz Binary files differindex 334ae4d9b..3d31953a8 100644 --- a/ppd/hpijs/hp-photosmart_d5100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d5100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d5300_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d5300_series-hpijs.ppd.gz Binary files differindex abff8e420..730e8f0a2 100644 --- a/ppd/hpijs/hp-photosmart_d5300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d5300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d5400_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d5400_series-hpijs.ppd.gz Binary files differindex 78711ff03..cd26cee75 100644 --- a/ppd/hpijs/hp-photosmart_d5400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d5400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d6100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d6100_series-hpijs.ppd.gz Binary files differindex cc32b7f7a..4fff97a24 100644 --- a/ppd/hpijs/hp-photosmart_d6100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d6100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d7100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d7100_series-hpijs.ppd.gz Binary files differindex 66db6607e..2c48e1c5d 100644 --- a/ppd/hpijs/hp-photosmart_d7100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d7100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d7200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d7200_series-hpijs.ppd.gz Binary files differindex 20e7034d1..fcb12adee 100644 --- a/ppd/hpijs/hp-photosmart_d7200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d7200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d7300_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d7300_series-hpijs.ppd.gz Binary files differindex 5a8523089..17af304bf 100644 --- a/ppd/hpijs/hp-photosmart_d7300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d7300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d7400_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d7400_series-hpijs.ppd.gz Binary files differindex 01e451684..03a0820c8 100644 --- a/ppd/hpijs/hp-photosmart_d7400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d7400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d7500_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d7500_series-hpijs.ppd.gz Binary files differindex 1c772e55b..b349a9263 100644 --- a/ppd/hpijs/hp-photosmart_d7500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d7500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_estn_c510_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_estn_c510_series-hpijs.ppd.gz Binary files differindex 71be5f4ad..726a05dcb 100644 --- a/ppd/hpijs/hp-photosmart_estn_c510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_estn_c510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_ink_adv_k510-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_ink_adv_k510-hpijs.ppd.gz Binary files differindex 1faa80314..866eecd36 100644 --- a/ppd/hpijs/hp-photosmart_ink_adv_k510-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_ink_adv_k510-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_p1000-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_p1000-hpijs.ppd.gz Binary files differindex ea6173794..db09717b9 100644 --- a/ppd/hpijs/hp-photosmart_p1000-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_p1000-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_p1100-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_p1100-hpijs.ppd.gz Binary files differindex 16c4ac749..187da8ff0 100644 --- a/ppd/hpijs/hp-photosmart_p1100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_p1100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_plus_b209a-m-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_plus_b209a-m-hpijs.ppd.gz Binary files differindex b817c76b6..62164e46b 100644 --- a/ppd/hpijs/hp-photosmart_plus_b209a-m-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_plus_b209a-m-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_plus_b210_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_plus_b210_series-hpijs.ppd.gz Binary files differindex 313f51d36..680bb6b1b 100644 --- a/ppd/hpijs/hp-photosmart_plus_b210_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_plus_b210_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz Binary files differindex b1e421e7f..ce0a83197 100644 --- a/ppd/hpijs/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_prem_c310_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_prem_c310_series-hpijs.ppd.gz Binary files differindex 836772535..8ede499a3 100644 --- a/ppd/hpijs/hp-photosmart_prem_c310_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_prem_c310_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_prem_c410_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_prem_c410_series-hpijs.ppd.gz Binary files differindex 0505d6d96..230c3cfdd 100644 --- a/ppd/hpijs/hp-photosmart_prem_c410_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_prem_c410_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_premium_c309g-m-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_premium_c309g-m-hpijs.ppd.gz Binary files differindex ff0b41549..186f6d393 100644 --- a/ppd/hpijs/hp-photosmart_premium_c309g-m-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_premium_c309g-m-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_pro_b8300_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_pro_b8300_series-hpijs.ppd.gz Binary files differindex 5bcca8e96..99e3f3091 100644 --- a/ppd/hpijs/hp-photosmart_pro_b8300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_pro_b8300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_pro_b8800_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_pro_b8800_series-hpijs.ppd.gz Binary files differindex 962dfdc38..099eab5ee 100644 --- a/ppd/hpijs/hp-photosmart_pro_b8800_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_pro_b8800_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz Binary files differindex a485fd3b5..4338a019f 100644 --- a/ppd/hpijs/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-printer_scanner_copier_300-hpijs.ppd.gz b/ppd/hpijs/hp-printer_scanner_copier_300-hpijs.ppd.gz Binary files differindex 1c522a7aa..09b4cbf41 100644 --- a/ppd/hpijs/hp-printer_scanner_copier_300-hpijs.ppd.gz +++ b/ppd/hpijs/hp-printer_scanner_copier_300-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1000_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1000_series-hpijs.ppd.gz Binary files differindex 4a46f4d6e..bacf9249f 100644 --- a/ppd/hpijs/hp-psc_1000_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1000_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1100_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1100_series-hpijs.ppd.gz Binary files differindex a34b32719..94027f0dd 100644 --- a/ppd/hpijs/hp-psc_1100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1200_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1200_series-hpijs.ppd.gz Binary files differindex 8db87ec42..3227180aa 100644 --- a/ppd/hpijs/hp-psc_1200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1300_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1300_series-hpijs.ppd.gz Binary files differindex 9dca0de61..dbe0ebae3 100644 --- a/ppd/hpijs/hp-psc_1300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1310_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1310_series-hpijs.ppd.gz Binary files differindex f8231399a..f5355e1ae 100644 --- a/ppd/hpijs/hp-psc_1310_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1310_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1358_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1358_series-hpijs.ppd.gz Binary files differindex c04caefb6..268f6e7d7 100644 --- a/ppd/hpijs/hp-psc_1358_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1358_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1400_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1400_series-hpijs.ppd.gz Binary files differindex cce2eb83a..6ee8ea930 100644 --- a/ppd/hpijs/hp-psc_1400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1500_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1500_series-hpijs.ppd.gz Binary files differindex ef1a47d9a..643d0d258 100644 --- a/ppd/hpijs/hp-psc_1500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1510_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1510_series-hpijs.ppd.gz Binary files differindex c1d37379c..e9b166996 100644 --- a/ppd/hpijs/hp-psc_1510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1600_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1600_series-hpijs.ppd.gz Binary files differindex 0518eb91d..e977fdd02 100644 --- a/ppd/hpijs/hp-psc_1600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2100_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2100_series-hpijs.ppd.gz Binary files differindex 26a364678..45361fec5 100644 --- a/ppd/hpijs/hp-psc_2100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2150_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2150_series-hpijs.ppd.gz Binary files differindex 444d5b63c..668d4af66 100644 --- a/ppd/hpijs/hp-psc_2150_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2150_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2170_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2170_series-hpijs.ppd.gz Binary files differindex d23418c73..e8e4e10ca 100644 --- a/ppd/hpijs/hp-psc_2170_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2170_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2200_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2200_series-hpijs.ppd.gz Binary files differindex 58e46013a..c7d809631 100644 --- a/ppd/hpijs/hp-psc_2200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2210_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2210_series-hpijs.ppd.gz Binary files differindex f483938f0..ad6c07449 100644 --- a/ppd/hpijs/hp-psc_2210_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2210_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2300_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2300_series-hpijs.ppd.gz Binary files differindex 0190b2f75..3975cf302 100644 --- a/ppd/hpijs/hp-psc_2300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2350_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2350_series-hpijs.ppd.gz Binary files differindex bb0834716..c968a07da 100644 --- a/ppd/hpijs/hp-psc_2350_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2350_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2400_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2400_series-hpijs.ppd.gz Binary files differindex 4a458b4cc..e40fc9fc2 100644 --- a/ppd/hpijs/hp-psc_2400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2500_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2500_series-hpijs.ppd.gz Binary files differindex d02c6c3ce..3c05a455e 100644 --- a/ppd/hpijs/hp-psc_2500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_500-hpijs.ppd.gz b/ppd/hpijs/hp-psc_500-hpijs.ppd.gz Binary files differindex b38525dde..e2e5acce5 100644 --- a/ppd/hpijs/hp-psc_500-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_500-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_720-hpijs.ppd.gz b/ppd/hpijs/hp-psc_720-hpijs.ppd.gz Binary files differindex 25d10b1a3..3e36318ae 100644 --- a/ppd/hpijs/hp-psc_720-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_720-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_750-hpijs.ppd.gz b/ppd/hpijs/hp-psc_750-hpijs.ppd.gz Binary files differindex 11e4a8c9c..5d9f9a5de 100644 --- a/ppd/hpijs/hp-psc_750-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_750-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_750xi-hpijs.ppd.gz b/ppd/hpijs/hp-psc_750xi-hpijs.ppd.gz Binary files differindex 742940a83..846743e18 100644 --- a/ppd/hpijs/hp-psc_750xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_750xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_760-hpijs.ppd.gz b/ppd/hpijs/hp-psc_760-hpijs.ppd.gz Binary files differindex b58caab76..d10603e08 100644 --- a/ppd/hpijs/hp-psc_760-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_760-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_780-hpijs.ppd.gz b/ppd/hpijs/hp-psc_780-hpijs.ppd.gz Binary files differindex cc90bd578..c138a0c0e 100644 --- a/ppd/hpijs/hp-psc_780-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_780-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_780xi-hpijs.ppd.gz b/ppd/hpijs/hp-psc_780xi-hpijs.ppd.gz Binary files differindex 68023afe7..8c702271d 100644 --- a/ppd/hpijs/hp-psc_780xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_780xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_900_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_900_series-hpijs.ppd.gz Binary files differindex 8d62edb0f..3c29a21ca 100644 --- a/ppd/hpijs/hp-psc_900_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_900_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_920-hpijs.ppd.gz b/ppd/hpijs/hp-psc_920-hpijs.ppd.gz Binary files differindex e3fe3fbf0..e747ea367 100644 --- a/ppd/hpijs/hp-psc_920-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_920-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_950-hpijs.ppd.gz b/ppd/hpijs/hp-psc_950-hpijs.ppd.gz Binary files differindex 9984a7d6d..d150f8c87 100644 --- a/ppd/hpijs/hp-psc_950-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_950-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_950vr-hpijs.ppd.gz b/ppd/hpijs/hp-psc_950vr-hpijs.ppd.gz Binary files differindex f68a755e5..3e38f1120 100644 --- a/ppd/hpijs/hp-psc_950vr-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_950vr-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz b/ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz Binary files differindex 0d2b6db5b..7fc2da844 100644 --- a/ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz diff --git a/prnt/cups.py b/prnt/cups.py index 5ad5b79b0..f2666c9d9 100644 --- a/prnt/cups.py +++ b/prnt/cups.py @@ -689,27 +689,27 @@ def getDefaultPrinter(): return r def setDefaultPrinter(printer_name): - setPasswordPrompt("You do not have permission to set the default printer.") + setPasswordPrompt("You do not have permission to set the default printer. You need authentication.") return cupsext.setDefaultPrinter(printer_name) def accept(printer_name): - setPasswordPrompt("You do not have permission to accept jobs on a printer queue.") + setPasswordPrompt("You do not have permission to accept jobs on a printer queue. You need authentication.") return controlPrinter(printer_name, CUPS_ACCEPT_JOBS) def reject(printer_name): - setPasswordPrompt("You do not have permission to reject jobs on a printer queue.") + setPasswordPrompt("You do not have permission to reject jobs on a printer queue. You need authentication.") return controlPrinter(printer_name, CUPS_REJECT_JOBS) def start(printer_name): - setPasswordPrompt("You do not have permission to start a printer queue.") + setPasswordPrompt("You do not have permission to start a printer queue. You need authentication.") return controlPrinter(printer_name, IPP_RESUME_PRINTER) def stop(printer_name): - setPasswordPrompt("You do not have permission to stop a printer queue.") + setPasswordPrompt("You do not have permission to stop a printer queue. You need authentication.") return controlPrinter(printer_name, IPP_PAUSE_PRINTER) def purge(printer_name): - setPasswordPrompt("You do not have permission to purge jobs.") + setPasswordPrompt("You do not have permission to purge jobs. You need authentication.") return controlPrinter(printer_name, IPP_PURGE_JOBS) def controlPrinter(printer_name, cups_op): @@ -770,7 +770,7 @@ def getServer(): return cupsext.getServer() def cancelJob(jobid, dest=None): - setPasswordPrompt("You do not have permission to cancel a job.") + setPasswordPrompt("You do not have permission to cancel a job. You need authentication.") if dest is not None: return cupsext.cancelJob(dest, jobid) else: @@ -801,6 +801,7 @@ def printFile(printer, filename, title): return -1 def addPrinter(printer_name, device_uri, location, ppd_file, model, info): + setPasswordPrompt("You do not have permission to add a printer. You need authentication.") log.debug("addPrinter('%s', '%s', '%s', '%s', '%s', '%s')" % ( printer_name, device_uri, location, ppd_file, model, info)) @@ -811,11 +812,11 @@ def addPrinter(printer_name, device_uri, location, ppd_file, model, info): return cupsext.addPrinter(printer_name, device_uri, location, ppd_file, model, info) def delPrinter(printer_name): - setPasswordPrompt("You do not have permission to delete a printer.") + setPasswordPrompt("You do not have permission to delete a printer. You need authentication.") return cupsext.delPrinter(printer_name) def enablePrinter(printer_name): - setPasswordPrompt("You do not have permission to enable a printer.") + setPasswordPrompt("You do not have permission to enable a printer. You need authentication.") cmd_full_path = utils.which('cupsenable', True) cmd= "%s %s" % (cmd_full_path, printer_name) return os_utils.execute(cmd) @@ -852,3 +853,27 @@ def setPasswordPrompt(prompt): def findPPDAttribute(name, spec): return cupsext.findPPDAttribute(name, spec) + +def releaseCupsInstance(): + return cupsext.releaseCupsInstance() + + +def cups_operation(operation_func, mode, ui_toolkit, ui_obj, *cups_op_args): + cnt = 0 + while cnt < 3: + cnt += 1 + result, status_str = operation_func(*cups_op_args) + if result != IPP_FORBIDDEN: + break + else: + releaseCupsInstance() + if cnt < 3: + if mode == INTERACTIVE_MODE: + log.error("Could not connect to CUPS Server due to insufficient privileges.Try with valid user") + elif ui_toolkit == 'qt3': + ui_obj.FailureUI("<b>Could not connect to CUPS Server due to insufficient privileges.</b><p>Try with valid user") + else: + from ui4 import ui_utils + ui_utils.FailureUI(ui_obj, "<b>Could not connect to CUPS Server due to insufficient privileges.</b><p>Try with valid user") + + return result, status_str diff --git a/prnt/cupsext/cupsext.c b/prnt/cupsext/cupsext.c index f3c4b7dd3..6f021699c 100644 --- a/prnt/cupsext/cupsext.c +++ b/prnt/cupsext/cupsext.c @@ -88,49 +88,74 @@ typedef int Py_ssize_t; #endif #if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) -#define HAVE_CUPS_1_6 1 + #define HAVE_CUPS_1_6 1 #endif #ifndef HAVE_CUPS_1_6 -#define ippGetCount(attr) attr->num_values -#define ippGetGroupTag(attr) attr->group_tag -#define ippGetValueTag(attr) attr->value_tag -#define ippGetName(attr) attr->name -#define ippGetBoolean(attr, element) attr->values[element].boolean -#define ippGetInteger(attr, element) attr->values[element].integer -#define ippGetStatusCode(ipp) ipp->request.status.status_code -#define ippGetString(attr, element, language) attr->values[element].string.text - -static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp ) -{ - if (!ipp) - return (NULL); - return (ipp->current = ipp->attrs); -} + #define ippGetCount(attr) attr->num_values + #define ippGetGroupTag(attr) attr->group_tag + #define ippGetValueTag(attr) attr->value_tag + #define ippGetName(attr) attr->name + #define ippGetBoolean(attr, element) attr->values[element].boolean + #define ippGetInteger(attr, element) attr->values[element].integer + #define ippGetStatusCode(ipp) ipp->request.status.status_code + #define ippGetString(attr, element, language) attr->values[element].string.text -static ipp_attribute_t * ippNextAttribute( ipp_t *ipp ) -{ - if (!ipp || !ipp->current) - return (NULL); - return (ipp->current = ipp->current->next); -} -static int ippSetOperation( ipp_t *ipp, ipp_op_t op ) + static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp ) + { + if (!ipp) + return (NULL); + return (ipp->current = ipp->attrs); + } + + static ipp_attribute_t * ippNextAttribute( ipp_t *ipp ) + { + if (!ipp || !ipp->current) + return (NULL); + return (ipp->current = ipp->current->next); + } + + static int ippSetOperation( ipp_t *ipp, ipp_op_t op ) + { + if (!ipp) + return (0); + ipp->request.op.operation_id = op; + return (1); + } + + static int ippSetRequestId( ipp_t *ipp, int request_id ) + { + if (!ipp) + return (0); + ipp->request.any.request_id = request_id; + return (1); + } +#endif + +static http_t * http = NULL; /* HTTP object */ + +static http_t* acquireCupsInstance() { - if (!ipp) - return (0); - ipp->request.op.operation_id = op; - return (1); + if ( http == NULL) + { + http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ); + } + + return http; } -static int ippSetRequestId( ipp_t *ipp, int request_id ) + +PyObject * releaseCupsInstance( PyObject * self, PyObject * args ) { - if (!ipp) - return (0); - ipp->request.any.request_id = request_id; - return (1); + if (http) + { + httpClose(http); + } + + http = NULL; + return Py_BuildValue( "i", 1 ); } -#endif int g_num_options = 0; cups_option_t * g_options; @@ -141,6 +166,8 @@ cups_dest_t * dest = NULL; cups_dest_t * g_dests = NULL; int g_num_dests = 0; +static int auth_cancel_req = 0; // 0--> authentication cancel is not requested, 1 --> authentication cancelled + const char * g_ppd_file = NULL; /* @@ -349,7 +376,6 @@ static PyObject * newPrinter( PyObject * self, PyObject * args, PyObject * kwarg PyObject * getPrinters( PyObject * self, PyObject * args ) { - http_t * http = NULL; /* HTTP object */ ipp_t *request = NULL; /* IPP request object */ ipp_t *response = NULL; /* IPP response object */ ipp_attribute_t *attr; /* Current IPP attribute */ @@ -370,11 +396,12 @@ PyObject * getPrinters( PyObject * self, PyObject * args ) }; /* Connect to the HTTP server */ - if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL ) + if (acquireCupsInstance() == NULL) { goto abort; } + /* Assemble the IPP request */ request = ippNew(); language = cupsLangDefault(); @@ -495,9 +522,6 @@ abort: if ( response != NULL ) ippDelete( response ); - if ( http != NULL ) - httpClose( http ); - return printer_list; } @@ -505,12 +529,10 @@ abort: PyObject * addPrinter( PyObject * self, PyObject * args ) { //char buf[1024]; - ipp_status_t status; - http_t *http = NULL; /* HTTP object */ + ipp_status_t status = IPP_BAD_REQUEST; ipp_t *request = NULL; /* IPP request object */ ipp_t *response = NULL; /* IPP response object */ cups_lang_t * language; - int r; char printer_uri[ HTTP_MAX_URI ]; char * name, * device_uri, *location, *ppd_file, * info, * model; const char * status_str = "successful-ok"; @@ -524,7 +546,6 @@ PyObject * addPrinter( PyObject * self, PyObject * args ) &info // info/description ) ) { - r = 0; status_str = "Invalid arguments"; goto abort; } @@ -532,14 +553,12 @@ PyObject * addPrinter( PyObject * self, PyObject * args ) if ( ( strlen( ppd_file ) > 0 && strlen( model ) > 0 ) || ( strlen( ppd_file ) == 0 && strlen( model ) == 0) ) { - r = 0; status_str = "Invalid arguments: specify only ppd_file or model, not both or neither"; goto abort; } if ( !validate_name( name ) ) { - r = 0; status_str = "Invalid printer name"; goto abort; } @@ -550,10 +569,10 @@ PyObject * addPrinter( PyObject * self, PyObject * args ) if ( info == NULL ) strcpy( info, name ); + cupsSetUser ("root"); /* Connect to the HTTP server */ - if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL ) + if (acquireCupsInstance() == NULL) { - r = 0; status_str = "Unable to connect to CUPS server"; goto abort; } @@ -601,29 +620,27 @@ PyObject * addPrinter( PyObject * self, PyObject * args ) response = cupsDoFileRequest( http, request, "/admin/", ppd_file ); } - if ( response == NULL ) - { + if (response == NULL) status = cupsLastError(); - r = 0; - } else - { status = ippGetStatusCode( response ); - //ippDelete( response ); - r = 1; + + // If user cancels the authentication pop-up, changing error code to IPP_NOT_AUTHENTICATED from IPP_FORBIDDEN + if (status == IPP_FORBIDDEN && auth_cancel_req) + { + status = IPP_NOT_AUTHENTICATED; + auth_cancel_req = 0; // Reseting cancel request. } status_str = ippErrorString( status ); + if ( status <= IPP_OK_CONFLICT ) + status =IPP_OK; abort: - - if ( http != NULL ) - httpClose( http ); - if ( response != NULL ) ippDelete( response ); - return Py_BuildValue( "is", r, status_str ); + return Py_BuildValue( "is", status, status_str ); } @@ -637,9 +654,9 @@ PyObject * delPrinter( PyObject * self, PyObject * args ) cups_lang_t *language; /* Default language */ char uri[ HTTP_MAX_URI ]; /* URI for printer/class */ char * name; - http_t *http = NULL; /* HTTP object */ int r = 0; const char *username = NULL; + const char * status_str = ""; username = cupsUser(); @@ -654,8 +671,9 @@ PyObject * delPrinter( PyObject * self, PyObject * args ) goto abort; } + cupsSetUser ("root"); /* Connect to the HTTP server */ - if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL ) + if (acquireCupsInstance() == NULL) { goto abort; } @@ -690,22 +708,30 @@ PyObject * delPrinter( PyObject * self, PyObject * args ) */ response = cupsDoRequest( http, request, "/admin/" ); - if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) ) + if (response == NULL) + r = cupsLastError(); + else + r = ippGetStatusCode( response ); + + // If user cancels the authentication pop-up, changing error code to IPP_NOT_AUTHENTICATED from IPP_FORBIDDEN + if (r == IPP_FORBIDDEN && auth_cancel_req) { - r = 1; + r = IPP_NOT_AUTHENTICATED; + auth_cancel_req = 0; // Reseting cancel request. } + status_str = ippErrorString( r ); + if ( r <= IPP_OK_CONFLICT ) + r = IPP_OK; + abort: if (username) cupsSetUser(username); - if ( http != NULL ) - httpClose( http ); - if ( response != NULL ) ippDelete( response ); - return Py_BuildValue( "i", r ); + return Py_BuildValue( "is", r ,status_str); } @@ -721,9 +747,9 @@ PyObject * setDefaultPrinter( PyObject * self, PyObject * args ) *response = NULL; /* IPP Response */ cups_lang_t *language; /* Default language */ char * name; - http_t *http = NULL; /* HTTP object */ int r = 0; const char *username = NULL; + const char * status_str = ""; username = cupsUser(); @@ -742,8 +768,9 @@ PyObject * setDefaultPrinter( PyObject * self, PyObject * args ) goto abort; } + cupsSetUser ("root"); /* Connect to the HTTP server */ - if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL ) + if ( acquireCupsInstance () == NULL) { goto abort; } @@ -783,22 +810,30 @@ PyObject * setDefaultPrinter( PyObject * self, PyObject * args ) response = cupsDoRequest( http, request, "/admin/" ); - if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) ) + if (response == NULL) + r = cupsLastError(); + else + r = ippGetStatusCode(response ); + + // If user cancels the authentication pop-up, changing error code to IPP_NOT_AUTHENTICATED from IPP_FORBIDDEN + if (r == IPP_FORBIDDEN && auth_cancel_req) { - r = 1; + r = IPP_NOT_AUTHENTICATED; + auth_cancel_req = 0; // Reseting cancel request. } + status_str = ippErrorString( r ); + if ( r <= IPP_OK_CONFLICT ) + r = IPP_OK; + abort: if (username) cupsSetUser(username); - if ( http != NULL ) - httpClose( http ); - if ( response != NULL ) ippDelete( response ); - return Py_BuildValue( "i", r ); + return Py_BuildValue( "is", r,status_str ); } @@ -810,12 +845,12 @@ PyObject * controlPrinter( PyObject * self, PyObject * args ) ipp_t *request = NULL, /* IPP Request */ *response = NULL; /* IPP Response */ char * name; - http_t *http = NULL; /* HTTP object */ int op; - int r = 0; + int r = IPP_BAD_REQUEST; char uri[ HTTP_MAX_URI ]; /* URI for printer/class */ cups_lang_t *language; const char *username = NULL; + const char * status_str = ""; username = cupsUser(); @@ -829,8 +864,9 @@ PyObject * controlPrinter( PyObject * self, PyObject * args ) goto abort; } + cupsSetUser ("root"); /* Connect to the HTTP server */ - if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL ) + if (acquireCupsInstance () == NULL) { goto abort; } @@ -862,22 +898,30 @@ PyObject * controlPrinter( PyObject * self, PyObject * args ) response = cupsDoRequest(http, request, "/admin/"); - if (( response != NULL ) && (ippGetStatusCode( response ) <= IPP_OK_CONFLICT)) + if (response == NULL) + r = cupsLastError(); + else + r = ippGetStatusCode( response ); + + // If user cancels the authentication pop-up, changing error code to IPP_NOT_AUTHENTICATED from IPP_FORBIDDEN + if (r == IPP_FORBIDDEN && auth_cancel_req) { - r = 1; + r = IPP_NOT_AUTHENTICATED; + auth_cancel_req = 0; // Reseting cancel request. } + status_str = ippErrorString( r ); + if ( r <= IPP_OK_CONFLICT) + r = IPP_OK; + abort: if (username) cupsSetUser(username); - if ( http != NULL ) - httpClose( http ); - if ( response != NULL ) ippDelete( response ); - return Py_BuildValue( "i", r ); + return Py_BuildValue( "is", r, status_str ); } @@ -1143,13 +1187,10 @@ PyObject * getPPDList( PyObject * self, PyObject * args ) PyObject * result; cups_lang_t *language; ipp_attribute_t * attr; - //PyObject * ppd_list; - http_t *http = NULL; /* HTTP object */ - //char buf[1024]; result = PyDict_New (); - if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL ) + if (acquireCupsInstance () == NULL) { goto abort; } @@ -1241,9 +1282,6 @@ PyObject * getPPDList( PyObject * self, PyObject * args ) } abort: - if ( http != NULL ) - httpClose( http ); - if ( response != NULL ) ippDelete( response ); @@ -1822,15 +1860,17 @@ const char * password_callback(const char * prompt) if (!usernameObj) return ""; username = PyString_AsString(usernameObj); - /* printf("usernameObj=%p, username='%s'\n", usernameObj, username); */ + // printf("usernameObj=%p, username='%s'\n", usernameObj, username); if (!username) return ""; + auth_cancel_req = ('\0' == username[0])? 1 : 0 ; + passwordObj = PyTuple_GetItem(result, 1); if (!passwordObj) return ""; password = PyString_AsString(passwordObj); - /* printf("passwordObj=%p, password='%s'\n", passwordObj, password); */ + // printf("passwrdObj=%p, passwrd='%s'\n", passwordObj, password); if (!password) return ""; @@ -1897,9 +1937,6 @@ PyObject * getPassword( PyObject * self, PyObject * args ) - - - // *************************************************************************************************** static PyMethodDef cupsext_methods[] = @@ -1940,6 +1977,7 @@ static PyMethodDef cupsext_methods[] = { "setPasswordCallback", ( PyCFunction ) setPasswordCallback, METH_VARARGS }, { "getPassword", ( PyCFunction ) getPassword, METH_VARARGS }, { "findPPDAttribute", ( PyCFunction ) findPPDAttribute, METH_VARARGS }, + { "releaseCupsInstance", ( PyCFunction ) releaseCupsInstance, METH_VARARGS }, { NULL, NULL } }; diff --git a/prnt/drv/hpcups.drv.in b/prnt/drv/hpcups.drv.in index 529407ce9..512d2e79d 100644 --- a/prnt/drv/hpcups.drv.in +++ b/prnt/drv/hpcups.drv.in @@ -9421,6 +9421,8 @@ Manufacturer "HP" PCFileName "hp-envy_5530_series.ppd" Attribute "Product" "" "(HP Envy 5530 E-all-in-one Printer)" Attribute "Product" "" "(HP Envy 5535 E-all-in-one Printer)" + Attribute "Product" "" "(HP Envy 5532 E-all-in-one Printer)" + Attribute "Product" "" "(HP Envy 5531 E-all-in-one Printer)" } } // End MimasTDR @@ -9665,6 +9667,7 @@ Manufacturer "HP" Attribute "Product" "" "(HP Deskjet Ink Advantage 1515 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 1516 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 1518 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet 1514 All-in-one Printer)" } { ModelName "HP Deskjet 2540 Series" @@ -9677,6 +9680,27 @@ Manufacturer "HP" Attribute "Product" "" "(HP Deskjet Ink Advantage 2545 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 2546 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 2540 All-in-one Printer Series)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 2548 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet 2544 All-in-one Printer)" + } + { + ModelName "HP Officejet 2620 Series" + Attribute "NickName" "" "HP Officejet 2620 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet 2620 Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 2620 series;DES:officejet 2620 series;" + PCFileName "hp-officejet_2620_series.ppd" + Attribute "Product" "" "(HP Officejet 2620 All-in-one)" + Attribute "Product" "" "(HP Officejet 2621 All-in-one)" + Attribute "Product" "" "(HP Officejet 2622 All-in-one)" + } + { + ModelName "HP Deskjet 2640 Series" + Attribute "NickName" "" "HP Deskjet 2640 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 2640 Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 2640 series;DES:deskjet 2640 series;" + PCFileName "hp-deskjet_2640_series.ppd" + Attribute "Product" "" "(HP Deskjet Ink Advantage 2645 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 2646 All-in-one Printer)" } } @@ -12918,14 +12942,6 @@ Group "RLT/HP Real Life Technologies" Attribute "Product" "" "(HP LaserJet p4014dn Printer)" } { - ModelName "HP LaserJet p4014" - Attribute "NickName" "" "HP LaserJet p4014, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet p4014" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p4014;DES:hp laserjet p4014;" - PCFileName "hp-laserjet_p4014.ppd" - Attribute "Product" "" "(HP LaserJet p4014 Printer)" - } - { ModelName "HP LaserJet p4014n" Attribute "NickName" "" "HP LaserJet p4014n, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet p4014n" @@ -12934,6 +12950,14 @@ Group "RLT/HP Real Life Technologies" Attribute "Product" "" "(HP LaserJet p4014n Printer)" } { + ModelName "HP LaserJet p4014" + Attribute "NickName" "" "HP LaserJet p4014, hpcups $Version" + Attribute "ShortNickName" "" "HP LaserJet p4014" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p4014;DES:hp laserjet p4014;" + PCFileName "hp-laserjet_p4014.ppd" + Attribute "Product" "" "(HP LaserJet p4014 Printer)" + } + { ModelName "HP LaserJet p4015tn" Attribute "NickName" "" "HP LaserJet p4015tn, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet p4015tn" @@ -17013,6 +17037,259 @@ Group "RLT/HP Real Life Technologies" } } // End LJZjsColor (for proprietary plugin) +///////////////////// Hbpl1 (for proprietary plugin) +{ + Attribute "hpPrinterLanguage" "" "hbpl1" + + Group "General/General" + + // cupsMediaType values map to MEDIATYPE from global_types.h + Option "MediaType/Media Type" PickOne AnySetup 10.0 + Choice "Auto/Unspecified" "<</MediaType(auto)>>setpagedevice" + *Choice "Plain/Plain Paper" "<</MediaType(Stationery)>>setpagedevice" + Choice "HPEcoSMARTLite/HP EcoSMART Lite" "<</MediaType(HPEcoSMARTLite)>>setpagedevice" + Choice "Light/Light 60-74g" "<</MediaType(light)>>setpagedevice" + Choice "Mid-Weight/Mid-Weight96-110g" "<</MediaType(midweight)>>setpagedevice" + Choice "Heavy/Heavy 111-130g" "<</MediaType(heavy)>>setpagedevice" + Choice "ExtraHeavy/Extra Heavy 131-175g" "<</MediaType(extraHeavy)>>setpagedevice" + Choice "Transparency/Monochrome Laser Transparency" "<</MediaType(transparencyMonoLaser)>>setpagedevice" + Choice "Labels/Labels" "<</MediaType(labels)>>setpagedevice" + Choice "Letterhead/Letterhead" "<</MediaType(stationery-letterhead)>>setpagedevice" + Choice "Envelope/Envelope" "<</MediaType(envelope)>>setpagedevice" + Choice "Preprinted/Preprinted" "<</MediaType(stationery-preprinted)>>setpagedevice" + Choice "Prepunched/Prepunched" "<</MediaType(stationery-prepunched)>>setpagedevice" + Choice "Colored/Colored" "<</MediaType(color)>>setpagedevice" + Choice "Bond/Bond" "<</MediaType(bond)>>setpagedevice" + Choice "Recycled/Recycled" "<</MediaType(recycled)>>setpagedevice" + Choice "Rough/Rough" "<</MediaType(rough)>>setpagedevice" + + + //MediaPosition + Option "InputSlot/Media Source" PickOne AnySetup 10.0 + Choice "Manual/Manual Feeder" "<</MediaPosition 12>>setpagedevice" + *Choice "tray1/Tray1" "<</MediaPosition 19>>setpagedevice" + + //Economode + Option "EconoMode/EconoMode" Boolean AnySetup 10.0 + *Choice "False/Off" "<</cupsInteger2 0>>setpagedevice" + Choice "True/On" "<</cupsInteger2 1>>setpagedevice" + + +// 4x6 or smaller + CustomMedia "A6/A6 105x148mm" 297.36 419.76 14 14 14 14 "<</cupsString0(iso_a6_105x148mm)/PageSize[298 420]/ImagingBBox null>>setpagedevice" + "<</cupsString0(iso_a6_105x148mm)/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice" + +// 5x7 + CustomMedia "A5/A5 148x210mm" 419.76 595.44 14 14 14 14 "<</cupsString0(iso_a5_148x210mm)/PageSize[420 595]/ImagingBBox null>>setpagedevice" + "<</cupsString0(iso_a5_148x210mm)/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice" + +// Standard + CustomMedia "B5/JB5 182x257mm" 516.24 728.64 14 14 14 14 "<</cupsString0(jis_b5_182x257mm)/PageSize[516 729]/ImagingBBox null>>setpagedevice" + "<</cupsString0(jis_b5_182x257mm)/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice" + CustomMedia "Executive/Executive 7.25x10.5in" 522 756 14 14 14 14 "<</cupsString0(na_executive_7.25x10.5in)/PageSize[522 756]/ImagingBBox null>>setpagedevice" + "<</cupsString0(na_executive_7.25x10.5in)/PageSize[522 756]/ImagingBBox null>>setpagedevice" + CustomMedia "195x270mm/16k 195x270mm" 552 765 14 14 14 14 "<</cupsString0(prc_16k_195x270mm)/PageSize[553 765]/ImagingBBox null>>setpagedevice" + "<</cupsString0 (prc_16k_195x270mm)/PageSize[552 765]/ImagingBBox null>>setpagedevice" + CustomMedia "184x260mm/16k 184x260mm" 525 720 14 14 14 14 "<</cupsString0(prc_16k_184x260mm)/PageSize[522 737]/ImagingBBox null>>setpagedevice" + "<</cupsString0(prc_16k_184x260mm)/PageSize[525 720]/ImagingBBox null>>setpagedevice" + CustomMedia "Envroc16k/16k 197x273mm" 554 774 14 14 14 14 "<</cupsString0(prc_16k_197x273mm)/PageSize[558 774]/ImagingBBox null>>setpagedevice" + "<</cupsString0(prc_16k_197x273mm)/PageSize[554 774]/ImagingBBox null>>setpagedevice" + *CustomMedia "Letter/Letter 8.5x11in" 612 792 14 14 14 14 "<</cupsString0(na_letter_8.5x11in)/PageSize[612 792]/ImagingBBox null>>setpagedevice" + "<</cupsString0(na_letter_8.5x11in)/PageSize[612 792]/ImagingBBox null>>setpagedevice" + CustomMedia "A4/A4 210x297mm" 595.44 841.68 14 14 14 14 "<</cupsString0(iso_a4_210x297mm)/PageSize[595 842]/ImagingBBox null>>setpagedevice" + "<</cupsString0(iso_a4_210x297mm)/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" + CustomMedia "Legal/Legal 8.5x14in" 612 1008 14 14 14 14 "<</cupsString0(na_legal_8.5x14in)/PageSize[612 1008]/ImagingBBox null>>setpagedevice" + "<</cupsString0(na_legal_8.5x14in)/PageSize[612 1008]/ImagingBBox null>>setpagedevice" + CustomMedia "8.5x13in/Oficio 8.5x13" 612 936 14 14 14 14 "<</cupsString0(na_foolscap_8.5x13in)/PageSize[612 936]/ImagingBBox null>>setpagedevice" + "<</cupsString0(na_foolscap_8.5x13in)/PageSize[612 936]/ImagingBBox null>>setpagedevice" + CustomMedia "216x340mm/Oficio 216x340mm" 612 936 14 14 14 14 "<</cupsString0(na_legal_216x340mm)/PageSize[612 964]/ImagingBBox null>>setpagedevice" + "<</cupsString0(na_legal_216x340mm)/PageSize[612 964]/ImagingBBox null>>setpagedevice" + CustomMedia "Postcard/Postcard (JIS)" 283 420 14 14 14 14 "<</cupsString0(jpn_hagaki_100x148mm)/PageSize[283 420]/ImagingBBox null>>setpagedevice" + "<</cupsString0(jpn_hagaki_100x148mm)/PageSize[283 420]/ImagingBBox null>>setpagedevice" + CustomMedia "DoublePostcardRotated/Double Postcard (JIS)" 420 567 14 14 14 14 "<</cupsString0(jpn_oufuku_148x200mm)/PageSize[420 567]/ImagingBBox null>>setpagedevice" + "<</cupsString0(jpn_oufuku_148x200mm)/PageSize[420 567]/ImagingBBox null>>setpagedevice" + +// Envelope + CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 14 14 14 14 "<</cupsString0(na_monarch_3.875x7.5in)/PageSize[279 540]/ImagingBBox null>>setpagedevice" + "<</cupsString0(na_monarch_3.875x7.5in)/PageSize[279 540]/ImagingBBox null>>setpagedevice" + CustomMedia "EnvDL/DL Envelope 110x220mm" 312 624 14 14 14 14 "<</cupsString0(iso_dl_110x220mm)/PageSize[312 624]/ImagingBBox null>>setpagedevice" + "<</cupsString0(iso_dl_110x220mm)/PageSize[312 624]/ImagingBBox null>>setpagedevice" + CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 14 14 14 14 "<</cupsString0(na_number-10_4.125x9.5in)/PageSize[297 684]/ImagingBBox null>>setpagedevice" + "<</cupsString0(na_number-10_4.125x9.5in)/PageSize[297 684]/ImagingBBox null>>setpagedevice" + CustomMedia "EnvC5/C5 Envelope 162x229mm" 459 649 14 14 14 14 "<</cupsString0(iso_c5_162x229mm)/PageSize[459 649]/ImagingBBox null>>setpagedevice" + "<</cupsString0(iso_c5_162x229mm)/PageSize[459 649]/ImagingBBox null>>setpagedevice" + CustomMedia "EnvISOB5/B5 Envelope 176x250mm" 499 709 14 14 14 14 "<</cupsString0(iso_b5_176x250mm)/PageSize[499 709]/ImagingBBox null>>setpagedevice" + "<</cupsString0(iso_b5_176x250mm)/PageSize[499 709]/ImagingBBox null>>setpagedevice" + + // Custom page sizes from 1x4in to Legal + HWMargins 14 14 14 14 + VariablePaperSize Yes + MinSize 3in 5in + MaxSize 8.5in 14in + + { + + //Constraints + + // cupsRowCount values map to PEN_TYPE + 1 from global_types.h + Option "ColorModel/Output Mode" PickOne AnySetup 10.0 + *Choice "Gray/Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowCount 3/cupsRowStep 2>>setpagedevice" + + // cupsMediaType values map to MEDIATYPE from global_types.h + Option "MediaType/Media Type" PickOne AnySetup 10.0 + Choice "Vellum/Vellum" "<</MediaType(vellum)>>setpagedevice" + + //cupsCompression values map to QUALITY_MODE from global_types.h + Option "OutputMode/Print Quality" PickOne AnySetup 10.0 + *Choice "FastRes600/FastRes 600" "<</OutputType(normal)/HWResolution[600 600]>>setpagedevice" + Choice "FastRes1200/FastRes 1200" "<</OutputType(best)/HWResolution[600 600]>>setpagedevice" + + // <%Hbpl1:Mono%> + { + ModelName "HP LaserJet Pro MFP m127fw" + Attribute "NickName" "" "HP LaserJet Pro MFP m127fw, hpcups $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet Pro MFP m127fw" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m127fw;DES:hp laserjet pro mfp m127fw;" + PCFileName "hp-laserjet_pro_mfp_m127fw.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m127fw)" + } + { + ModelName "HP LaserJet Pro MFP m127fn" + Attribute "NickName" "" "HP LaserJet Pro MFP m127fn, hpcups $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet Pro MFP m127fn" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m127fn;DES:hp laserjet pro mfp m127fn;" + PCFileName "hp-laserjet_pro_mfp_m127fn.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m127fn)" + } + } + + { + //Constraints + UIConstraints "*Economode True *ColorModel RGB" + UIConstraints "*Gray True *ColorModel RGB" + + //PaperSize && HPGlossPhoto220gsmFasterPrinting + UIConstraints "*PageSize Letter *MediaType HPGlossPhoto220gsmFasterPrinting" + UIConstraints "*PageSize Legal *MediaType HPGlossPhoto220gsmFasterPrinting" + UIConstraints "*PageSize Executive *MediaType HPGlossPhoto220gsmFasterPrinting" + UIConstraints "*PageSize 5x8 *MediaType HPGlossPhoto220gsmFasterPrinting" + UIConstraints "*PageSize A4 *MediaType HPGlossPhoto220gsmFasterPrinting" + UIConstraints "*PageSize A5 *MediaType HPGlossPhoto220gsmFasterPrinting" + UIConstraints "*PageSize A6 *MediaType HPGlossPhoto220gsmFasterPrinting" + UIConstraints "*PageSize B5 *MediaType HPGlossPhoto220gsmFasterPrinting" + UIConstraints "*PageSize 216x340mm *MediaType HPGlossPhoto220gsmFasterPrinting" + UIConstraints "*PageSize 195x270mm *MediaType HPGlossPhoto220gsmFasterPrinting" + UIConstraints "*PageSize 184x260mm *MediaType HPGlossPhoto220gsmFasterPrinting" + UIConstraints "*PageSize Envroc16k *MediaType HPGlossPhoto220gsmFasterPrinting" + UIConstraints "*PageSize Postcard *MediaType HPGlossPhoto220gsmFasterPrinting" + UIConstraints "*PageSize DoublePostcardRotated *MediaType HPGlossPhoto220gsmFasterPrinting" + UIConstraints "*PageSize Env10 *MediaType HPGlossPhoto220gsmFasterPrinting" + UIConstraints "*PageSize EnvMonarch *MediaType HPGlossPhoto220gsmFasterPrinting" + UIConstraints "*PageSize EnvISOB5 *MediaType HPGlossPhoto220gsmFasterPrinting" + UIConstraints "*PageSize EnvC5 *MediaType HPGlossPhoto220gsmFasterPrinting" + UIConstraints "*PageSize EnvDL *MediaType HPGlossPhoto220gsmFasterPrinting" + + //PaperSize && HPGlossPhoto220gsmHigherGloss + UIConstraints "*PageSize Letter *MediaType HPGlossPhoto220gsmHigherGloss" + UIConstraints "*PageSize Legal *MediaType HPGlossPhoto220gsmHigherGloss" + UIConstraints "*PageSize Executive *MediaType HPGlossPhoto220gsmHigherGloss" + UIConstraints "*PageSize 5x8 *MediaType HPGlossPhoto220gsmHigherGloss" + UIConstraints "*PageSize A4 *MediaType HPGlossPhoto220gsmHigherGloss" + UIConstraints "*PageSize A5 *MediaType HPGlossPhoto220gsmHigherGloss" + UIConstraints "*PageSize A6 *MediaType HPGlossPhoto220gsmHigherGloss" + UIConstraints "*PageSize B5 *MediaType HPGlossPhoto220gsmHigherGloss" + UIConstraints "*PageSize 216x340mm *MediaType HPGlossPhoto220gsmHigherGloss" + UIConstraints "*PageSize 195x270mm *MediaType HPGlossPhoto220gsmHigherGloss" + UIConstraints "*PageSize 184x260mm *MediaType HPGlossPhoto220gsmHigherGloss" + UIConstraints "*PageSize Envroc16k *MediaType HPGlossPhoto220gsmHigherGloss" + UIConstraints "*PageSize Postcard *MediaType HPGlossPhoto220gsmHigherGloss" + UIConstraints "*PageSize DoublePostcardRotated *MediaType HPGlossPhoto220gsmHigherGloss" + UIConstraints "*PageSize Env10 *MediaType HPGlossPhoto220gsmHigherGloss" + UIConstraints "*PageSize EnvMonarch *MediaType HPGlossPhoto220gsmHigherGloss" + UIConstraints "*PageSize EnvISOB5 *MediaType HPGlossPhoto220gsmHigherGloss" + UIConstraints "*PageSize EnvC5 *MediaType HPGlossPhoto220gsmHigherGloss" + UIConstraints "*PageSize EnvDL *MediaType HPGlossPhoto220gsmHigherGloss" + + //Grayscale print && Colortheme + UIConstraints "*Gray True *RGBColorMode DefaultSRGB" + UIConstraints "*Gray True *RGBColorMode PhotoSRGB" + UIConstraints "*Gray True *RGBColorMode Adobe" + UIConstraints "*Gray True *RGBColorMode VividSRGB" + + + // cupsRowCount values map to PEN_TYPE + 1 from global_types.h + Option "ColorModel/Neutral Grays" PickOne AnySetup 10.0 + *Choice "KGray/Black Only" "<</OutputType(normal)/cupsColorSpace 1/cupsBitsPerColor 8/cupsRowCount 3/cupsRowStep 1>>setpagedevice" + Choice "RGB/4-Color" "<</OutputType(best)/cupsColorSpace 1/cupsBitsPerColor 8/cupsRowCount 3/cupsRowStep 0>>setpagedevice" + + Option "RGBColorMode/RGB Color" PickOne AnySetup 10.0 + *Choice "DefaultSRGB/Default sRGB" "<</cupsInteger5 1>>setpagedevice" + Choice "PhotoSRGB/Photo sRGB" "<</cupsInteger5 2>>setpagedevice" + Choice "Adobe/Photo Adobe RGB 1998" "<</cupsInteger5 3>>setpagedevice" + Choice "VividSRGB/Vivid sRGB" "<</cupsInteger5 4>>setpagedevice" + Choice "HPRGBColorModeNone/None" "<</cupsInteger5 0>>setpagedevice" + + //Print In Grayscale : TODO:-handle in Hbpl1 code + Option "Gray/Print in Grayscale" Boolean AnySetup 10.0 + *Choice "False/Off" "<</cupsInteger3 0>>setpagedevice" + Choice "True/On" "<</cupsInteger3 1>>setpagedevice" + + //cupsCompression values map to QUALITY_MODE from global_types.h + Option "OutputMode/Print Quality" PickOne AnySetup 10.0 + *Choice "ImageREt2400/ImageREt 2400" "<</HWResolution[600 600]>>setpagedevice" + + // cupsMediaType values map to MEDIATYPE from global_types.h + Option "MediaType/Media Type" PickOne AnySetup 10.0 + Choice "HPLaserJet90gsm/HP LaserJet 90g" "<</MediaType(HPLaserJet90gsm)>>setpagedevice" + Choice "HPColorLaser105gsm/HP Color Laser Matte 105g" "<</MediaType(HPColorLaser105gsm)>>setpagedevice" + Choice "HPPremium_120gsm/HP Premium Choice Matte 120g" "<</MediaType(HPPremium_120gsm)>>setpagedevice" + Choice "HPMatte160gsm/HP Brochure Matte 150g" "<</MediaType(HPMatte160gsm)>>setpagedevice" + Choice "HPMatteCover200gsm/HP Cover Matte 200g" "<</MediaType(HPMatteCover200gsm)>>setpagedevice" + Choice "HPMattePhoto200gsm/HP Matte Photo 200g" "<</MediaType(HPMattePhoto200gsm)>>setpagedevice" + Choice "HPGlossy130gsm/HP Premium Presentation Glossy 120g" "<</MediaType(HPGlossy130gsm)>>setpagedevice" + Choice "HPGlossy160gsm/HP Brochure Glossy 150g" "<</MediaType(HPGlossy160gsm)>>setpagedevice" + Choice "HPTrifoldBrochureGlossy/HP Tri-fold Brochure Glossy 150g" "<</MediaType(HPTrifoldBrochureGlossy)>>setpagedevice" + Choice "HPGlossPhoto220gsm/HP Brochure Glossy 200g" "<</MediaType(HPGlossPhoto220gsm)>>setpagedevice" + Choice "HPGlossPhoto220gsmFasterPrinting/HP Brochure Glossy 200g (faster printing)" "<</MediaType(HPGlossPhoto220gsmFasterPrinting)>>setpagedevice" + Choice "HPGlossPhoto220gsmHigherGloss/HP Brochure Glossy 200g (higher gloss)" "<</MediaType(HPGlossPhoto220gsmHigherGloss)>>setpagedevice" + Choice "midweightGlossy/Mid-Weight Glossy 96-110g" "<</MediaType(midweightGlossy)>>setpagedevice" + Choice "heavyGlossy/Heavy Glossy 111-130g" "<</MediaType(heavyGlossy)>>setpagedevice" + Choice "extraHeavyGloss/Extra Heavy Glossy 131-175g" "<</MediaType(extraHeavyGloss)>>setpagedevice" + Choice "cardstockGlossy/Card Glossy 176-220g" "<</MediaType(cardstockGlossy)>>setpagedevice" + Choice "transparencyColorLaser/Color Laser Transparency" "<</MediaType(transparencyColorLaser)>>setpagedevice" + Choice "heavyEnvelope/Heavy Envelope" "<</MediaType(heavyEnvelope)>>setpagedevice" + Choice "heavyRough/Heavy Rough" "<</MediaType(heavyRough)>>setpagedevice" + Choice "toughPaper/HP Tough Paper" "<</MediaType(toughPaper)>>setpagedevice" + Choice "intermediate/Intermediate 85-95g" "<</MediaType(intermediate)>>setpagedevice" + + //Standard + CustomMedia "4x6/4x6" 288 432 14 14 14 14 "<</cupsString0(na_index-4x6_4x6in)/PageSize[288 432]/ImagingBBox null>>setpagedevice" + "<</cupsString0(na_index-4x6_4x6in)/PageSize [288 432]/ImagingBBox null>>setpagedevice" + CustomMedia "5x8/5x8" 360 576 14 14 14 14 "<</cupsString0(na_index-5x8_5x8in)/PageSize[360 576]/ImagingBBox null>>setpagedevice" + "<</cupsString0(na_index-5x8_5x8in)/PageSize [360 576]/ImagingBBox null>>setpagedevice" + CustomMedia "100x150mm/10x15cm" 288 432 14 14 14 14 "<</cupsString0(om_small-photo_100x150mm)/PageSize[288 432]/ImagingBBox null>>setpagedevice" + "<</cupsString0(om_small-photo_100x150mm)/PageSize [288 432]/ImagingBBox null>>setpagedevice" + + // <%Hbpl1:Color%> + { + ModelName "HP Color LaserJet Pro MFP m176n" + Attribute "NickName" "" "HP Color LaserJet Pro MFP m176n, hpcups $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet Pro MFP m176n" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet pro mfp m176n;DES:hp color laserjet pro mfp m176n;" + PCFileName "hp-color_laserjet_pro_mfp_m176n.ppd" + Attribute "Product" "" "(HP Color LaserJet Pro Mpf m176n)" + } + { + ModelName "HP Color LaserJet Pro MFP m177fw" + Attribute "NickName" "" "HP Color LaserJet Pro MFP m177fw, hpcups $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LJ Pro MFP m177fw" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet pro mfp m177fw;DES:hp color laserjet pro mfp m177fw;" + PCFileName "hp-color_laserjet_pro_mfp_m177fw.ppd" + Attribute "Product" "" "(HP Color LaserJet Pro Mpf m177fw)" + } + } + +} // End HBPL1 (for proprietary plugin) ///////////// LJJetReady (color, for both open and proprietary plugin) { diff --git a/prnt/drv/hpijs.drv.in b/prnt/drv/hpijs.drv.in index 74ee5af1b..47418694b 100644 --- a/prnt/drv/hpijs.drv.in +++ b/prnt/drv/hpijs.drv.in @@ -7002,14 +7002,6 @@ t=0" Attribute "Product" "" "(HP LaserJet p4014dn Printer)" } { - ModelName "HP LaserJet p4014 hpijs" - Attribute "NickName" "" "HP LaserJet p4014 hpijs, $Version" - Attribute "ShortNickName" "" "HP LaserJet p4014 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p4014;DES:hp laserjet p4014;" - PCFileName "hp-laserjet_p4014-hpijs.ppd" - Attribute "Product" "" "(HP LaserJet p4014 Printer)" - } - { ModelName "HP LaserJet p4014n hpijs" Attribute "NickName" "" "HP LaserJet p4014n hpijs, $Version" Attribute "ShortNickName" "" "HP LaserJet p4014n hpijs" @@ -7018,6 +7010,14 @@ t=0" Attribute "Product" "" "(HP LaserJet p4014n Printer)" } { + ModelName "HP LaserJet p4014 hpijs" + Attribute "NickName" "" "HP LaserJet p4014 hpijs, $Version" + Attribute "ShortNickName" "" "HP LaserJet p4014 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p4014;DES:hp laserjet p4014;" + PCFileName "hp-laserjet_p4014-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet p4014 Printer)" + } + { ModelName "HP LaserJet p4015tn hpijs" Attribute "NickName" "" "HP LaserJet p4015tn hpijs, $Version" Attribute "ShortNickName" "" "HP LaserJet p4015tn hpijs" @@ -12401,6 +12401,170 @@ Transparency" } //LJZjsColor End +///////////////////// Hbpl1 (for proprietary plugin) +{ + Attribute "DefaultResolution" "" "600dpi" + + // Custom page sizes from 1x4in to Ledger + HWMargins 18 14.4 18 14.4 + VariablePaperSize Yes + MinSize 1in 4in + MaxSize 11in 17in + Attribute "FoomaticRIPOptionSetting" "PageSize=Custom" " -dDEVICEWIDTHPOINTS=0 -dD&& +EVICEHEIGHTPOINTS=0" + + Attribute "FoomaticIDs" "" "HP-Color_LaserJet_2600n hpijs" + Attribute "FoomaticRIPCommandLine" "" "gs -q -dBATCH -dPARANOIDSAFER -dQUIET -dNOPA&& +USE -sDEVICE=ijs -sIjsServer=hpijs%A%B%C%D -dIjsUseOutputFD%Z -sOutputFi&& +le=- -" + Attribute "FoomaticRIPOption" "Model" "enum CmdLine A 100" + Attribute "FoomaticRIPOptionSetting" "Model=HP-Color_LaserJet_2600n" " -sDeviceManufactur&& +er="HEWLETT-PACKARD" -sDeviceModel="HP Color LaserJet 2600n"" + Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=DraftColorCMYK" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=DraftGrayscaleCMYK" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=NormalColorCMYK" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=NormalGrayscaleCMYK" + Attribute "FoomaticRIPOption" "MediaType" "enum CmdLine C" + Attribute "FoomaticRipOptionSetting" "MediaType=Plain" ",Quality:MediaType=0" + Attribute "FoomaticRipOptionSetting" "MediaType=Transparency" ",Quality:MediaType=3" + Attribute "FoomaticRipOptionSetting" "MediaType=Photo" ",Quality:MediaType=3" + Attribute "FoomaticRIPOption" "InputSlot" "enum CmdLine D" + Attribute "FoomaticRIPOptionSetting" "InputSlot=Default" ",PS:MediaPosition=7" + Attribute "FoomaticRIPOptionSetting" "InputSlot=Manual" ",PS:MediaPosition=2" + Attribute "FoomaticRIPOption" "PageSize" "enum CmdLine A" + Attribute "FoomaticRIPOptionSetting" "PageSize=Letter" " -dDEVICEWIDTHPOINTS=612 -&& +dDEVICEHEIGHTPOINTS=792" + Attribute "FoomaticRIPOptionSetting" "PageSize=A4" " -dDEVICEWIDTHPOINTS=595 -dDEV&& +ICEHEIGHTPOINTS=842" + Attribute "FoomaticRIPOptionSetting" "PageSize=Photo" " -dDEVICEWIDTHPOINTS=288 -d&& +DEVICEHEIGHTPOINTS=432" + Attribute "FoomaticRIPOptionSetting" "PageSize=Photo5x7" " -dDEVICEWIDTHPOINTS=360&& + -dDEVICEHEIGHTPOINTS=504" + Attribute "FoomaticRIPOptionSetting" "PageSize=3x5" " -dDEVICEWIDTHPOINTS=216 -dDE&& +VICEHEIGHTPOINTS=360" + Attribute "FoomaticRIPOptionSetting" "PageSize=5x8" " -dDEVICEWIDTHPOINTS=360 -dDE&& +VICEHEIGHTPOINTS=576" + Attribute "FoomaticRIPOptionSetting" "PageSize=A5" " -dDEVICEWIDTHPOINTS=420 -dDEV&& +ICEHEIGHTPOINTS=595" + Attribute "FoomaticRIPOptionSetting" "PageSize=A6" " -dDEVICEWIDTHPOINTS=297 -dDEV&& +ICEHEIGHTPOINTS=420" + Attribute "FoomaticRIPOptionSetting" "PageSize=B5JIS" " -dDEVICEWIDTHPOINTS=516 -d&& +DEVICEHEIGHTPOINTS=729" + Attribute "FoomaticRIPOptionSetting" "PageSize=Env10" " -dDEVICEWIDTHPOINTS=297 -d&& +DEVICEHEIGHTPOINTS=684" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvC5" " -dDEVICEWIDTHPOINTS=459 -d&& +DEVICEHEIGHTPOINTS=649" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvC6" " -dDEVICEWIDTHPOINTS=323 -d&& +DEVICEHEIGHTPOINTS=459" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvDL" " -dDEVICEWIDTHPOINTS=312 -d&& +DEVICEHEIGHTPOINTS=624" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvISOB5" " -dDEVICEWIDTHPOINTS=499&& + -dDEVICEHEIGHTPOINTS=709" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvMonarch" " -dDEVICEWIDTHPOINTS=2&& +79 -dDEVICEHEIGHTPOINTS=540" + Attribute "FoomaticRIPOptionSetting" "PageSize=Executive" " -dDEVICEWIDTHPOINTS=52&& +2 -dDEVICEHEIGHTPOINTS=756" + Attribute "FoomaticRIPOptionSetting" "PageSize=FLSA" " -dDEVICEWIDTHPOINTS=612 -dD&& +EVICEHEIGHTPOINTS=936" + Attribute "FoomaticRIPOptionSetting" "PageSize=Hagaki" " -dDEVICEWIDTHPOINTS=283 -&& +dDEVICEHEIGHTPOINTS=420" + Attribute "FoomaticRIPOptionSetting" "PageSize=Legal" " -dDEVICEWIDTHPOINTS=612 -d&& +DEVICEHEIGHTPOINTS=1008" + Attribute "FoomaticRIPOptionSetting" "PageSize=Oufuku" " -dDEVICEWIDTHPOINTS=567 -&& +dDEVICEHEIGHTPOINTS=420" + Attribute "FoomaticRIPOptionSetting" "PageSize=w558h774" " -dDEVICEWIDTHPOINTS=558&& + -dDEVICEHEIGHTPOINTS=774" + Attribute "FoomaticRIPOptionSetting" "PageSize=w612h935" " -dDEVICEWIDTHPOINTS=612&& + -dDEVICEHEIGHTPOINTS=935" + Attribute "FoomaticRIPOption" "Quality" "enum CmdLine B" + Attribute "FoomaticRIPOptionSetting" "Quality=DraftColorCMYK" " -r600 -sIjsPar&& +ams=Quality:Quality=1,Quality:ColorMode=2,Quality:PenSet=2" + Attribute "FoomaticRIPOptionSetting" "Quality=NormalColorCMYK" " -r600 -sIjsParams=Q&& +uality:Quality=0,Quality:ColorMode=2,Quality:PenSet=2" + Attribute "FoomaticRIPOptionSetting" "Quality=DraftGrayscaleCMYK" " -r600 -sIjsPar&& +ams=Quality:Quality=1,Quality:ColorMode=0,Quality:PenSet=2" + Attribute "FoomaticRIPOptionSetting" "Quality=NormalGrayscaleCMYK" " -r600 -sIjsParams=Q&& +uality:Quality=0,Quality:ColorMode=0,Quality:PenSet=2" + Group "General/General" + Option "PrintoutMode/Printout Mode" PickOne AnySetup 10.0 + Choice "Draft/Draft Color" "%% FoomaticRIPOptionSetting: PrintoutMode=Draft" + *Choice "Normal/Normal Color" "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" + Choice "Draft.Gray/Draft Grayscale" "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" + Choice "Normal.Gray/Normal Grayscale" "%% FoomaticRIPOptionSetting: PrintoutMode=Normal.Gray" + Option "MediaType/Media Type" PickOne AnySetup 10.0 + *Choice "Plain/Plain Paper" "%% FoomaticRIPOptionSetting: MediaType=Plain" + Choice "Transparency/Transparency" "%% FoomaticRIPOptionSetting: MediaType=&& +Transparency" + Choice "Photo/Photo Paper" "%% FoomaticRIPOptionSetting: MediaType=Photo" + Option "InputSlot/Media Source" PickOne AnySetup 100.0 + *Choice "Default/Automatic" "%% FoomaticRIPOptionSetting: InputSlot=Default" + Choice "Manual/Manual Feeder" "%% FoomaticRIPOptionSetting: InputSlot=Manual" + Group "PrintoutMode/Printout Mode" + Option "Quality/Resolution, Quality, Toner Type, Media Type" PickOne AnySetup 100.0 + *Choice "FromPrintoutMode/Controlled by 'Printout Mode'" "%% FoomaticRIPOptionSetting: Quality=@PrintoutMode" + Choice "DraftColorCMYK/600 dpi, Draft, Color, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=DraftColorCMYK" + Choice "NormalColorCMYK/600 dpi, Normal, Color, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=NormalColorCMYK" + Choice "DraftGrayscaleCMYK/600 dpi, Draft, Grayscale, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=DraftGrayscaleCMYK" + Choice "NormalGrayscaleCMYK/600 dpi, Normal, Grayscale, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=NormalGrayscaleCMYK" + *CustomMedia "Letter/Letter" 612.00 792.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Letter" "%% FoomaticRIPOptionSetting: PageSize=Letter" + CustomMedia "A4/A4" 595.00 842.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=A4" "%% FoomaticRIPOptionSetting: PageSize=A4" + CustomMedia "Photo/Photo/4x6 inch index card" 288.00 432.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Photo" "%% FoomaticRIPOptionSetting: PageSize=Photo" + CustomMedia "Photo5x7/Photo/5x7 inch index card" 360.00 504.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Photo5x7" "%% FoomaticRIPOptionSetting: PageSize=Photo5x7" + CustomMedia "3x5/3x5 inch index card" 216.00 360.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=3x5" "%% FoomaticRIPOptionSetting: PageSize=3x5" + CustomMedia "5x8/5x8 inch index card" 360.00 576.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=5x8" "%% FoomaticRIPOptionSetting: PageSize=5x8" + CustomMedia "A5/A5" 420.00 595.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=A5" "%% FoomaticRIPOptionSetting: PageSize=A5" + CustomMedia "A6/A6" 297.00 420.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=A6" "%% FoomaticRIPOptionSetting: PageSize=A6" + CustomMedia "B5JIS/B5 (JIS)" 516.00 729.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=B5JIS" "%% FoomaticRIPOptionSetting: PageSize=B5JIS" + CustomMedia "Env10/Envelope #10" 297.00 684.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Env10" "%% FoomaticRIPOptionSetting: PageSize=Env10" + CustomMedia "EnvC5/Envelope C5" 459.00 649.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=EnvC5" "%% FoomaticRIPOptionSetting: PageSize=EnvC5" + CustomMedia "EnvC6/Envelope C6" 323.00 459.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=EnvC6" "%% FoomaticRIPOptionSetting: PageSize=EnvC6" + CustomMedia "EnvDL/Envelope DL" 312.00 624.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=EnvDL" "%% FoomaticRIPOptionSetting: PageSize=EnvDL" + CustomMedia "EnvISOB5/Envelope B5" 499.00 709.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=EnvISOB5" "%% FoomaticRIPOptionSetting: PageSize=EnvISOB5" + CustomMedia "EnvMonarch/Envelope Monarch" 279.00 540.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" + CustomMedia "Executive/Executive" 522.00 756.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Executive" "%% FoomaticRIPOptionSetting: PageSize=Executive" + CustomMedia "FLSA/American Foolscap" 612.00 936.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=FLSA" "%% FoomaticRIPOptionSetting: PageSize=FLSA" + CustomMedia "Hagaki/Hagaki" 283.00 420.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Hagaki" "%% FoomaticRIPOptionSetting: PageSize=Hagaki" + CustomMedia "Legal/Legal" 612.00 1008.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Legal" "%% FoomaticRIPOptionSetting: PageSize=Legal" + CustomMedia "Oufuku/Oufuku-Hagaki" 567.00 420.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Oufuku" "%% FoomaticRIPOptionSetting: PageSize=Oufuku" + CustomMedia "w558h774/16K" 558.00 774.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=w558h774" "%% FoomaticRIPOptionSetting: PageSize=w558h774" + CustomMedia "w612h935/Executive (JIS)" 612.00 935.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=w612h935" "%% FoomaticRIPOptionSetting: PageSize=w612h935" + + // <%Hbpl1:Mono%> + { + ModelName "HP LaserJet Pro MFP m127fw hpijs" + Attribute "NickName" "" "HP LaserJet Pro MFP m127fw hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LJ Pro MFP m127fw hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m127fw;DES:hp laserjet pro mfp m127fw;" + PCFileName "hp-laserjet_pro_mfp_m127fw-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m127fw)" + } + { + ModelName "HP LaserJet Pro MFP m127fn hpijs" + Attribute "NickName" "" "HP LaserJet Pro MFP m127fn hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LJ Pro MFP m127fn hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m127fn;DES:hp laserjet pro mfp m127fn;" + PCFileName "hp-laserjet_pro_mfp_m127fn-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m127fn)" + } + // <%Hbpl1:Color%> + { + ModelName "HP Color LaserJet Pro MFP m176n hpijs" + Attribute "NickName" "" "HP Color LaserJet Pro MFP m176n hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LJ Pro MFP m176n hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet pro mfp m176n;DES:hp color laserjet pro mfp m176n;" + PCFileName "hp-color_laserjet_pro_mfp_m176n-hpijs.ppd" + Attribute "Product" "" "(HP Color LaserJet Pro Mpf m176n)" + } + { + ModelName "HP Color LaserJet Pro MFP m177fw hpijs" + Attribute "NickName" "" "HP Color LaserJet Pro MFP m177fw hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP CLJ Pro MFP m177fw hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet pro mfp m177fw;DES:hp color laserjet pro mfp m177fw;" + PCFileName "hp-color_laserjet_pro_mfp_m177fw-hpijs.ppd" + Attribute "Product" "" "(HP Color LaserJet Pro Mpf m177fw)" + } +} // end Hbpl1 (for proprietary plugin) ///////////// LJP1XXX (for proprietary plugin) { @@ -14440,6 +14604,8 @@ lity:PenSet=2,Quality:FullBleed=1" PCFileName "hp-envy_5530_series-hpijs.ppd" Attribute "Product" "" "(HP Envy 5530 E-all-in-one Printer)" Attribute "Product" "" "(HP Envy 5535 E-all-in-one Printer)" + Attribute "Product" "" "(HP Envy 5532 E-all-in-one Printer)" + Attribute "Product" "" "(HP Envy 5531 E-all-in-one Printer)" } } // end MimasTDR @@ -17129,6 +17295,7 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Deskjet Ink Advantage 1515 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 1516 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 1518 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet 1514 All-in-one Printer)" } { ModelName "HP Deskjet 2540 Series hpijs" @@ -17141,6 +17308,27 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Deskjet Ink Advantage 2545 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 2546 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 2540 All-in-one Printer Series)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 2548 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet 2544 All-in-one Printer)" + } + { + ModelName "HP Officejet 2620 Series hpijs" + Attribute "NickName" "" "HP Officejet 2620 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Officejet 2620 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 2620 series;DES:officejet 2620 series;" + PCFileName "hp-officejet_2620_series-hpijs.ppd" + Attribute "Product" "" "(HP Officejet 2620 All-in-one)" + Attribute "Product" "" "(HP Officejet 2621 All-in-one)" + Attribute "Product" "" "(HP Officejet 2622 All-in-one)" + } + { + ModelName "HP Deskjet 2640 Series hpijs" + Attribute "NickName" "" "HP Deskjet 2640 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Deskjet 2640 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 2640 series;DES:deskjet 2640 series;" + PCFileName "hp-deskjet_2640_series-hpijs.ppd" + Attribute "Product" "" "(HP Deskjet Ink Advantage 2645 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 2646 All-in-one Printer)" } diff --git a/prnt/drv/hpijs.drv.in.template b/prnt/drv/hpijs.drv.in.template index e3fab2f5f..b5dca167b 100644 --- a/prnt/drv/hpijs.drv.in.template +++ b/prnt/drv/hpijs.drv.in.template @@ -6226,6 +6226,138 @@ Transparency" } //LJZjsColor End +///////////////////// Hbpl1 (for proprietary plugin) +{ + Attribute "DefaultResolution" "" "600dpi" + + // Custom page sizes from 1x4in to Ledger + HWMargins 18 14.4 18 14.4 + VariablePaperSize Yes + MinSize 1in 4in + MaxSize 11in 17in + Attribute "FoomaticRIPOptionSetting" "PageSize=Custom" " -dDEVICEWIDTHPOINTS=0 -dD&& +EVICEHEIGHTPOINTS=0" + + Attribute "FoomaticIDs" "" "HP-Color_LaserJet_2600n hpijs" + Attribute "FoomaticRIPCommandLine" "" "gs -q -dBATCH -dPARANOIDSAFER -dQUIET -dNOPA&& +USE -sDEVICE=ijs -sIjsServer=hpijs%A%B%C%D -dIjsUseOutputFD%Z -sOutputFi&& +le=- -" + Attribute "FoomaticRIPOption" "Model" "enum CmdLine A 100" + Attribute "FoomaticRIPOptionSetting" "Model=HP-Color_LaserJet_2600n" " -sDeviceManufactur&& +er="HEWLETT-PACKARD" -sDeviceModel="HP Color LaserJet 2600n"" + Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=DraftColorCMYK" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=DraftGrayscaleCMYK" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=NormalColorCMYK" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=NormalGrayscaleCMYK" + Attribute "FoomaticRIPOption" "MediaType" "enum CmdLine C" + Attribute "FoomaticRipOptionSetting" "MediaType=Plain" ",Quality:MediaType=0" + Attribute "FoomaticRipOptionSetting" "MediaType=Transparency" ",Quality:MediaType=3" + Attribute "FoomaticRipOptionSetting" "MediaType=Photo" ",Quality:MediaType=3" + Attribute "FoomaticRIPOption" "InputSlot" "enum CmdLine D" + Attribute "FoomaticRIPOptionSetting" "InputSlot=Default" ",PS:MediaPosition=7" + Attribute "FoomaticRIPOptionSetting" "InputSlot=Manual" ",PS:MediaPosition=2" + Attribute "FoomaticRIPOption" "PageSize" "enum CmdLine A" + Attribute "FoomaticRIPOptionSetting" "PageSize=Letter" " -dDEVICEWIDTHPOINTS=612 -&& +dDEVICEHEIGHTPOINTS=792" + Attribute "FoomaticRIPOptionSetting" "PageSize=A4" " -dDEVICEWIDTHPOINTS=595 -dDEV&& +ICEHEIGHTPOINTS=842" + Attribute "FoomaticRIPOptionSetting" "PageSize=Photo" " -dDEVICEWIDTHPOINTS=288 -d&& +DEVICEHEIGHTPOINTS=432" + Attribute "FoomaticRIPOptionSetting" "PageSize=Photo5x7" " -dDEVICEWIDTHPOINTS=360&& + -dDEVICEHEIGHTPOINTS=504" + Attribute "FoomaticRIPOptionSetting" "PageSize=3x5" " -dDEVICEWIDTHPOINTS=216 -dDE&& +VICEHEIGHTPOINTS=360" + Attribute "FoomaticRIPOptionSetting" "PageSize=5x8" " -dDEVICEWIDTHPOINTS=360 -dDE&& +VICEHEIGHTPOINTS=576" + Attribute "FoomaticRIPOptionSetting" "PageSize=A5" " -dDEVICEWIDTHPOINTS=420 -dDEV&& +ICEHEIGHTPOINTS=595" + Attribute "FoomaticRIPOptionSetting" "PageSize=A6" " -dDEVICEWIDTHPOINTS=297 -dDEV&& +ICEHEIGHTPOINTS=420" + Attribute "FoomaticRIPOptionSetting" "PageSize=B5JIS" " -dDEVICEWIDTHPOINTS=516 -d&& +DEVICEHEIGHTPOINTS=729" + Attribute "FoomaticRIPOptionSetting" "PageSize=Env10" " -dDEVICEWIDTHPOINTS=297 -d&& +DEVICEHEIGHTPOINTS=684" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvC5" " -dDEVICEWIDTHPOINTS=459 -d&& +DEVICEHEIGHTPOINTS=649" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvC6" " -dDEVICEWIDTHPOINTS=323 -d&& +DEVICEHEIGHTPOINTS=459" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvDL" " -dDEVICEWIDTHPOINTS=312 -d&& +DEVICEHEIGHTPOINTS=624" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvISOB5" " -dDEVICEWIDTHPOINTS=499&& + -dDEVICEHEIGHTPOINTS=709" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvMonarch" " -dDEVICEWIDTHPOINTS=2&& +79 -dDEVICEHEIGHTPOINTS=540" + Attribute "FoomaticRIPOptionSetting" "PageSize=Executive" " -dDEVICEWIDTHPOINTS=52&& +2 -dDEVICEHEIGHTPOINTS=756" + Attribute "FoomaticRIPOptionSetting" "PageSize=FLSA" " -dDEVICEWIDTHPOINTS=612 -dD&& +EVICEHEIGHTPOINTS=936" + Attribute "FoomaticRIPOptionSetting" "PageSize=Hagaki" " -dDEVICEWIDTHPOINTS=283 -&& +dDEVICEHEIGHTPOINTS=420" + Attribute "FoomaticRIPOptionSetting" "PageSize=Legal" " -dDEVICEWIDTHPOINTS=612 -d&& +DEVICEHEIGHTPOINTS=1008" + Attribute "FoomaticRIPOptionSetting" "PageSize=Oufuku" " -dDEVICEWIDTHPOINTS=567 -&& +dDEVICEHEIGHTPOINTS=420" + Attribute "FoomaticRIPOptionSetting" "PageSize=w558h774" " -dDEVICEWIDTHPOINTS=558&& + -dDEVICEHEIGHTPOINTS=774" + Attribute "FoomaticRIPOptionSetting" "PageSize=w612h935" " -dDEVICEWIDTHPOINTS=612&& + -dDEVICEHEIGHTPOINTS=935" + Attribute "FoomaticRIPOption" "Quality" "enum CmdLine B" + Attribute "FoomaticRIPOptionSetting" "Quality=DraftColorCMYK" " -r600 -sIjsPar&& +ams=Quality:Quality=1,Quality:ColorMode=2,Quality:PenSet=2" + Attribute "FoomaticRIPOptionSetting" "Quality=NormalColorCMYK" " -r600 -sIjsParams=Q&& +uality:Quality=0,Quality:ColorMode=2,Quality:PenSet=2" + Attribute "FoomaticRIPOptionSetting" "Quality=DraftGrayscaleCMYK" " -r600 -sIjsPar&& +ams=Quality:Quality=1,Quality:ColorMode=0,Quality:PenSet=2" + Attribute "FoomaticRIPOptionSetting" "Quality=NormalGrayscaleCMYK" " -r600 -sIjsParams=Q&& +uality:Quality=0,Quality:ColorMode=0,Quality:PenSet=2" + Group "General/General" + Option "PrintoutMode/Printout Mode" PickOne AnySetup 10.0 + Choice "Draft/Draft Color" "%% FoomaticRIPOptionSetting: PrintoutMode=Draft" + *Choice "Normal/Normal Color" "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" + Choice "Draft.Gray/Draft Grayscale" "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" + Choice "Normal.Gray/Normal Grayscale" "%% FoomaticRIPOptionSetting: PrintoutMode=Normal.Gray" + Option "MediaType/Media Type" PickOne AnySetup 10.0 + *Choice "Plain/Plain Paper" "%% FoomaticRIPOptionSetting: MediaType=Plain" + Choice "Transparency/Transparency" "%% FoomaticRIPOptionSetting: MediaType=&& +Transparency" + Choice "Photo/Photo Paper" "%% FoomaticRIPOptionSetting: MediaType=Photo" + Option "InputSlot/Media Source" PickOne AnySetup 100.0 + *Choice "Default/Automatic" "%% FoomaticRIPOptionSetting: InputSlot=Default" + Choice "Manual/Manual Feeder" "%% FoomaticRIPOptionSetting: InputSlot=Manual" + Group "PrintoutMode/Printout Mode" + Option "Quality/Resolution, Quality, Toner Type, Media Type" PickOne AnySetup 100.0 + *Choice "FromPrintoutMode/Controlled by 'Printout Mode'" "%% FoomaticRIPOptionSetting: Quality=@PrintoutMode" + Choice "DraftColorCMYK/600 dpi, Draft, Color, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=DraftColorCMYK" + Choice "NormalColorCMYK/600 dpi, Normal, Color, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=NormalColorCMYK" + Choice "DraftGrayscaleCMYK/600 dpi, Draft, Grayscale, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=DraftGrayscaleCMYK" + Choice "NormalGrayscaleCMYK/600 dpi, Normal, Grayscale, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=NormalGrayscaleCMYK" + *CustomMedia "Letter/Letter" 612.00 792.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Letter" "%% FoomaticRIPOptionSetting: PageSize=Letter" + CustomMedia "A4/A4" 595.00 842.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=A4" "%% FoomaticRIPOptionSetting: PageSize=A4" + CustomMedia "Photo/Photo/4x6 inch index card" 288.00 432.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Photo" "%% FoomaticRIPOptionSetting: PageSize=Photo" + CustomMedia "Photo5x7/Photo/5x7 inch index card" 360.00 504.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Photo5x7" "%% FoomaticRIPOptionSetting: PageSize=Photo5x7" + CustomMedia "3x5/3x5 inch index card" 216.00 360.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=3x5" "%% FoomaticRIPOptionSetting: PageSize=3x5" + CustomMedia "5x8/5x8 inch index card" 360.00 576.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=5x8" "%% FoomaticRIPOptionSetting: PageSize=5x8" + CustomMedia "A5/A5" 420.00 595.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=A5" "%% FoomaticRIPOptionSetting: PageSize=A5" + CustomMedia "A6/A6" 297.00 420.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=A6" "%% FoomaticRIPOptionSetting: PageSize=A6" + CustomMedia "B5JIS/B5 (JIS)" 516.00 729.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=B5JIS" "%% FoomaticRIPOptionSetting: PageSize=B5JIS" + CustomMedia "Env10/Envelope #10" 297.00 684.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Env10" "%% FoomaticRIPOptionSetting: PageSize=Env10" + CustomMedia "EnvC5/Envelope C5" 459.00 649.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=EnvC5" "%% FoomaticRIPOptionSetting: PageSize=EnvC5" + CustomMedia "EnvC6/Envelope C6" 323.00 459.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=EnvC6" "%% FoomaticRIPOptionSetting: PageSize=EnvC6" + CustomMedia "EnvDL/Envelope DL" 312.00 624.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=EnvDL" "%% FoomaticRIPOptionSetting: PageSize=EnvDL" + CustomMedia "EnvISOB5/Envelope B5" 499.00 709.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=EnvISOB5" "%% FoomaticRIPOptionSetting: PageSize=EnvISOB5" + CustomMedia "EnvMonarch/Envelope Monarch" 279.00 540.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" + CustomMedia "Executive/Executive" 522.00 756.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Executive" "%% FoomaticRIPOptionSetting: PageSize=Executive" + CustomMedia "FLSA/American Foolscap" 612.00 936.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=FLSA" "%% FoomaticRIPOptionSetting: PageSize=FLSA" + CustomMedia "Hagaki/Hagaki" 283.00 420.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Hagaki" "%% FoomaticRIPOptionSetting: PageSize=Hagaki" + CustomMedia "Legal/Legal" 612.00 1008.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Legal" "%% FoomaticRIPOptionSetting: PageSize=Legal" + CustomMedia "Oufuku/Oufuku-Hagaki" 567.00 420.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Oufuku" "%% FoomaticRIPOptionSetting: PageSize=Oufuku" + CustomMedia "w558h774/16K" 558.00 774.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=w558h774" "%% FoomaticRIPOptionSetting: PageSize=w558h774" + CustomMedia "w612h935/Executive (JIS)" 612.00 935.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=w612h935" "%% FoomaticRIPOptionSetting: PageSize=w612h935" + + // <%Hbpl1:Mono%> + // <%Hbpl1:Color%> +} // end Hbpl1 (for proprietary plugin) ///////////// LJP1XXX (for proprietary plugin) { diff --git a/prnt/filters/hpps b/prnt/filters/hpps index 1a5dbe34f..fcd900faa 100644 --- a/prnt/filters/hpps +++ b/prnt/filters/hpps @@ -142,7 +142,7 @@ START_JOB = "\x1b%-12345X@PJL JOBNAME=" UEL = "@PJL ENTER LANGUAGE=POSTSCRIPT\x0a" END_JOB = "\x1b%-12345X@PJL EOJ\x0a\x1b%-12345X" -#output_fd = os.open("/var/log/hp/tmp/PSC.out", os.O_WRONLY | os.O_CREAT) +#output_fd = os.open("/tmp/PSC.out", os.O_WRONLY | os.O_CREAT) os.write(output_fd, START_JOB) os.write(output_fd, "hplip_%s_%s\x0a" % (username, job_id)) @@ -235,6 +235,18 @@ if 'HPPJLEconoMode' in key_list: os.write(output_fd, "@PJL SET RESOLUTION=600\x0a") os.write(output_fd, "@PJL SET BITSPERPIXEL=2\x0a") +if 'HPPJLPrintQuality' in key_list: + try: + if opts['HPPJLPrintQuality'] == 'FastRes1200': + os.write(output_fd, "@PJL SET RESOLUTION=600<0A>@PJL SET BITSPERPIXEL=2<0A>") + elif opts['HPPJLPrintQuality'] == '600dpi': + os.write(output_fd, "@PJL SET RESOLUTION=600<0A>@PJL SET BITSPERPIXEL=1<0A>") + elif opts['HPPJLPrintQuality'] == 'ProRes1200': + os.write(output_fd, "@PJL SET RESOLUTION=1200<0A>@PJL SET BITSPERPIXEL=1<0A>") + except: + os.write(output_fd, "@PJL SET RESOLUTION=600<0A>@PJL SET BITSPERPIXEL=2<0A>") + + if 'HPPJLOutputMode' in key_list: try: if opts['HPPJLOutputMode'] == 'GeneralOffice': diff --git a/prnt/hpcups/ErnieFilter.cpp b/prnt/hpcups/ErnieFilter.cpp index 6c722211f..6207fac9a 100644 --- a/prnt/hpcups/ErnieFilter.cpp +++ b/prnt/hpcups/ErnieFilter.cpp @@ -50,7 +50,7 @@ #include "ErnieFilter.h" -#if defined(__APPLE__) || defined(__linux) || defined(__GLIBC__) +#if defined(__APPLE__) || defined(__linux) || defined(__GLIBC__) || defined(__NetBSD__) #include <math.h> #endif diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp index 424b0d05a..2755e9226 100644 --- a/prnt/hpcups/HPCupsFilter.cpp +++ b/prnt/hpcups/HPCupsFilter.cpp @@ -486,25 +486,7 @@ int HPCupsFilter::StartPrintJob(int argc, char *argv[]) getLogLevel(); m_JA.job_id = atoi(argv[1]); - FILE *fp; - char dFileName[32]; - memset(dFileName, 0, sizeof(dFileName)); - m_JA.job_id = atoi(argv[1]); - snprintf (dFileName, sizeof(dFileName), "/var/spool/cups/d%05d-001", m_JA.job_id); - if ((fp = fopen (dFileName, "r"))) - { - char line[258]; - for (int i = 0; i < 10; i++) - { - fgets (line, 256, fp); - if (!strncmp (line, "%%Pages:", 8)) - { - sscanf (line+9, "%d", &m_JA.total_pages); - break; - } - } - fclose (fp); - } + strncpy(m_JA.user_name,argv[2],sizeof(m_JA.user_name)-1); m_ppd = ppdOpenFile(getenv("PPD")); if (m_ppd == NULL) { @@ -532,7 +514,7 @@ int HPCupsFilter::StartPrintJob(int argc, char *argv[]) } } - m_pSys = new SystemServices(m_iLogLevel, m_JA.job_id); + m_pSys = new SystemServices(m_iLogLevel, m_JA.job_id, m_JA.user_name); /* * When user cancels a print job, the spooler sends SIGTERM signal @@ -614,7 +596,8 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) char hpPreProcessedRasterFile[64]; //temp file needed to store raster data with swaped pages. - strcpy(hpPreProcessedRasterFile, "/var/log/hp/tmp/hplipSwapedPagesXXXXXX"); + + sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name); while (cupsRasterReadHeader2(cups_raster, &cups_header)) @@ -651,7 +634,7 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) memset (kRaster, 0, cups_header.cupsWidth); memset (rgbRaster, 0xFF, cups_header.cupsWidth * 3); } - } // current_page_number == 1 + } // end of if(current_page_number == 1) if (cups_header.cupsColorSpace == CUPS_CSPACE_K) { kRaster = m_pPrinterBuffer; @@ -684,7 +667,7 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) cups_header.cupsColorSpace == CUPS_CSPACE_RGB) { - snprintf (szFileName, sizeof(szFileName), "/var/log/hp/tmp/hpcupsfilterc_bmp_%d_XXXXXX", current_page_number); + snprintf (szFileName, sizeof(szFileName), "%s/hp_%s_cups_filterc_bmp_%d_XXXXXX", CUPS_TMP_DIR, m_JA.user_name, current_page_number); createTempFile(szFileName, &cfp); if (cfp) { @@ -695,7 +678,7 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW || cups_header.cupsColorSpace == CUPS_CSPACE_K) { - snprintf (szFileName, sizeof(szFileName), "/var/log/hp/tmp/hpcupsfilterk_bmp_%d_XXXXXX", current_page_number); + snprintf (szFileName, sizeof(szFileName), "%s/hp_%s_cups_filterk_bmp_%d_XXXXXX", CUPS_TMP_DIR, m_JA.user_name, current_page_number); createTempFile(szFileName, &kfp); if (kfp) { diff --git a/prnt/hpcups/LJZjStream.cpp b/prnt/hpcups/LJZjStream.cpp index 059531c9b..e20b50d38 100644 --- a/prnt/hpcups/LJZjStream.cpp +++ b/prnt/hpcups/LJZjStream.cpp @@ -42,6 +42,7 @@ #include "LJZjStream.h" #include "Utils.h" #include "hpjbig_wrapper.h" +#include "utils.h" #define ZJC_BAND_HEIGHT 100 @@ -677,8 +678,8 @@ DRIVER_ERROR LJZjStream::preProcessRasterData(cups_raster_t **ppcups_raster, cup BYTE* pPageDataBuffer = NULL; char hpEvenPagesFile[64]={0,}; char hpOddPagesFile[64]={0,}; - snprintf(hpEvenPagesFile, sizeof(hpEvenPagesFile), "%s/hplipEvenPagesXXXXXX","/var/log/hp/tmp"); - snprintf(hpOddPagesFile, sizeof(hpOddPagesFile), "%s/hplipOddPagesXXXXXX", "/var/log/hp/tmp"); + snprintf(hpEvenPagesFile, sizeof(hpEvenPagesFile), "%s/hp_%s_cups_EvenPagesXXXXXX",CUPS_TMP_DIR, m_pJA->user_name); + snprintf(hpOddPagesFile, sizeof(hpOddPagesFile), "%s/hp_%s_cups_OddPagesXXXXXX", CUPS_TMP_DIR, m_pJA->user_name); if (1 != m_pJA->pre_process_raster || !firstpage_cups_header->Duplex){ return NO_ERROR; diff --git a/prnt/hpcups/SystemServices.cpp b/prnt/hpcups/SystemServices.cpp index 732232be6..6accd50ee 100644 --- a/prnt/hpcups/SystemServices.cpp +++ b/prnt/hpcups/SystemServices.cpp @@ -32,13 +32,13 @@ #include "SystemServices.h" #include "utils.h" -SystemServices::SystemServices(int iLogLevel, int job_id) : m_iLogLevel(iLogLevel) +SystemServices::SystemServices(int iLogLevel, int job_id, char* user_name) : m_iLogLevel(iLogLevel) { m_fp = NULL; if (iLogLevel & SAVE_PCL_FILE) { char fname[64]; - sprintf(fname, "%s/hpcups_out_job%d_XXXXXX", "/var/log/hp/tmp",job_id); + sprintf(fname, "%s/hp_%s_cups_out_job%d_XXXXXX",CUPS_TMP_DIR, user_name, job_id); createTempFile(fname, &m_fp); if (m_fp) diff --git a/prnt/hpcups/SystemServices.h b/prnt/hpcups/SystemServices.h index 3abc19f08..f19bc03aa 100644 --- a/prnt/hpcups/SystemServices.h +++ b/prnt/hpcups/SystemServices.h @@ -34,7 +34,7 @@ class SystemServices { public: - SystemServices(int iLogLevel, int job_id); + SystemServices(int iLogLevel, int job_id, char* user_name); ~SystemServices(); DRIVER_ERROR Send(const BYTE *pData, int iLength); private: diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp index eab528cdd..8d0ec74af 100644 --- a/prnt/hpijs/hpcupsfax.cpp +++ b/prnt/hpijs/hpcupsfax.cpp @@ -77,6 +77,7 @@ char hpFileName[64] ; // GrayLevel = (5/16)R + (9/16)G + (2/16)B #define RGB2BW(r, g, b) (BYTE) (((r << 2) + r + (g << 3) + g + (b << 1)) >> 4) + void RGB2Gray (BYTE *pRGBData, int iNumPixels, BYTE *pGData) { int i; @@ -421,7 +422,7 @@ BUGOUT: * Reading from stdin into a temp file * Getting the final file with HPLIP file and page headers */ -int ProcessTiffData(int fromFD, int toFD) +int ProcessTiffData(int fromFD, int toFD, char* user_name) { BYTE *p; int fdTiff; @@ -443,7 +444,7 @@ int ProcessTiffData(int fromFD, int toFD) char hpTiffFileName[64]; long input_file_size = 0; FILE* pFilePtrFax; - snprintf(hpTiffFileName,sizeof(hpTiffFileName), "%s/hpliptiffXXXXXX","/var/log/hp/tmp"); + snprintf(hpTiffFileName,sizeof(hpTiffFileName), "%s/hp_%s_fax_tiffXXXXXX",CUPS_TMP_DIR,user_name); // fdTiff = mkstemp (hpTiffFileName); @@ -676,7 +677,7 @@ int main (int argc, char **argv) i++; } - snprintf(hpFileName,sizeof(hpFileName),"%s/hplipfaxLog_XXXXXX","/var/log/hp/tmp"); + snprintf(hpFileName,sizeof(hpFileName),"%s/hp_%s_fax_Log_XXXXXX",CUPS_TMP_DIR, argv[2]); // fdFax = mkstemp (hpFileName); fdFax = createTempFile(hpFileName, &pFilePtrFax); @@ -753,7 +754,7 @@ int main (int argc, char **argv) if (fax_encoding == RASTER_TIFF) { - status = ProcessTiffData(fd, fdFax); + status = ProcessTiffData(fd, fdFax, argv[2]); } else { cups_raster = cupsRasterOpen (fd, CUPS_RASTER_READ); if (cups_raster == NULL) diff --git a/prnt/hpijs/hpijs.cpp b/prnt/hpijs/hpijs.cpp index 564178705..5162bc2af 100644 --- a/prnt/hpijs/hpijs.cpp +++ b/prnt/hpijs/hpijs.cpp @@ -72,7 +72,7 @@ int bug(const char *fmt, ...) } #endif -void setLogLevel(UXServices *pSS) +void setLogLevel(UXServices *pSS, char*user_name) { FILE *fp; char str[258]; @@ -98,7 +98,7 @@ void setLogLevel(UXServices *pSS) if (pSS->m_iLogLevel & SAVE_PCL_FILE) { char szFileName[64]; - snprintf (szFileName,sizeof(szFileName), "/var/log/hp/tmp/hpijs_%d_XXXXXX", getpid()); + snprintf (szFileName,sizeof(szFileName), "%s/hp_%s_ijs_%d_XXXXXX", CUPS_TMP_DIR, user_name, getpid()); createTempFile(szFileName, &pSS->outfp); // pSS->outfp = fopen (szFileName, "w"); @@ -588,7 +588,8 @@ int main (int argc, char *argv[], char *evenp[]) char *raster = NULL, *k_raster = NULL; int status = EXIT_FAILURE; int ret, n, i, kn=0, width, k_width; - + char user_name[32]={0,}; + openlog("hpijs", LOG_PID, LOG_DAEMON); if (argc > 1) @@ -602,6 +603,9 @@ int main (int argc, char *argv[], char *evenp[]) } } + if (argc > 2) + strncpy(user_name, argv[2], sizeof(user_name)); + #ifdef HAVE_LIBHPIP char *pDev; if ((pDev = getenv ("DEVICE_URI")) && @@ -625,11 +629,11 @@ int main (int argc, char *argv[], char *evenp[]) goto BUGOUT; } - setLogLevel(pSS); + setLogLevel(pSS, user_name); #ifdef CAPTURE char szCapOutFile[64]; - snprintf(szCapOutFile, sizeof(szCapOutFile),"%s/capout_XXXXXX","/var/log/hp/tmp"); + snprintf(szCapOutFile, sizeof(szCapOutFile),"%s/hp_%s_ijs_capout_XXXXXX",CUPS_TMP_DIR, user_name); if ((pSS->InitScript(szCapOutFile, TRUE)) != NO_ERROR) BUG("unable to init capture"); #endif diff --git a/prnt/hpijs/hpijsfax.cpp b/prnt/hpijs/hpijsfax.cpp index c83c8e7d0..aa0663797 100644 --- a/prnt/hpijs/hpijsfax.cpp +++ b/prnt/hpijs/hpijsfax.cpp @@ -55,6 +55,7 @@ #include "hpijsfax.h" #include "utils.h" + int hpijsfax_status_cb (void *status_cb_data, IjsServerCtx *ctx, IjsJobId job_id) { return 0; @@ -278,8 +279,12 @@ int hpijsFaxServer (int argc, char **argv) BYTE szPageHeader[64]; BYTE *p; unsigned int uiPageNum = 0; + char user_name[32]={0,}; + + if (argc > 2) + strncpy(user_name, argv[2], sizeof(user_name)); - snprintf(hpFileName,sizeof(hpFileName),"%s/hplipfaxXXXXXX","/var/log/hp/tmp"); + snprintf(hpFileName,sizeof(hpFileName),"%s/hp_%s_ijsfax_Log_XXXXXX",CUPS_TMP_DIR, user_name); pFaxStruct = new HPIJSFax (); diff --git a/prnt/ps/hp-business_inkjet_2250-ps.ppd.gz b/prnt/ps/hp-business_inkjet_2250-ps.ppd.gz Binary files differindex a67cddb52..0480343a8 100644 --- a/prnt/ps/hp-business_inkjet_2250-ps.ppd.gz +++ b/prnt/ps/hp-business_inkjet_2250-ps.ppd.gz diff --git a/prnt/ps/hp-business_inkjet_2280-ps.ppd.gz b/prnt/ps/hp-business_inkjet_2280-ps.ppd.gz Binary files differindex 343048500..7fe9937fe 100644 --- a/prnt/ps/hp-business_inkjet_2280-ps.ppd.gz +++ b/prnt/ps/hp-business_inkjet_2280-ps.ppd.gz diff --git a/prnt/ps/hp-business_inkjet_2300-ps.ppd.gz b/prnt/ps/hp-business_inkjet_2300-ps.ppd.gz Binary files differindex 8395f0bad..d66577135 100644 --- a/prnt/ps/hp-business_inkjet_2300-ps.ppd.gz +++ b/prnt/ps/hp-business_inkjet_2300-ps.ppd.gz diff --git a/prnt/ps/hp-business_inkjet_2600-ps.ppd.gz b/prnt/ps/hp-business_inkjet_2600-ps.ppd.gz Binary files differindex 78b060483..dc03f253e 100644 --- a/prnt/ps/hp-business_inkjet_2600-ps.ppd.gz +++ b/prnt/ps/hp-business_inkjet_2600-ps.ppd.gz diff --git a/prnt/ps/hp-business_inkjet_2800-ps.ppd.gz b/prnt/ps/hp-business_inkjet_2800-ps.ppd.gz Binary files differindex bfc38e758..8ac51cc10 100644 --- a/prnt/ps/hp-business_inkjet_2800-ps.ppd.gz +++ b/prnt/ps/hp-business_inkjet_2800-ps.ppd.gz diff --git a/prnt/ps/hp-business_inkjet_3000-ps.ppd.gz b/prnt/ps/hp-business_inkjet_3000-ps.ppd.gz Binary files differindex 700598375..e0bc43931 100644 --- a/prnt/ps/hp-business_inkjet_3000-ps.ppd.gz +++ b/prnt/ps/hp-business_inkjet_3000-ps.ppd.gz diff --git a/prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz b/prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz Binary files differindex 50f933c2a..3a27403d3 100644 --- a/prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz +++ b/prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz diff --git a/prnt/ps/hp-cm8060_mfp_with_edgeline-ps.ppd.gz b/prnt/ps/hp-cm8060_mfp_with_edgeline-ps.ppd.gz Binary files differindex 80d8230e5..56df90898 100644 --- a/prnt/ps/hp-cm8060_mfp_with_edgeline-ps.ppd.gz +++ b/prnt/ps/hp-cm8060_mfp_with_edgeline-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet-ps.ppd.gz b/prnt/ps/hp-color_laserjet-ps.ppd.gz Binary files differindex b101eb09e..7e79c6a0c 100644 --- a/prnt/ps/hp-color_laserjet-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2500-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2500-ps.ppd.gz Binary files differindex b7a4ebcf5..a80564643 100644 --- a/prnt/ps/hp-color_laserjet_2500-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2500-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.gz Binary files differindex 2037afc1a..9eec7aafe 100644 --- a/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.gz Binary files differindex d21237d92..2800661e2 100644 --- a/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2605-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2605-ps.ppd.gz Binary files differindex ac1950891..ba5d5ebe8 100644 --- a/prnt/ps/hp-color_laserjet_2605-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2605-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.gz Binary files differindex 264e3e718..0814be37c 100644 --- a/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2605dtn-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2605dtn-ps.ppd.gz Binary files differindex e29b0521e..a13534750 100644 --- a/prnt/ps/hp-color_laserjet_2605dtn-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2605dtn-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2700-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2700-ps.ppd.gz Binary files differindex 74a94b406..2ffae3c40 100644 --- a/prnt/ps/hp-color_laserjet_2700-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2700-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2700n-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2700n-ps.ppd.gz Binary files differindex d37fcb0f7..8f514479d 100644 --- a/prnt/ps/hp-color_laserjet_2700n-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2700n-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2800-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2800-ps.ppd.gz Binary files differindex 9bae1bdf6..0633704ba 100644 --- a/prnt/ps/hp-color_laserjet_2800-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2800-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2820-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2820-ps.ppd.gz Binary files differindex edfbe9791..9f25309d7 100644 --- a/prnt/ps/hp-color_laserjet_2820-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2820-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2830-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2830-ps.ppd.gz Binary files differindex e02812d23..b55d1772d 100644 --- a/prnt/ps/hp-color_laserjet_2830-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2830-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2840-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2840-ps.ppd.gz Binary files differindex fa1584a52..42d8c5e73 100644 --- a/prnt/ps/hp-color_laserjet_2840-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2840-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_3000-ps.ppd.gz b/prnt/ps/hp-color_laserjet_3000-ps.ppd.gz Binary files differindex 9c0c5694d..2cbf45d2b 100644 --- a/prnt/ps/hp-color_laserjet_3000-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_3000-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_3700-ps.ppd.gz b/prnt/ps/hp-color_laserjet_3700-ps.ppd.gz Binary files differindex 241320a93..2fb809616 100644 --- a/prnt/ps/hp-color_laserjet_3700-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_3700-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_3700n-ps.ppd.gz b/prnt/ps/hp-color_laserjet_3700n-ps.ppd.gz Binary files differindex 59edecb12..57211a867 100644 --- a/prnt/ps/hp-color_laserjet_3700n-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_3700n-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_3800-ps.ppd.gz b/prnt/ps/hp-color_laserjet_3800-ps.ppd.gz Binary files differindex 8023dad87..0ddb15ca2 100644 --- a/prnt/ps/hp-color_laserjet_3800-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_3800-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_4500-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4500-ps.ppd.gz Binary files differindex 056587760..cf17ec479 100644 --- a/prnt/ps/hp-color_laserjet_4500-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_4500-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_4550-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4550-ps.ppd.gz Binary files differindex e43f33d9e..e3d3ecf80 100644 --- a/prnt/ps/hp-color_laserjet_4550-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_4550-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_4600-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4600-ps.ppd.gz Binary files differindex 3f6397c74..bef98490e 100644 --- a/prnt/ps/hp-color_laserjet_4600-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_4600-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.gz Binary files differindex e1c838346..10dd94863 100644 --- a/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_4610-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4610-ps.ppd.gz Binary files differindex 9259d48b7..fe6d67852 100644 --- a/prnt/ps/hp-color_laserjet_4610-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_4610-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_4650-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4650-ps.ppd.gz Binary files differindex c3f4778b6..3e4b4ca84 100644 --- a/prnt/ps/hp-color_laserjet_4650-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_4650-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_4700-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4700-ps.ppd.gz Binary files differindex 028282911..cb220f3da 100644 --- a/prnt/ps/hp-color_laserjet_4700-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_4700-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_4730mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4730mfp-ps.ppd.gz Binary files differindex 14479c551..e644d8a58 100644 --- a/prnt/ps/hp-color_laserjet_4730mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_4730mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_5500-ps.ppd.gz b/prnt/ps/hp-color_laserjet_5500-ps.ppd.gz Binary files differindex 02bf941b6..047647c7e 100644 --- a/prnt/ps/hp-color_laserjet_5500-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_5500-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_5550-ps.ppd.gz b/prnt/ps/hp-color_laserjet_5550-ps.ppd.gz Binary files differindex 8ab912d86..77e9544c3 100644 --- a/prnt/ps/hp-color_laserjet_5550-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_5550-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_5m-ps.ppd.gz b/prnt/ps/hp-color_laserjet_5m-ps.ppd.gz Binary files differindex 52f95bc2b..248dc4faf 100644 --- a/prnt/ps/hp-color_laserjet_5m-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_5m-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_8500-ps.ppd.gz b/prnt/ps/hp-color_laserjet_8500-ps.ppd.gz Binary files differindex f44eaba69..7fdb3830b 100644 --- a/prnt/ps/hp-color_laserjet_8500-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_8500-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_8550-ps.ppd.gz b/prnt/ps/hp-color_laserjet_8550-ps.ppd.gz Binary files differindex db5b9aa3b..275080812 100644 --- a/prnt/ps/hp-color_laserjet_8550-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_8550-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_9500-ps.ppd.gz b/prnt/ps/hp-color_laserjet_9500-ps.ppd.gz Binary files differindex d2b449bd2..19684a2b0 100644 --- a/prnt/ps/hp-color_laserjet_9500-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_9500-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_9500_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_9500_mfp-ps.ppd.gz Binary files differindex 64dca71c7..0773d61d8 100644 --- a/prnt/ps/hp-color_laserjet_9500_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_9500_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz Binary files differindex 7029abaff..1bf0d851f 100644 --- a/prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz Binary files differindex a74a8d7a3..572d277bd 100644 --- a/prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm1312_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm1312_mfp-ps.ppd.gz Binary files differindex 4c1cf35cd..2bcb727e1 100644 --- a/prnt/ps/hp-color_laserjet_cm1312_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm1312_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz Binary files differindex e4ae78d5d..7e52a30c4 100644 --- a/prnt/ps/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm2320_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm2320_mfp-ps.ppd.gz Binary files differindex 5f7f4180f..f75a6b99e 100644 --- a/prnt/ps/hp-color_laserjet_cm2320_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm2320_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz Binary files differindex 933eb8b55..71501fb9d 100644 --- a/prnt/ps/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz Binary files differindex 7bf95b939..a9201c615 100644 --- a/prnt/ps/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz Binary files differindex 5430e38ba..6e17ac577 100644 --- a/prnt/ps/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.gz Binary files differindex 492d9be7c..c51fafeb1 100644 --- a/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz Binary files differindex 176996191..1e39c13e7 100644 --- a/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz Binary files differindex dd26efa52..09d9974e1 100644 --- a/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm6030_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm6030_mfp-ps.ppd.gz Binary files differindex 16ba8a373..d3e6ec26b 100644 --- a/prnt/ps/hp-color_laserjet_cm6030_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm6030_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm6040_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm6040_mfp-ps.ppd.gz Binary files differindex 65d6ed2e0..820323263 100644 --- a/prnt/ps/hp-color_laserjet_cm6040_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm6040_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm6049_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm6049_mfp-ps.ppd.gz Binary files differindex 5a2b38fef..a7606aa61 100644 --- a/prnt/ps/hp-color_laserjet_cm6049_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm6049_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp1514n-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp1514n-ps.ppd.gz Binary files differindex f3e8bf522..25877687d 100644 --- a/prnt/ps/hp-color_laserjet_cp1514n-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp1514n-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp1515n-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp1515n-ps.ppd.gz Binary files differindex 158d8c6ab..df8d77c60 100644 --- a/prnt/ps/hp-color_laserjet_cp1515n-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp1515n-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp1518ni-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp1518ni-ps.ppd.gz Binary files differindex ad0b0ebee..990130d8d 100644 --- a/prnt/ps/hp-color_laserjet_cp1518ni-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp1518ni-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp2025-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp2025-ps.ppd.gz Binary files differindex 7ec65ec3d..1018a1664 100644 --- a/prnt/ps/hp-color_laserjet_cp2025-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp2025-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp2025dn-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp2025dn-ps.ppd.gz Binary files differindex c347b6e77..e792f2379 100644 --- a/prnt/ps/hp-color_laserjet_cp2025dn-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp2025dn-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp2025n-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp2025n-ps.ppd.gz Binary files differindex a2c009285..15ae5b9d6 100644 --- a/prnt/ps/hp-color_laserjet_cp2025n-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp2025n-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp2025x-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp2025x-ps.ppd.gz Binary files differindex 98e910aab..47cc02bd8 100644 --- a/prnt/ps/hp-color_laserjet_cp2025x-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp2025x-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp3505-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp3505-ps.ppd.gz Binary files differindex e3e658293..f78560129 100644 --- a/prnt/ps/hp-color_laserjet_cp3505-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp3505-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.gz Binary files differindex 766c339e9..818515e24 100644 --- a/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.gz Binary files differindex d221fac3e..7b9376ac8 100644 --- a/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp4020_series-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp4020_series-ps.ppd.gz Binary files differindex 403703d8c..4e72fa8ca 100644 --- a/prnt/ps/hp-color_laserjet_cp4020_series-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp4020_series-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp4520_series-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp4520_series-ps.ppd.gz Binary files differindex 16a250505..07cb5f123 100644 --- a/prnt/ps/hp-color_laserjet_cp4520_series-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp4520_series-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp5225-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp5225-ps.ppd.gz Binary files differindex fb6913c6d..cf6d16aba 100644 --- a/prnt/ps/hp-color_laserjet_cp5225-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp5225-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp5225dn-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp5225dn-ps.ppd.gz Binary files differindex c55d17eac..046a17798 100644 --- a/prnt/ps/hp-color_laserjet_cp5225dn-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp5225dn-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp5225n-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp5225n-ps.ppd.gz Binary files differindex 85c92d1cc..ee8085c85 100644 --- a/prnt/ps/hp-color_laserjet_cp5225n-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp5225n-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz Binary files differindex 3d71423ad..08e7c77ad 100644 --- a/prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp6015-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp6015-ps.ppd.gz Binary files differindex 3a11d6b4f..ddcbd216e 100644 --- a/prnt/ps/hp-color_laserjet_cp6015-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp6015-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz b/prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..94574bd8d --- /dev/null +++ b/prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m750-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m750-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..1b3502a34 --- /dev/null +++ b/prnt/ps/hp-color_laserjet_m750-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..1d761e5f8 --- /dev/null +++ b/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_4000ps.ppd.gz b/prnt/ps/hp-designjet_4000ps.ppd.gz Binary files differindex 06913d996..dabdf0741 100644 --- a/prnt/ps/hp-designjet_4000ps.ppd.gz +++ b/prnt/ps/hp-designjet_4000ps.ppd.gz diff --git a/prnt/ps/hp-designjet_4020ps-ps.ppd.gz b/prnt/ps/hp-designjet_4020ps-ps.ppd.gz Binary files differindex 02210b319..e76df7817 100644 --- a/prnt/ps/hp-designjet_4020ps-ps.ppd.gz +++ b/prnt/ps/hp-designjet_4020ps-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_4500mfp.ppd.gz b/prnt/ps/hp-designjet_4500mfp.ppd.gz Binary files differindex f58dee07f..4ff15e1bd 100644 --- a/prnt/ps/hp-designjet_4500mfp.ppd.gz +++ b/prnt/ps/hp-designjet_4500mfp.ppd.gz diff --git a/prnt/ps/hp-designjet_4500ps.ppd.gz b/prnt/ps/hp-designjet_4500ps.ppd.gz Binary files differindex 232e4f7a5..1c707889b 100644 --- a/prnt/ps/hp-designjet_4500ps.ppd.gz +++ b/prnt/ps/hp-designjet_4500ps.ppd.gz diff --git a/prnt/ps/hp-designjet_4520mfp-ps.ppd.gz b/prnt/ps/hp-designjet_4520mfp-ps.ppd.gz Binary files differindex edd2c0a2f..a7b773c05 100644 --- a/prnt/ps/hp-designjet_4520mfp-ps.ppd.gz +++ b/prnt/ps/hp-designjet_4520mfp-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_4520ps-ps.ppd.gz b/prnt/ps/hp-designjet_4520ps-ps.ppd.gz Binary files differindex e1feeb75a..df75e5f31 100644 --- a/prnt/ps/hp-designjet_4520ps-ps.ppd.gz +++ b/prnt/ps/hp-designjet_4520ps-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1100ps_24in-ps.ppd.gz b/prnt/ps/hp-designjet_t1100ps_24in-ps.ppd.gz Binary files differindex b586b4264..927e7961f 100644 --- a/prnt/ps/hp-designjet_t1100ps_24in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1100ps_24in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz b/prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz Binary files differindex 269fe58b3..294bcf2b1 100644 --- a/prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz b/prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz Binary files differindex afb52ba5d..71732754a 100644 --- a/prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz b/prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz Binary files differindex ecaf2219d..6ac954887 100644 --- a/prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz Binary files differindex 9520043af..c8af4027e 100644 --- a/prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1300_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t1300_postscript-ps.ppd.gz Binary files differindex 1a8cc1d70..125e4cb5e 100644 --- a/prnt/ps/hp-designjet_t1300_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1300_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1500-postscript.ppd.gz b/prnt/ps/hp-designjet_t1500-postscript.ppd.gz Binary files differindex d85c0a1d4..c78fbbacf 100644 --- a/prnt/ps/hp-designjet_t1500-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_t1500-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_t2300_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t2300_postscript-ps.ppd.gz Binary files differindex deaa3a237..7150b7865 100644 --- a/prnt/ps/hp-designjet_t2300_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t2300_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t2500-postscript.ppd.gz b/prnt/ps/hp-designjet_t2500-postscript.ppd.gz Binary files differnew file mode 100644 index 000000000..c21da689f --- /dev/null +++ b/prnt/ps/hp-designjet_t2500-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_t7100ps-ps.ppd.gz b/prnt/ps/hp-designjet_t7100ps-ps.ppd.gz Binary files differindex 96cbecfad..bda8ac9db 100644 --- a/prnt/ps/hp-designjet_t7100ps-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t7100ps-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t7100ps_monochrome-ps.ppd.gz b/prnt/ps/hp-designjet_t7100ps_monochrome-ps.ppd.gz Binary files differindex b59933c38..4a8868139 100644 --- a/prnt/ps/hp-designjet_t7100ps_monochrome-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t7100ps_monochrome-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t770_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t770_postscript-ps.ppd.gz Binary files differindex 22a165c2c..351d9b45c 100644 --- a/prnt/ps/hp-designjet_t770_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t770_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.gz b/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.gz Binary files differindex 4aece05c7..516606441 100644 --- a/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t790ps_24in-ps.ppd.gz b/prnt/ps/hp-designjet_t790ps_24in-ps.ppd.gz Binary files differindex e2291c701..51e39847f 100644 --- a/prnt/ps/hp-designjet_t790ps_24in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t790ps_24in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t790ps_44in-ps.ppd.gz b/prnt/ps/hp-designjet_t790ps_44in-ps.ppd.gz Binary files differindex dde7b3843..3bdce9901 100644 --- a/prnt/ps/hp-designjet_t790ps_44in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t790ps_44in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t920-postscript.ppd.gz b/prnt/ps/hp-designjet_t920-postscript.ppd.gz Binary files differindex 5dea0b97e..2d19eaf4a 100644 --- a/prnt/ps/hp-designjet_t920-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_t920-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz Binary files differindex d9bac876b..8d9d64d36 100644 --- a/prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z5400-postscript.ppd.gz b/prnt/ps/hp-designjet_z5400-postscript.ppd.gz Binary files differindex a723909bb..08284030a 100644 --- a/prnt/ps/hp-designjet_z5400-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_z5400-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz b/prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz Binary files differindex eecbc1153..9504dcdb8 100644 --- a/prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz b/prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz Binary files differindex 3e3bf577c..45be19681 100644 --- a/prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z6200_42in_photo-ps.ppd.gz b/prnt/ps/hp-designjet_z6200_42in_photo-ps.ppd.gz Binary files differindex 3007c98b5..739927b5f 100644 --- a/prnt/ps/hp-designjet_z6200_42in_photo-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z6200_42in_photo-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z6200_60in_photo-ps.ppd.gz b/prnt/ps/hp-designjet_z6200_60in_photo-ps.ppd.gz Binary files differindex 228dec92e..d838b7d24 100644 --- a/prnt/ps/hp-designjet_z6200_60in_photo-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z6200_60in_photo-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz b/prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz Binary files differindex f32ad897a..f3c2b55b6 100644 --- a/prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1200-ps.ppd.gz b/prnt/ps/hp-laserjet_1200-ps.ppd.gz Binary files differindex 5d343a3a3..d406eca0d 100644 --- a/prnt/ps/hp-laserjet_1200-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1200-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1200n-ps.ppd.gz b/prnt/ps/hp-laserjet_1200n-ps.ppd.gz Binary files differindex 7e5ace8ce..b903f3c4c 100644 --- a/prnt/ps/hp-laserjet_1200n-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1200n-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1220-ps.ppd.gz b/prnt/ps/hp-laserjet_1220-ps.ppd.gz Binary files differindex 1ebf7d6a5..fb812d020 100644 --- a/prnt/ps/hp-laserjet_1220-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1220-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1220se-ps.ppd.gz b/prnt/ps/hp-laserjet_1220se-ps.ppd.gz Binary files differindex 40a7863d7..9d8569d92 100644 --- a/prnt/ps/hp-laserjet_1220se-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1220se-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1300-ps.ppd.gz b/prnt/ps/hp-laserjet_1300-ps.ppd.gz Binary files differindex 6869b73b7..177793e67 100644 --- a/prnt/ps/hp-laserjet_1300-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1300-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1300n-ps.ppd.gz b/prnt/ps/hp-laserjet_1300n-ps.ppd.gz Binary files differindex 1bb9ec695..a554ba42f 100644 --- a/prnt/ps/hp-laserjet_1300n-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1300n-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1300xi-ps.ppd.gz b/prnt/ps/hp-laserjet_1300xi-ps.ppd.gz Binary files differindex 7cc6b445d..fb572cd24 100644 --- a/prnt/ps/hp-laserjet_1300xi-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1300xi-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1320-ps.ppd.gz b/prnt/ps/hp-laserjet_1320-ps.ppd.gz Binary files differindex 4772a7ab0..5fcdbea08 100644 --- a/prnt/ps/hp-laserjet_1320-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1320-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1320_series-ps.ppd.gz b/prnt/ps/hp-laserjet_1320_series-ps.ppd.gz Binary files differindex 5d327d11e..7b22e6915 100644 --- a/prnt/ps/hp-laserjet_1320_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1320_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1320n-ps.ppd.gz b/prnt/ps/hp-laserjet_1320n-ps.ppd.gz Binary files differindex f77e3dc30..305b35ad9 100644 --- a/prnt/ps/hp-laserjet_1320n-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1320n-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1320nw-ps.ppd.gz b/prnt/ps/hp-laserjet_1320nw-ps.ppd.gz Binary files differindex 7dfdc323c..8a6d97333 100644 --- a/prnt/ps/hp-laserjet_1320nw-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1320nw-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1320tn-ps.ppd.gz b/prnt/ps/hp-laserjet_1320tn-ps.ppd.gz Binary files differindex 6868e41e8..7996f5407 100644 --- a/prnt/ps/hp-laserjet_1320tn-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1320tn-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_200_color_m251-ps.ppd.gz b/prnt/ps/hp-laserjet_200_color_m251-ps.ppd.gz Binary files differindex a69d628bd..ec165d7fa 100644 --- a/prnt/ps/hp-laserjet_200_color_m251-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_200_color_m251-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz b/prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz Binary files differindex 3e9a988c8..064b30123 100644 --- a/prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz b/prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz Binary files differindex 141ba0b51..9cc2af9a9 100644 --- a/prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_2100-ps.ppd.gz b/prnt/ps/hp-laserjet_2100-ps.ppd.gz Binary files differindex 7b3992413..bc1b6262c 100644 --- a/prnt/ps/hp-laserjet_2100-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_2100-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_2100_series-ps.ppd.gz b/prnt/ps/hp-laserjet_2100_series-ps.ppd.gz Binary files differindex 7ff997b20..bf91945c6 100644 --- a/prnt/ps/hp-laserjet_2100_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_2100_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_2200-ps.ppd.gz b/prnt/ps/hp-laserjet_2200-ps.ppd.gz Binary files differindex 388de64ae..1122205c0 100644 --- a/prnt/ps/hp-laserjet_2200-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_2200-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_2200_series-ps.ppd.gz b/prnt/ps/hp-laserjet_2200_series-ps.ppd.gz Binary files differindex 68c79c7b2..663f19cfc 100644 --- a/prnt/ps/hp-laserjet_2200_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_2200_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_2300-ps.ppd.gz b/prnt/ps/hp-laserjet_2300-ps.ppd.gz Binary files differindex b05b10e04..5da7cd793 100644 --- a/prnt/ps/hp-laserjet_2300-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_2300-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_2300_series-ps.ppd.gz b/prnt/ps/hp-laserjet_2300_series-ps.ppd.gz Binary files differindex f07f6f542..c6fe4c787 100644 --- a/prnt/ps/hp-laserjet_2300_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_2300_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_2410-ps.ppd.gz b/prnt/ps/hp-laserjet_2410-ps.ppd.gz Binary files differindex a0af8cc21..dab0bc954 100644 --- a/prnt/ps/hp-laserjet_2410-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_2410-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_2420-ps.ppd.gz b/prnt/ps/hp-laserjet_2420-ps.ppd.gz Binary files differindex fd1672701..6f6ce280a 100644 --- a/prnt/ps/hp-laserjet_2420-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_2420-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_2430-ps.ppd.gz b/prnt/ps/hp-laserjet_2430-ps.ppd.gz Binary files differindex 0c378ecef..a6df323a0 100644 --- a/prnt/ps/hp-laserjet_2430-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_2430-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_3015-ps.ppd.gz b/prnt/ps/hp-laserjet_3015-ps.ppd.gz Binary files differindex efe152441..04372d359 100644 --- a/prnt/ps/hp-laserjet_3015-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_3015-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_3020-ps.ppd.gz b/prnt/ps/hp-laserjet_3020-ps.ppd.gz Binary files differindex 9627580f9..670c693be 100644 --- a/prnt/ps/hp-laserjet_3020-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_3020-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_3030-ps.ppd.gz b/prnt/ps/hp-laserjet_3030-ps.ppd.gz Binary files differindex 3ea39b7c2..16adb6a47 100644 --- a/prnt/ps/hp-laserjet_3030-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_3030-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_3050-ps.ppd.gz b/prnt/ps/hp-laserjet_3050-ps.ppd.gz Binary files differindex 894075abe..100c767df 100644 --- a/prnt/ps/hp-laserjet_3050-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_3050-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_3052-ps.ppd.gz b/prnt/ps/hp-laserjet_3052-ps.ppd.gz Binary files differindex bf0c51f63..d88ac6985 100644 --- a/prnt/ps/hp-laserjet_3052-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_3052-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_3200m-ps.ppd.gz b/prnt/ps/hp-laserjet_3200m-ps.ppd.gz Binary files differindex 791d3d3aa..6ebeb2b07 100644 --- a/prnt/ps/hp-laserjet_3200m-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_3200m-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_3300_3310_3320-ps.ppd.gz b/prnt/ps/hp-laserjet_3300_3310_3320-ps.ppd.gz Binary files differindex f36c77959..37a03c0cd 100644 --- a/prnt/ps/hp-laserjet_3300_3310_3320-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_3300_3310_3320-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_3380-ps.ppd.gz b/prnt/ps/hp-laserjet_3380-ps.ppd.gz Binary files differindex c9c5de0ff..0cf1d8f5b 100644 --- a/prnt/ps/hp-laserjet_3380-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_3380-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_3390-ps.ppd.gz b/prnt/ps/hp-laserjet_3390-ps.ppd.gz Binary files differindex 09dd42616..2310ca6ec 100644 --- a/prnt/ps/hp-laserjet_3390-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_3390-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4-ps.ppd.gz b/prnt/ps/hp-laserjet_4-ps.ppd.gz Binary files differindex 2613cdff2..668abcf0f 100644 --- a/prnt/ps/hp-laserjet_4-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4000_series-ps.ppd.gz b/prnt/ps/hp-laserjet_4000_series-ps.ppd.gz Binary files differindex cc4d54109..f0ba2bfce 100644 --- a/prnt/ps/hp-laserjet_4000_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4000_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_400_m401-ps.ppd.gz b/prnt/ps/hp-laserjet_400_m401-ps.ppd.gz Binary files differindex 26eded4c0..559e973ac 100644 --- a/prnt/ps/hp-laserjet_400_m401-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_400_m401-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_400_m401dne-ps.ppd.gz b/prnt/ps/hp-laserjet_400_m401dne-ps.ppd.gz Binary files differindex 522709a18..5c1938f78 100644 --- a/prnt/ps/hp-laserjet_400_m401dne-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_400_m401dne-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_400_mfp_m425-ps.ppd.gz b/prnt/ps/hp-laserjet_400_mfp_m425-ps.ppd.gz Binary files differindex e7146d868..5c3459228 100644 --- a/prnt/ps/hp-laserjet_400_mfp_m425-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_400_mfp_m425-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4050_series-ps.ppd.gz b/prnt/ps/hp-laserjet_4050_series-ps.ppd.gz Binary files differindex e6da081f7..418c74d1c 100644 --- a/prnt/ps/hp-laserjet_4050_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4050_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4100_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_4100_mfp-ps.ppd.gz Binary files differindex 981d39c74..57f76d88c 100644 --- a/prnt/ps/hp-laserjet_4100_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4100_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4100_series-ps.ppd.gz b/prnt/ps/hp-laserjet_4100_series-ps.ppd.gz Binary files differindex 1004916ac..cf62b2ed9 100644 --- a/prnt/ps/hp-laserjet_4100_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4100_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4200-ps.ppd.gz b/prnt/ps/hp-laserjet_4200-ps.ppd.gz Binary files differindex 3ae894aea..d5766b03f 100644 --- a/prnt/ps/hp-laserjet_4200-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4200-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4240-ps.ppd.gz b/prnt/ps/hp-laserjet_4240-ps.ppd.gz Binary files differindex 407a9d4e8..ed833fe86 100644 --- a/prnt/ps/hp-laserjet_4240-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4240-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4250-ps.ppd.gz b/prnt/ps/hp-laserjet_4250-ps.ppd.gz Binary files differindex a7695bf52..07e95ac28 100644 --- a/prnt/ps/hp-laserjet_4250-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4250-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4300-ps.ppd.gz b/prnt/ps/hp-laserjet_4300-ps.ppd.gz Binary files differindex a1bfb626c..318103afb 100644 --- a/prnt/ps/hp-laserjet_4300-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4300-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4345_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_4345_mfp-ps.ppd.gz Binary files differindex ed3c8de8b..c98037b1c 100644 --- a/prnt/ps/hp-laserjet_4345_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4345_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4350-ps.ppd.gz b/prnt/ps/hp-laserjet_4350-ps.ppd.gz Binary files differindex 0942bab6b..657564727 100644 --- a/prnt/ps/hp-laserjet_4350-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4350-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4_plus-ps.ppd.gz b/prnt/ps/hp-laserjet_4_plus-ps.ppd.gz Binary files differindex 8e7efd8a7..dfaddd520 100644 --- a/prnt/ps/hp-laserjet_4_plus-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4_plus-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4ml-ps.ppd.gz b/prnt/ps/hp-laserjet_4ml-ps.ppd.gz Binary files differindex df313d6c5..30834695b 100644 --- a/prnt/ps/hp-laserjet_4ml-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4ml-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4mp-ps.ppd.gz b/prnt/ps/hp-laserjet_4mp-ps.ppd.gz Binary files differindex bd2b8b1aa..56e69095a 100644 --- a/prnt/ps/hp-laserjet_4mp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4mp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4si-ps.ppd.gz b/prnt/ps/hp-laserjet_4si-ps.ppd.gz Binary files differindex 5351460c8..b715bf0a9 100644 --- a/prnt/ps/hp-laserjet_4si-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4si-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4v-ps.ppd.gz b/prnt/ps/hp-laserjet_4v-ps.ppd.gz Binary files differindex d88c599e5..7ed444828 100644 --- a/prnt/ps/hp-laserjet_4v-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4v-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5000-ps.ppd.gz b/prnt/ps/hp-laserjet_5000-ps.ppd.gz Binary files differindex dd67fef6e..2beaa9229 100644 --- a/prnt/ps/hp-laserjet_5000-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5000-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5000_series-ps.ppd.gz b/prnt/ps/hp-laserjet_5000_series-ps.ppd.gz Binary files differindex c1e234e06..415abb651 100644 --- a/prnt/ps/hp-laserjet_5000_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5000_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_500_color_m551-ps.ppd.gz b/prnt/ps/hp-laserjet_500_color_m551-ps.ppd.gz Binary files differindex 1544823b5..e0dad275d 100644 --- a/prnt/ps/hp-laserjet_500_color_m551-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_500_color_m551-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_500_color_mfp_m570-ps.ppd.gz b/prnt/ps/hp-laserjet_500_color_mfp_m570-ps.ppd.gz Binary files differindex d25a350a1..7c79a01d5 100644 --- a/prnt/ps/hp-laserjet_500_color_mfp_m570-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_500_color_mfp_m570-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz b/prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz Binary files differindex dfe4474a7..8b263d3a1 100644 --- a/prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz b/prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz Binary files differindex f8fa48cd3..a873e0b24 100644 --- a/prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5100_series-ps.ppd.gz b/prnt/ps/hp-laserjet_5100_series-ps.ppd.gz Binary files differindex f02cee2de..a8db3545e 100644 --- a/prnt/ps/hp-laserjet_5100_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5100_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5200-ps.ppd.gz b/prnt/ps/hp-laserjet_5200-ps.ppd.gz Binary files differindex d0e11caf7..2d6e41620 100644 --- a/prnt/ps/hp-laserjet_5200-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5200-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5200l-ps.ppd.gz b/prnt/ps/hp-laserjet_5200l-ps.ppd.gz Binary files differindex c465c277f..eb5ff4206 100644 --- a/prnt/ps/hp-laserjet_5200l-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5200l-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5200lx-ps.ppd.gz b/prnt/ps/hp-laserjet_5200lx-ps.ppd.gz Binary files differindex b77683da5..98111a830 100644 --- a/prnt/ps/hp-laserjet_5200lx-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5200lx-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5mp-ps.ppd.gz b/prnt/ps/hp-laserjet_5mp-ps.ppd.gz Binary files differindex 1557aed3d..c1119f856 100644 --- a/prnt/ps/hp-laserjet_5mp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5mp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5p-ps.ppd.gz b/prnt/ps/hp-laserjet_5p-ps.ppd.gz Binary files differindex f45598c5e..3b765990c 100644 --- a/prnt/ps/hp-laserjet_5p-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5p-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5si-ps.ppd.gz b/prnt/ps/hp-laserjet_5si-ps.ppd.gz Binary files differindex 16bad0d3b..64b445733 100644 --- a/prnt/ps/hp-laserjet_5si-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5si-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz b/prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz Binary files differindex a2618bb65..148a01f05 100644 --- a/prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz b/prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz Binary files differindex ce6f998e0..17f028ec1 100644 --- a/prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_6mp-ps.ppd.gz b/prnt/ps/hp-laserjet_6mp-ps.ppd.gz Binary files differindex 23f907a22..cac1445dd 100644 --- a/prnt/ps/hp-laserjet_6mp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_6mp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_6p-ps.ppd.gz b/prnt/ps/hp-laserjet_6p-ps.ppd.gz Binary files differindex 2d5b920ba..136317df3 100644 --- a/prnt/ps/hp-laserjet_6p-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_6p-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_700_color_mfp_m775-ps.ppd.gz b/prnt/ps/hp-laserjet_700_color_mfp_m775-ps.ppd.gz Binary files differindex bedeee8c6..3f124f659 100644 --- a/prnt/ps/hp-laserjet_700_color_mfp_m775-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_700_color_mfp_m775-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_700_m712-ps.ppd.gz b/prnt/ps/hp-laserjet_700_m712-ps.ppd.gz Binary files differindex 5b19a0dea..183082b5b 100644 --- a/prnt/ps/hp-laserjet_700_m712-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_700_m712-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_8000-ps.ppd.gz b/prnt/ps/hp-laserjet_8000-ps.ppd.gz Binary files differindex 71e8d3459..be84604f0 100644 --- a/prnt/ps/hp-laserjet_8000-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_8000-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_8000_series-ps.ppd.gz b/prnt/ps/hp-laserjet_8000_series-ps.ppd.gz Binary files differindex 17795c8b4..0642f1318 100644 --- a/prnt/ps/hp-laserjet_8000_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_8000_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz Binary files differindex dead72585..9a09594f4 100644 --- a/prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_8100_series-ps.ppd.gz b/prnt/ps/hp-laserjet_8100_series-ps.ppd.gz Binary files differindex cad988e60..e0d18d580 100644 --- a/prnt/ps/hp-laserjet_8100_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_8100_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_8150_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_8150_mfp-ps.ppd.gz Binary files differindex 473497925..d1f9ed27d 100644 --- a/prnt/ps/hp-laserjet_8150_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_8150_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_9000_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_9000_mfp-ps.ppd.gz Binary files differindex 7877e38c3..9d30dc85f 100644 --- a/prnt/ps/hp-laserjet_9000_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_9000_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_9000_series-ps.ppd.gz b/prnt/ps/hp-laserjet_9000_series-ps.ppd.gz Binary files differindex 2a5b72279..7a16fe92b 100644 --- a/prnt/ps/hp-laserjet_9000_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_9000_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_9040-ps.ppd.gz b/prnt/ps/hp-laserjet_9040-ps.ppd.gz Binary files differindex 6a00361b5..c8ccb35df 100644 --- a/prnt/ps/hp-laserjet_9040-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_9040-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_9040_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_9040_mfp-ps.ppd.gz Binary files differindex 84b0bc50c..1893e9acb 100644 --- a/prnt/ps/hp-laserjet_9040_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_9040_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_9050-ps.ppd.gz b/prnt/ps/hp-laserjet_9050-ps.ppd.gz Binary files differindex 2be4fae9a..e4644e646 100644 --- a/prnt/ps/hp-laserjet_9050-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_9050-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_9050_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_9050_mfp-ps.ppd.gz Binary files differindex 63b01473c..5e260b4b4 100644 --- a/prnt/ps/hp-laserjet_9050_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_9050_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_9055mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_9055mfp-ps.ppd.gz Binary files differindex bc7bd03da..aa4599f38 100644 --- a/prnt/ps/hp-laserjet_9055mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_9055mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_9065mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_9065mfp-ps.ppd.gz Binary files differindex c9ed34667..df273b148 100644 --- a/prnt/ps/hp-laserjet_9065mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_9065mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz b/prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz Binary files differindex 91b09c91b..7ec20d352 100644 --- a/prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz b/prnt/ps/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz Binary files differindex d5629ead3..b90edac95 100644 --- a/prnt/ps/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz b/prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz Binary files differindex 0fa1429ea..bd6d8fe54 100644 --- a/prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_flow_mfp_m525-ps.ppd.gz b/prnt/ps/hp-laserjet_flow_mfp_m525-ps.ppd.gz Binary files differindex bc4f3937d..2e5ebe598 100644 --- a/prnt/ps/hp-laserjet_flow_mfp_m525-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_flow_mfp_m525-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz b/prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..2a12e8f1b --- /dev/null +++ b/prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m1522_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m1522_mfp-ps.ppd.gz Binary files differindex 99deeca32..40875eb85 100644 --- a/prnt/ps/hp-laserjet_m1522_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m1522_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m1522n_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m1522n_mfp-ps.ppd.gz Binary files differindex 766ee2723..2722cf1de 100644 --- a/prnt/ps/hp-laserjet_m1522n_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m1522n_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz Binary files differindex 722853195..6503450e2 100644 --- a/prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz b/prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz Binary files differindex 8d04b5eb1..da36f1711 100644 --- a/prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m2727_mfp_series-ps.ppd.gz b/prnt/ps/hp-laserjet_m2727_mfp_series-ps.ppd.gz Binary files differindex 5425ea1e3..16d6a9499 100644 --- a/prnt/ps/hp-laserjet_m2727_mfp_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m2727_mfp_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz Binary files differindex 99bd236f3..92ea81ad7 100644 --- a/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.gz Binary files differindex 26a6059c9..57cbd0d19 100644 --- a/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m4345_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m4345_mfp-ps.ppd.gz Binary files differindex 0a272a391..ca77277c7 100644 --- a/prnt/ps/hp-laserjet_m4345_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m4345_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz Binary files differindex c36d7471c..35c9a26e6 100644 --- a/prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz Binary files differindex 25ff02547..809bae4f2 100644 --- a/prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m5025_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m5025_mfp-ps.ppd.gz Binary files differindex b2674511c..c499b335e 100644 --- a/prnt/ps/hp-laserjet_m5025_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m5025_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m5035_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m5035_mfp-ps.ppd.gz Binary files differindex 346847479..38dac6bc3 100644 --- a/prnt/ps/hp-laserjet_m5035_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m5035_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m806-ps.ppd.gz b/prnt/ps/hp-laserjet_m806-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..cfe287be1 --- /dev/null +++ b/prnt/ps/hp-laserjet_m806-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m9040_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m9040_mfp-ps.ppd.gz Binary files differindex 06a0b1ca2..85dd31c5e 100644 --- a/prnt/ps/hp-laserjet_m9040_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m9040_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m9050_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m9050_mfp-ps.ppd.gz Binary files differindex df3eaea70..c47ebb525 100644 --- a/prnt/ps/hp-laserjet_m9050_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m9050_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m9059_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m9059_mfp-ps.ppd.gz Binary files differindex 2d7db12a2..f9ad09172 100644 --- a/prnt/ps/hp-laserjet_m9059_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m9059_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz Binary files differindex 76977e2ba..7df6dfd0e 100644 --- a/prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz Binary files differindex dfb7a8048..7add2da26 100644 --- a/prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz Binary files differindex c8a2ec366..34e31a165 100644 --- a/prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz Binary files differindex 13fe37087..7d286e6f6 100644 --- a/prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p3004-ps.ppd.gz b/prnt/ps/hp-laserjet_p3004-ps.ppd.gz Binary files differindex cf3f718fa..3b1bd82a7 100644 --- a/prnt/ps/hp-laserjet_p3004-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p3004-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p3005-ps.ppd.gz b/prnt/ps/hp-laserjet_p3005-ps.ppd.gz Binary files differindex fc78a25cb..8f69d165f 100644 --- a/prnt/ps/hp-laserjet_p3005-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p3005-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p3010_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p3010_series-ps.ppd.gz Binary files differindex 34249a5e6..67c21679e 100644 --- a/prnt/ps/hp-laserjet_p3010_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p3010_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4010_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p4010_series-ps.ppd.gz Binary files differindex f3d2a5749..9fc0ad54f 100644 --- a/prnt/ps/hp-laserjet_p4010_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4010_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz Binary files differindex 741238e85..703e3023d 100644 --- a/prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz diff --git a/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz b/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz Binary files differindex a5c16b693..a50359088 100644 --- a/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz +++ b/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz diff --git a/prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz b/prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz Binary files differindex 17b6e3086..522c5a44a 100644 --- a/prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz +++ b/prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz diff --git a/prnt/ps/hp-mopier_240-ps.ppd.gz b/prnt/ps/hp-mopier_240-ps.ppd.gz Binary files differindex fed433edb..3fa067349 100644 --- a/prnt/ps/hp-mopier_240-ps.ppd.gz +++ b/prnt/ps/hp-mopier_240-ps.ppd.gz diff --git a/prnt/ps/hp-mopier_320-ps.ppd.gz b/prnt/ps/hp-mopier_320-ps.ppd.gz Binary files differindex d53405414..0fa103069 100644 --- a/prnt/ps/hp-mopier_320-ps.ppd.gz +++ b/prnt/ps/hp-mopier_320-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz b/prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz Binary files differindex e0633449c..a3b5e1060 100644 --- a/prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz b/prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz Binary files differindex 1f8a2dc62..78e3a6f40 100644 --- a/prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz b/prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz Binary files differindex 3a093a4fc..9d0f04ca8 100644 --- a/prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz b/prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz Binary files differindex 1fde01569..ce5fe517b 100644 --- a/prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_551_series-ps.ppd.gz b/prnt/ps/hp-officejet_pro_551_series-ps.ppd.gz Binary files differindex 0c4425967..139760aab 100644 --- a/prnt/ps/hp-officejet_pro_551_series-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_551_series-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz b/prnt/ps/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz Binary files differindex 8c9af65d7..9810dcfd2 100644 --- a/prnt/ps/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz diff --git a/scan/sane/hpaio.c b/scan/sane/hpaio.c index 73c25b249..591789e81 100644 --- a/scan/sane/hpaio.c +++ b/scan/sane/hpaio.c @@ -299,25 +299,28 @@ static int DevDiscovery(int localOnly) } } - /* Ignore localOnly flag (used by saned) and always look for network all-in-one scan devices (defined by cups). */ - cnt = GetCupsPrinters(&cups_printer); - for (i=0; i<cnt; i++) - { - hpmud_query_model(cups_printer[i], &ma); - if (ma.scantype > 0) - { - hpmud_get_uri_model(cups_printer[i], model, sizeof(model)); - AddDeviceList(cups_printer[i], model, &DeviceList); - total++; - } - else - { - DBG(6,"unsupported scantype=%d %s\n", ma.scantype, cups_printer[i]); - } - free(cups_printer[i]); - } - if (cups_printer) - free(cups_printer); + /* Check localOnly flag (used by saned) to decide whether to look for network all-in-one scan devices (defined by cups). */ + if (!localOnly) + { + cnt = GetCupsPrinters(&cups_printer); + for (i=0; i<cnt; i++) + { + hpmud_query_model(cups_printer[i], &ma); + if (ma.scantype > 0) + { + hpmud_get_uri_model(cups_printer[i], model, sizeof(model)); + AddDeviceList(cups_printer[i], model, &DeviceList); + total++; + } + else + { + DBG(6,"unsupported scantype=%d %s\n", ma.scantype, cups_printer[i]); + } + free(cups_printer[i]); + } + if (cups_printer) + free(cups_printer); + } bugout: return total; diff --git a/scan/sane/hpaio.desc b/scan/sane/hpaio.desc index 71d945f0b..080062b15 100644 --- a/scan/sane/hpaio.desc +++ b/scan/sane/hpaio.desc @@ -139,6 +139,12 @@ :model "HP Officejet d125xi All-in-one Printer" :status :good +:model "HP LaserJet Pro MFP m127fn" +:status :good + +:model "HP LaserJet Pro MFP m127fw" +:status :good + :model "HP Officejet d135 All-in-one Printer" :status :good @@ -157,6 +163,12 @@ :model "HP Officejet d155xi All-in-one Printer" :status :good +:model "HP Color LaserJet Pro Mpf m176n" +:status :good + +:model "HP Color LaserJet Pro Mpf m177fw" +:status :good + :model "HP LaserJet Pro 200 Color MFP m276n" :status :good @@ -742,6 +754,9 @@ :model "HP PSC 1513 All-in-one Printer" :status :good +:model "HP Deskjet 1514 All-in-one Printer" +:status :good + :model "HP PSC 1514 All-in-one Printer" :status :good @@ -1069,12 +1084,18 @@ :model "HP Deskjet 2542 All-in-one Printer" :status :good +:model "HP Deskjet 2544 All-in-one Printer" +:status :good + :model "HP Deskjet Ink Advantage 2545 All-in-one Printer" :status :good :model "HP Deskjet Ink Advantage 2546 All-in-one Printer" :status :good +:model "HP Deskjet Ink Advantage 2548 All-in-one Printer" +:status :good + :model "HP PSC 2550 Photosmart All-in-one Printer" :status :good @@ -1126,6 +1147,21 @@ :model "HP Photosmart 2615 All-in-one Printer" :status :good +:model "HP Officejet 2620 All-in-one" +:status :good + +:model "HP Officejet 2621 All-in-one" +:status :good + +:model "HP Officejet 2622 All-in-one" +:status :good + +:model "HP Deskjet Ink Advantage 2645 All-in-one Printer" +:status :good + +:model "HP Deskjet Ink Advantage 2646 All-in-one Printer" +:status :good + :model "HP Photosmart 2710 All-in-one Printer" :status :good @@ -2245,6 +2281,12 @@ :model "HP Envy 5530 E-all-in-one Printer" :status :good +:model "HP Envy 5531 E-all-in-one Printer" +:status :good + +:model "HP Envy 5532 E-all-in-one Printer" +:status :good + :model "HP Envy 5535 E-all-in-one Printer" :status :good diff --git a/scan/sane/marvell.c b/scan/sane/marvell.c index 4d1d5bb67..30c53495e 100644 --- a/scan/sane/marvell.c +++ b/scan/sane/marvell.c @@ -61,7 +61,10 @@ static int bb_load(struct marvell_session *ps, const char *so) /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ if ((ps->hpmud_handle = load_library("libhpmud.so")) == NULL) - goto bugout; + { + if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL) + goto bugout; + } /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ if ((ps->math_handle = load_library("libm.so")) == NULL) diff --git a/scan/sane/sclpml.c b/scan/sane/sclpml.c index 5ac41f3bf..0ce43bf53 100644 --- a/scan/sane/sclpml.c +++ b/scan/sane/sclpml.c @@ -1319,11 +1319,15 @@ static SANE_Status hpaioAdvanceDocument(hpaioScanner_t hpaio) /* If there is an ADF see if paper is loaded. */ if (hpaio->supportedAdfModes & ADF_MODE_ADF) { - retcode = SclInquire(hpaio->deviceid, hpaio->scan_channelid, SCL_CMD_INQUIRE_DEVICE_PARAMETER, + if (hpaio->currentDuplex && hpaio->currentSideNumber == 2) + documentLoaded = 1;//No need to check paper in ADF + else + { + retcode = SclInquire(hpaio->deviceid, hpaio->scan_channelid, SCL_CMD_INQUIRE_DEVICE_PARAMETER, SCL_INQ_ADF_DOCUMENT_LOADED, &documentLoaded, 0, 0); - - if (retcode != SANE_STATUS_GOOD) - goto bugout; + if (retcode != SANE_STATUS_GOOD) + goto bugout; + } } /* If in Batch mode, by definition we are in ADF mode. */ @@ -2637,12 +2641,15 @@ SANE_Status sclpml_start(SANE_Handle handle) if( log_output ) { char f[256]; - static int cnt=0; - - sprintf(f, "/var/log/hp/tmp/mfpdtf_%d.out", cnt++); - + static int cnt=0; + + if (getenv("HOME")) + sprintf(f, "%s/.hplip/mfpdtf_%d.out", getenv("HOME"), cnt++); + else + sprintf(f, "/tmp/mfpdtf_%d.out", cnt++); + bug("saving raw image to %s \n", f); - + MfpdtfLogToFile( hpaio->mfpdtf, f ); } diff --git a/scan/sane/soap.c b/scan/sane/soap.c index 644ba0936..2e3232d22 100644 --- a/scan/sane/soap.c +++ b/scan/sane/soap.c @@ -69,7 +69,10 @@ static int bb_load(struct soap_session *ps, const char *so) /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ if ((ps->hpmud_handle = load_library("libhpmud.so")) == NULL) - goto bugout; + { + if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL) + goto bugout; + } /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ if ((ps->math_handle = load_library("libm.so")) == NULL) diff --git a/scan/sane/soapht.c b/scan/sane/soapht.c index dd1c14f25..a7034227b 100644 --- a/scan/sane/soapht.c +++ b/scan/sane/soapht.c @@ -63,7 +63,10 @@ static int bb_load(struct soap_session *ps, const char *so) /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL) - goto bugout; + { + if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL) + goto bugout; + } /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ if ((ps->math_handle = load_library("libm.so")) == NULL) @@ -52,6 +52,11 @@ def plugin_download_callback(c, s, t): utils.format_bytes(c*s)) +def clean_exit(code = 0): + cups.releaseCupsInstance() + sys.exit(code) + + nickname_pat = re.compile(r'''\*NickName:\s*\"(.*)"''', re.MULTILINE) USAGE = [ (__doc__, "", "name", True), @@ -68,7 +73,7 @@ USAGE = [ (__doc__, "", "name", True), ("To specify a CUPS fax queue name:", "-f<fax> or --fax=<fax> (-i mode only)", "option", False), ("Type of queue(s) to install:", "-t<typelist> or --type=<typelist>. <typelist>: print*, fax\* (\*default) (-i mode only)", "option", False), ("To specify the device URI to install:", "-d<device> or --device=<device> (--qt4 mode only)", "option", False), - ("Remove printers or faxes instead of setting-up:", "-r or --rm or --remove (-u only)", "option", False), + ("Remove printers or faxes instead of setting-up:", "-r or --rm or --remove", "option", False), utils.USAGE_LANGUAGE, utils.USAGE_LOGGING1, utils.USAGE_LOGGING2, utils.USAGE_LOGGING3, utils.USAGE_HELP, @@ -107,15 +112,6 @@ USAGE = [ (__doc__, "", "name", True), ] -def showPasswordUI(prompt): - import getpass - print "" - print log.bold(prompt) - username = raw_input("Username: ") - password = getpass.getpass("Password: ") - - return (username, password) - mod = module.Module(__mod__, __title__, __version__, __doc__, USAGE, (INTERACTIVE_MODE, GUI_MODE), (UI_TOOLKIT_QT3, UI_TOOLKIT_QT4), @@ -211,11 +207,11 @@ if mode == GUI_MODE: if ui_toolkit == 'qt3': if not utils.canEnterGUIMode(): log.error("%s requires GUI support (try running with --qt4). Also, try using interactive (-i) mode." % __mod__) - sys.exit(1) + clean_exit(1) else: if not utils.canEnterGUIMode4(): log.error("%s requires GUI support (try running with --qt3). Also, try using interactive (-i) mode." % __mod__) - sys.exit(1) + clean_exit(1) if mode == GUI_MODE: if ui_toolkit == 'qt3': @@ -224,7 +220,7 @@ if mode == GUI_MODE: from ui import setupform except ImportError: log.error("Unable to load Qt3 support. Is it installed?") - sys.exit(1) + clean_exit(1) if remove: log.warn("-r/--rm/--remove not supported in qt3 mode.") @@ -274,12 +270,13 @@ if mode == GUI_MODE: w = setupform.SetupForm(bus, param, jd_port) except Error: log.error("Unable to connect to HPLIP I/O. Please (re)start HPLIP and try again.") - sys.exit(1) + clean_exit(1) app.setMainWidget(w) w.show() app.exec_loop() + cups.releaseCupsInstance() else: # qt4 try: @@ -287,7 +284,7 @@ if mode == GUI_MODE: from ui4.setupdialog import SetupDialog except ImportError: log.error("Unable to load Qt4 support. Is it installed?") - sys.exit(1) + clean_exit(1) app = QApplication(sys.argv) log.debug("Sys.argv=%s printer_name=%s param=%s jd_port=%s device_uri=%s remove=%s" % (sys.argv, printer_name, param, jd_port, device_uri, remove)) @@ -297,17 +294,33 @@ if mode == GUI_MODE: log.debug("Starting GUI loop...") app.exec_() except KeyboardInterrupt: - sys.exit(0) + clean_exit(0) else: # INTERACTIVE_MODE try: + try: + from base import password + except ImportError: + log.warn("Failed to import Password Object") + else: + cups.setPasswordCallback(password.showPasswordPrompt) - cups.setPasswordCallback(showPasswordUI) - + #Removing Queue if remove: - log.error("-r/--rm/--remove not supported in -i mode.") - sys.exit(1) + tui.header("REMOVING PRINT/FAX QUEUE") + remove_device = mod.getPrinterName(selected_device_name,None,['hp','hpfax']) + selected_device_name = remove_device[0] + log.info (log.bold("Removing '%s : %s' Queue"%(remove_device[0],remove_device[1]))) + + status, status_str = cups.cups_operation(cups.delPrinter, INTERACTIVE_MODE, '', None, selected_device_name) + + if cups.IPP_OK == status: + log.info("Successfully deleted %s Print/Fax queue"%selected_device_name) + clean_exit(0) + else: + log.error("Failed to delete %s Print/Fax queue. Error : %s"%(selected_device_name,status_str)) + clean_exit(1) if not auto: log.info("(Note: Defaults for each question are maked with a '*'. Press <enter> to accept the default.)") @@ -322,7 +335,7 @@ else: # INTERACTIVE_MODE bus = tui.connection_table() if bus is None: - sys.exit(0) + clean_exit(0) log.info("\nUsing connection type: %s" % bus[0]) @@ -351,7 +364,7 @@ else: # INTERACTIVE_MODE if not mq or mq.get('support-type', SUPPORT_TYPE_NONE) == SUPPORT_TYPE_NONE: log.error("Unsupported printer model.") - sys.exit(1) + clean_exit(1) if mq.get('fax-type', FAX_TYPE_NONE) in (FAX_TYPE_NONE, FAX_TYPE_NOT_SUPPORTED) and setup_fax: #log.warning("Cannot setup fax - device does not have fax feature.") @@ -385,7 +398,7 @@ else: # INTERACTIVE_MODE # su -c '%s' --> su -c 'hp-plugin -i' if os_utils.execute(cmd) != 0: log.error("Failed to install Plugin.") - sys.exit(1) + clean_exit(1) ppds = cups.getSystemPPDs() @@ -411,7 +424,7 @@ else: # INTERACTIVE_MODE ', '.join(installed_print_devices[print_uri])) ok, setup_print = tui.enter_yes_no("\nWould you like to install another print queue for this device", 'n') - if not ok: sys.exit(0) + if not ok: clean_exit(0) if setup_print: if auto: @@ -438,7 +451,7 @@ else: # INTERACTIVE_MODE if printer_name.lower().strip() == 'q': log.info("OK, done.") - sys.exit(0) + clean_exit(0) if not printer_name or printer_name.lower().strip() == 'm': printer_name = printer_default_model @@ -491,7 +504,7 @@ else: # INTERACTIVE_MODE if not auto: log.info("\nNote: The model number may vary slightly from the actual model number on the device.") ok, ans = tui.enter_yes_no("\nDoes this PPD file appear to be the correct one") - if not ok: sys.exit(0) + if not ok: clean_exit(0) if not ans: enter_ppd = True @@ -499,7 +512,7 @@ else: # INTERACTIVE_MODE enter_ppd = False ok, enter_ppd = tui.enter_yes_no("\nWould you like to specify the path to the correct PPD file to use", 'n') - if not ok: sys.exit(0) + if not ok: clean_exit(0) if enter_ppd: ok = False @@ -509,7 +522,7 @@ else: # INTERACTIVE_MODE if user_input.lower().strip() == 'q': log.info("OK, done.") - sys.exit(0) + clean_exit(0) file_path = user_input @@ -531,7 +544,7 @@ else: # INTERACTIVE_MODE log.error("No PPD 'NickName' found. This file may not be a valid PPD file.") ok, ans = tui.enter_yes_no("\nUse this file") - if not ok: sys.exit(0) + if not ok: clean_exit(0) if ans: print_ppd = file_path else: @@ -541,7 +554,7 @@ else: # INTERACTIVE_MODE break else: log.error("PPD file required. Setup cannot continue. Exiting.") - sys.exit(1) + clean_exit(1) if auto: location, info = '', 'Automatically setup by HPLIP' @@ -551,7 +564,7 @@ else: # INTERACTIVE_MODE if location.strip().lower() == 'q': log.info("OK, done.") - sys.exit(0) + clean_exit(0) # TODO: Validate chars break @@ -561,7 +574,7 @@ else: # INTERACTIVE_MODE if info.strip().lower() == 'q': log.info("OK, done.") - sys.exit(0) + clean_exit(0) # TODO: Validate chars break @@ -578,27 +591,35 @@ else: # INTERACTIVE_MODE log.debug("Restart CUPS returned: exit=%d output=%s" % (status, output)) time.sleep(1) - cups.setPasswordPrompt("You do not have permission to add a printer.") if not os.path.exists(print_ppd): # assume foomatic: or some such - status, status_str = cups.addPrinter(printer_name.encode('utf8'), print_uri, - location, '', print_ppd, info) + add_prnt_args = (printer_name.encode('utf8'), print_uri, location, '', print_ppd, info) else: - status, status_str = cups.addPrinter(printer_name.encode('utf8'), print_uri, - location, print_ppd, '', info) - - log.debug("addPrinter() returned (%d, %s)" % (status, status_str)) + add_prnt_args = (printer_name.encode('utf8'), print_uri, location, print_ppd, '', info) - installed_print_devices = device.getSupportedCUPSDevices(['hp']) + status, status_str = cups.cups_operation(cups.addPrinter, INTERACTIVE_MODE, '', None, *add_prnt_args) - if print_uri not in installed_print_devices or \ - printer_name not in installed_print_devices[print_uri]: + log.debug("addPrinter() returned (%d, %s)" % (status, status_str)) + log.debug(device.getSupportedCUPSDevices(['hp'])) - log.error("Printer queue setup failed. Please restart CUPS and try again.") - sys.exit(1) + if status != cups.IPP_OK: + log.error("Printer queue setup failed. Error : %s "%status_str) + clean_exit(1) else: # sending Event to add this device in hp-systray utils.sendEvent(EVENT_CUPS_QUEUES_CHANGED,print_uri, printer_name) + # Updating firmware download for supported devices. + if ignore_plugin_check is False and mq.get('fw-download', False): + try: + d = device.Device(print_uri) + except Error: + log.error("Error opening device. Firmware download is Failed.") + else: + if d.downloadFirmware(): + log.info("Firmware download successful.\n") + else: + log.error("Firmware download is Failed.") + d.close() # ******************************* FAX QUEUE SETUP if setup_fax and not prop.fax_build: @@ -623,7 +644,7 @@ else: # INTERACTIVE_MODE if not auto and fax_uri in installed_fax_devices: log.warning("One or more fax queues already exist for this device: %s." % ', '.join(installed_fax_devices[fax_uri])) ok, setup_fax = tui.enter_yes_no("\nWould you like to install another fax queue for this device", 'n') - if not ok: sys.exit(0) + if not ok: clean_exit(0) if setup_fax: if auto: # or fax_name is None: @@ -650,7 +671,7 @@ else: # INTERACTIVE_MODE if fax_name.lower().strip() == 'q': log.info("OK, done.") - sys.exit(0) + clean_exit(0) if not fax_name or fax_name.lower().strip() == 'm': fax_name = fax_default_model @@ -687,7 +708,7 @@ else: # INTERACTIVE_MODE if not fax_ppd: log.error("Unable to find HP fax PPD file! Please check you HPLIP installation and try again.") - sys.exit(1) + clean_exit(1) if auto: location, info = '', 'Automatically setup by HPLIP' @@ -697,7 +718,7 @@ else: # INTERACTIVE_MODE if location.strip().lower() == 'q': log.info("OK, done.") - sys.exit(0) + clean_exit(0) # TODO: Validate chars break @@ -707,7 +728,7 @@ else: # INTERACTIVE_MODE if info.strip().lower() == 'q': log.info("OK, done.") - sys.exit(0) + clean_exit(0) # TODO: Validate chars break @@ -728,16 +749,11 @@ else: # INTERACTIVE_MODE location, fax_ppd, '', info) log.debug("addPrinter() returned (%d, %s)" % (status, status_str)) + log.debug(device.getSupportedCUPSDevices(['hpfax'])) - installed_fax_devices = device.getSupportedCUPSDevices(['hpfax']) - - log.debug(installed_fax_devices) - - if fax_uri not in installed_fax_devices or \ - fax_name not in installed_fax_devices[fax_uri]: - - log.error("Fax queue setup failed. Please restart CUPS and try again.") - sys.exit(1) + if status != cups.IPP_OK: + log.error("Fax queue setup failed. Error : %s"%status_str) + clean_exit(1) else: # sending Event to add this device in hp-systray utils.sendEvent(EVENT_CUPS_QUEUES_CHANGED,fax_uri, fax_name) @@ -755,7 +771,7 @@ else: # INTERACTIVE_MODE if user_input == 'q': log.info("OK, done.") - sys.exit(0) + clean_exit(0) if not user_input: user_input = 'y' @@ -805,7 +821,7 @@ else: # INTERACTIVE_MODE phone_num = raw_input(log.bold("\nEnter the fax phone number for this device (q=quit) ?")) if phone_num.strip().lower() == 'q': log.info("OK, done.") - sys.exit(0) + clean_exit(0) if current_phone_num and (not phone_num or phone_num.strip().lower() == 'c'): phone_num = current_phone_num @@ -833,7 +849,7 @@ else: # INTERACTIVE_MODE station_name = raw_input(log.bold("\nEnter the name and/or company for this device (q=quit) ?")) if station_name.strip().lower() == 'q': log.info("OK, done.") - sys.exit(0) + clean_exit(0) if current_station_name and (not station_name or station_name.strip().lower() == 'c'): station_name = current_station_name @@ -866,7 +882,7 @@ else: # INTERACTIVE_MODE print_test_page = True else: ok, print_test_page = tui.enter_yes_no("\nWould you like to print a test page") - if not ok: sys.exit(0) + if not ok: clean_exit(0) if print_test_page: path = utils.which('hp-testpage') @@ -886,6 +902,7 @@ else: # INTERACTIVE_MODE except KeyboardInterrupt: log.error("User exit") +cups.releaseCupsInstance() log.info("") log.info("Done.") diff --git a/ui/devmgr4.py b/ui/devmgr4.py index f41bdbaba..9de6fcfdb 100644 --- a/ui/devmgr4.py +++ b/ui/devmgr4.py @@ -387,6 +387,7 @@ class UpdateThread(QThread): finally: dev.close() #print "THREAD LOCK RELEASE" + cups.releaseCupsInstance() devices_lock.release() log.debug("Device state = %d" % dev.device_state) @@ -2632,27 +2633,29 @@ class DevMgr4(DevMgr4_base): QApplication.setOverrideCursor(QApplication.waitCursor) try: if self.printer_state in (cups.IPP_PRINTER_STATE_IDLE, cups.IPP_PRINTER_STATE_PROCESSING): - result = cups.stop(self.cur_printer) - if result: + + result, result_str = cups.cups_operation(cups.stop, GUI_MODE, 'qt3', self, self.cur_printer) + if result == cups.IPP_OK: if self.cur_device.device_type == DEVICE_TYPE_PRINTER: e = EVENT_PRINTER_QUEUE_STOPPED else: e = EVENT_FAX_QUEUE_STOPPED else: - result = cups.start(self.cur_printer) - if result: + result, result_str = cups.cups_operation(cups.start, GUI_MODE, 'qt3', self, self.cur_printer) + if result == cups.IPP_OK: if self.cur_device.device_type == DEVICE_TYPE_PRINTER: e = EVENT_PRINTER_QUEUE_STARTED else: e = EVENT_FAX_QUEUE_STARTED - if result: + if result == cups.IPP_OK: self.UpdatePrintController() self.cur_device.sendEvent(e, self.cur_printer) else: log.error("Start/Stop printer operation failed") - self.FailureUI(self.__tr("<b>Start/Stop printer operation failed.</b><p>Try after add user to \"lp\" group.")) + self.FailureUI(self.__tr("<b>Start/Stop printer operation failed.</b><p> Error : %s"%result_str)) + cups.releaseCupsInstance() finally: QApplication.restoreOverrideCursor() @@ -2662,27 +2665,28 @@ class DevMgr4(DevMgr4_base): QApplication.setOverrideCursor(QApplication.waitCursor) try: if self.printer_accepting: - result = cups.reject(self.cur_printer) - if result: + result ,result_str = cups.cups_operation(cups.reject, GUI_MODE, 'qt3', self, self.cur_printer) + if result == cups.IPP_OK: if self.cur_device.device_type == DEVICE_TYPE_PRINTER: e = EVENT_PRINTER_QUEUE_REJECTING_JOBS else: e = EVENT_FAX_QUEUE_REJECTING_JOBS else: - result = cups.accept(self.cur_printer) - if result: + result ,result_str = cups.cups_operation(cups.accept, GUI_MODE, 'qt3', self, self.cur_printer) + if result == cups.IPP_OK: if self.cur_device.device_type == DEVICE_TYPE_PRINTER: e = EVENT_PRINTER_QUEUE_ACCEPTING_JOBS else: e = EVENT_FAX_QUEUE_ACCEPTING_JOBS - if result: + if result == cups.IPP_OK: self.UpdatePrintController() self.cur_device.sendEvent(e, self.cur_printer) else: log.error("Reject/Accept jobs operation failed") - self.FailureUI(self.__tr("<b>Accept/Reject printer operation failed.</b><p>Try after add user to \"lp\" group.")) + self.FailureUI(self.__tr("<b>Accept/Reject printer operation failed.</b><p>Error : %s"%result_str)) + cups.releaseCupsInstance() finally: QApplication.restoreOverrideCursor() @@ -2691,10 +2695,12 @@ class DevMgr4(DevMgr4_base): def defaultPushButton_clicked(self): QApplication.setOverrideCursor(QApplication.waitCursor) try: - result = cups.setDefaultPrinter(self.cur_printer.encode('utf8')) - if not result: + result, result_str = cups.cups_operation(cups.setDefaultPrinter, GUI_MODE, 'qt3', self, self.cur_printer.encode('utf8')) + + if result != cups.IPP_OK: log.error("Set default printer failed.") - self.FailureUI(self.__tr("<b>Set default printer operation failed.</b><p>Try after add user to \"lp\" group.")) + self.FailureUI(self.__tr("<b>Set default printer operation failed.</b><p>Error : %s"%result_str)) + cups.releaseCupsInstance() else: self.UpdatePrintController() if self.cur_device.device_type == DEVICE_TYPE_PRINTER: @@ -2858,9 +2864,12 @@ class DevMgr4(DevMgr4_base): if d in (print_uri, fax_uri): for p in self.cups_devices[d]: log.debug("Removing %s" % p) - r = cups.delPrinter(p) - if r == 0: - self.FailureUI(self.__tr("<p><b>Delete printer queue fails.</b><p>Try after add user to \"lp\" group.")) + r, result_str = cups.cups_operation(cups.delPrinter, GUI_MODE, 'qt3', self, p) + + if r != cups.IPP_OK: + self.FailureUI(self.__tr("<p><b>Delete printer queue fails.</b><p>Error : %s"%result_str)) + print_uri ="" # Ignoring further devices delete operation, as authentication is failed or cancelled. + fax_uri = "" self.cur_device = None self.cur_device_uri = '' diff --git a/ui/setupform.py b/ui/setupform.py index 7b70e15da..2eb5f70bd 100644 --- a/ui/setupform.py +++ b/ui/setupform.py @@ -282,24 +282,31 @@ class SetupForm(SetupForm_base): #status, output = utils.run(restart_cups()) #log.debug("Restart CUPS returned: exit=%d output=%s" % (status, output)) - self.setupPrinter() + print_sts = self.setupPrinter() + if print_sts == cups.IPP_FORBIDDEN or print_sts == cups.IPP_NOT_AUTHENTICATED or print_sts == cups.IPP_NOT_AUTHORIZED: + pass + else: + if self.setup_fax: + if self.setupFax() == cups.IPP_OK: + self.readwriteFaxInformation(False) - if self.setup_fax: - self.setupFax() - self.readwriteFaxInformation(False) + self.lineEdit5.setText(self.fax_number) + self.lineEdit6.setText(self.fax_name) + self.lineEdit7.setText(self.fax_name_company) + self.lineEdit8.setText(self.fax_location) + self.lineEdit9.setText(self.fax_desc) - self.lineEdit5.setText(self.fax_number) - self.lineEdit6.setText(self.fax_name) - self.lineEdit7.setText(self.fax_name_company) - self.lineEdit8.setText(self.fax_location) - self.lineEdit9.setText(self.fax_desc) + self.faxGroupBox.setEnabled(True) - self.faxGroupBox.setEnabled(True) + else: + self.faxGroupBox.setEnabled(False) - else: - self.faxGroupBox.setEnabled(False) + if print_sts == cups.IPP_OK: + self.flashFirmware() - self.setFinishEnabled(self.FinishedPage, True) + self.setFinishEnabled(self.FinishedPage, True) + else: + self.close() if orig_page != page: try: @@ -841,38 +848,55 @@ class SetupForm(SetupForm_base): finally: QApplication.restoreOverrideCursor() + + # + # Updating firmware download for supported devices. + # + def flashFirmware(self): + if self.mq.get('fw-download', False): + try: + d = device.Device(self.device_uri) + except Error , e: + self.FailureUI(self.__tr("<b>Error opening device. Firmware download is Failed.</b><p>%s (%s)." % (e.msg, e.opt))) + else: + if d.downloadFirmware(): + log.info("Firmware download successful.\n") + else: + self.FailureUI(self.__tr("<b>Firmware download is Failed.</b>")) + d.close() + + # # SETUP PRINTER/FAX # def setupPrinter(self): + status = cups.IPP_BAD_REQUEST QApplication.setOverrideCursor(QApplication.waitCursor) - cups.setPasswordPrompt("You do not have permission to add a printer.") #if self.ppd_file.startswith("foomatic:"): if not os.path.exists(self.ppd_file): # assume foomatic: or some such - status, status_str = cups.addPrinter(self.printer_name.encode('utf8'), self.device_uri, - self.location, '', self.ppd_file, self.desc) + add_prnt_args = (self.printer_name.encode('utf8'), self.device_uri,self.location, '', self.ppd_file, self.desc) else: - status, status_str = cups.addPrinter(self.printer_name.encode('utf8'), self.device_uri, - self.location, self.ppd_file, '', self.desc) - - log.debug("addPrinter() returned (%d, %s)" % (status, status_str)) - self.installed_print_devices = device.getSupportedCUPSDevices(['hp']) + add_prnt_args = (self.printer_name.encode('utf8'), self.device_uri, self.location, self.ppd_file, '', self.desc) - log.debug(self.installed_print_devices) + status, status_str = cups.cups_operation(cups.addPrinter, GUI_MODE, 'qt3', self, *add_prnt_args) - if self.device_uri not in self.installed_print_devices or \ - self.printer_name not in self.installed_print_devices[self.device_uri]: + log.debug("addPrinter() returned (%d, %s)" % (status, status_str)) + log.debug(device.getSupportedCUPSDevices(['hp'])) - self.FailureUI(self.__tr("<b>Printer queue setup failed.</b><p>Please restart CUPS and try again.")) + if status != cups.IPP_OK: + self.FailureUI(self.__tr("<b>Printer queue setup failed.</b><p>Error : %s "%status_str)) else: # sending Event to add this device in hp-systray utils.sendEvent(EVENT_CUPS_QUEUES_CHANGED,self.device_uri, self.printer_name) QApplication.restoreOverrideCursor() + return status + def setupFax(self): + status = cups.IPP_BAD_REQUEST QApplication.setOverrideCursor(QApplication.waitCursor) back_end, is_hp, bus, model, serial, dev_file, host, zc, port = \ device.parseDeviceURI(self.device_uri) @@ -910,7 +934,6 @@ class SetupForm(SetupForm_base): else: # Quit return - cups.setPasswordPrompt("You do not have permission to add a fax device.") if not os.path.exists(fax_ppd): status, status_str = cups.addPrinter(self.fax_name.encode('utf8'), self.fax_uri, self.fax_location, '', fax_ppd, self.fax_desc) @@ -919,19 +942,16 @@ class SetupForm(SetupForm_base): self.fax_uri, self.fax_location, fax_ppd, '', self.fax_desc) log.debug("addPrinter() returned (%d, %s)" % (status, status_str)) - self.installed_fax_devices = device.getSupportedCUPSDevices(['hpfax']) - - log.debug(self.installed_fax_devices) - - if self.fax_uri not in self.installed_fax_devices or \ - self.fax_name not in self.installed_fax_devices[self.fax_uri]: + log.debug(device.getSupportedCUPSDevices(['hpfax'])) - self.FailureUI(self.__tr("<b>Fax queue setup failed.</b><p>Please restart CUPS and try again.")) + if status != cups.IPP_OK: + self.FailureUI(self.__tr("<b>Fax queue setup failed.</b><p>Error : %s "%status_str)) else: # sending Event to add this device in hp-systray utils.sendEvent(EVENT_CUPS_QUEUES_CHANGED,self.fax_uri, self.fax_name) QApplication.restoreOverrideCursor() + return status def accept(self): if self.print_test_page: diff --git a/ui/systemtray.py b/ui/systemtray.py index 4b7b5791e..9bf6b4351 100644 --- a/ui/systemtray.py +++ b/ui/systemtray.py @@ -436,11 +436,11 @@ class SystemTrayApp(QApplication): self.timer.start(UPGRADE_CHECK_DELAY) # Cleans the /var/log/hp/tmp directory - self.handle_hplip_clean() + #self.handle_hplip_clean() - self.clean_timer = QTimer() - self.clean_timer.connect(self.clean_timer,SIGNAL("timeout()"),self.handle_hplip_clean) - self.clean_timer.start(CLEAN_EXEC_DELAY) + #self.clean_timer = QTimer() + #self.clean_timer.connect(self.clean_timer,SIGNAL("timeout()"),self.handle_hplip_clean) + #self.clean_timer.start(CLEAN_EXEC_DELAY) self.ERROR_STATE_TO_ICON = { diff --git a/ui4/devmgr5.py b/ui4/devmgr5.py index a0a334348..514c2f59a 100644 --- a/ui4/devmgr5.py +++ b/ui4/devmgr5.py @@ -417,6 +417,7 @@ class DevMgr5(QMainWindow, Ui_MainWindow): elif event.event_code == EVENT_SYSTEMTRAY_EXIT: log.debug("EVENT_SYSTEMTRAY_EXIT") log.warn("HPLIP Status Service was closed. HPLIP Device Manager will now exit.") + cups.releaseCupsInstance() self.close() elif event.event_code == EVENT_RAISE_DEVICE_MANAGER: @@ -939,7 +940,7 @@ class DevMgr5(QMainWindow, Ui_MainWindow): beginWaitCursor() if f.split(':')[0] in ('http', 'https', 'file'): - log.debug("Opening browser to: %s" % item.cmd) + log.debug("Opening browser to: %s" % f) utils.openURL(f) else: self.runExternalCommand(f) @@ -1935,27 +1936,27 @@ class DevMgr5(QMainWindow, Ui_MainWindow): beginWaitCursor() try: if self.printer_state in (cups.IPP_PRINTER_STATE_IDLE, cups.IPP_PRINTER_STATE_PROCESSING): - result = cups.stop(self.cur_printer) - if result: + result, result_str = cups.cups_operation(cups.stop, GUI_MODE, 'qt4', self, self.cur_printer) + if result == cups.IPP_OK: if self.cur_device.device_type == DEVICE_TYPE_PRINTER: e = EVENT_PRINTER_QUEUE_STOPPED else: e = EVENT_FAX_QUEUE_STOPPED else: - result = cups.start(self.cur_printer) - if result: + result, result_str = cups.cups_operation(cups.start, GUI_MODE, 'qt4', self, self.cur_printer) + if result == cups.IPP_OK: if self.cur_device.device_type == DEVICE_TYPE_PRINTER: e = EVENT_PRINTER_QUEUE_STARTED else: e = EVENT_FAX_QUEUE_STARTED - if result: + if result == cups.IPP_OK: self.updatePrintController() self.cur_device.sendEvent(e, self.cur_printer) else: - if os.geteuid!=0 and utils.get_cups_systemgroup_list()!=[]: - FailureUI(self, self.__tr("<b>Start/Stop printer queue operation fails. Could not connect to CUPS Server</b><p>Is user added to %s group(s)" %utils.list_to_string(utils.get_cups_systemgroup_list()))) + FailureUI(self, self.__tr("<b>Start/Stop printer queue operation fails. </b><p>Error : %s"%result_str)) + cups.releaseCupsInstance() finally: endWaitCursor() @@ -1966,27 +1967,27 @@ class DevMgr5(QMainWindow, Ui_MainWindow): beginWaitCursor() try: if self.printer_accepting: - result = cups.reject(self.cur_printer) - if result: + result, result_str = cups.cups_operation(cups.reject, GUI_MODE, 'qt4', self, self.cur_printer) + if result == cups.IPP_OK: if self.cur_device.device_type == DEVICE_TYPE_PRINTER: e = EVENT_PRINTER_QUEUE_REJECTING_JOBS else: e = EVENT_FAX_QUEUE_REJECTING_JOBS else: - result = cups.accept(self.cur_printer) - if result: + result, result_str = cups.cups_operation(cups.accept, GUI_MODE, 'qt4', self, self.cur_printer) + if result == cups.IPP_OK: if self.cur_device.device_type == DEVICE_TYPE_PRINTER: e = EVENT_PRINTER_QUEUE_ACCEPTING_JOBS else: e = EVENT_FAX_QUEUE_ACCEPTING_JOBS - if result: + if result == cups.IPP_OK: self.updatePrintController() self.cur_device.sendEvent(e, self.cur_printer) else: - if os.geteuid!=0 and utils.get_cups_systemgroup_list()!=[]: - FailureUI(self, self.__tr("<b>Accept/Reject printer queue operation fails. Could not connect to CUPS Server</b><p>Is user added to %s group(s)" %utils.list_to_string(utils.get_cups_systemgroup_list()))) + FailureUI(self, self.__tr("<b>Accept/Reject printer queue operation fails.</b><p>Error : %s"%result_str)) + cups.releaseCupsInstance() finally: endWaitCursor() @@ -1996,10 +1997,10 @@ class DevMgr5(QMainWindow, Ui_MainWindow): def SetDefaultButton_clicked(self): beginWaitCursor() try: - result = cups.setDefaultPrinter(self.cur_printer.encode('utf8')) - if not result: - if os.geteuid!=0 and utils.get_cups_systemgroup_list()!=[]: - FailureUI(self, self.__tr("<b>Set printer queue as default operation fails. Could not connect to CUPS Server</b><p>Is user added to %s group(s)" %utils.list_to_string(utils.get_cups_systemgroup_list()))) + result, result_str = cups.cups_operation(cups.setDefaultPrinter, GUI_MODE, 'qt4', self, self.cur_printer.encode('utf8')) + if result != cups.IPP_OK: + FailureUI(self, self.__tr("<b>Set printer queue as default operation fails. </b><p>Error : %s"%result_str)) + cups.releaseCupsInstance() else: self.updatePrintController() if self.cur_device.device_type == DEVICE_TYPE_PRINTER: @@ -2058,6 +2059,7 @@ class DevMgr5(QMainWindow, Ui_MainWindow): def quit(self): self.cleanupChildren() + cups.releaseCupsInstance() self.close() @@ -2152,7 +2154,7 @@ class DevMgr5(QMainWindow, Ui_MainWindow): try: if len(cmd) == 0: - FailureUI(self.__tr("<p><b>Unable to run command. No command specified.</b><p>Use <pre>Configure...</pre> to specify a command to run.")) + FailureUI(self,self.__tr("<p><b>Unable to run command. No command specified.</b><p>Use <pre>Configure...</pre> to specify a command to run.")) log.error("No command specified. Use settings to configure commands.") else: log.debug("Run: %s %s (%s) %s" % ("*"*20, cmd, self.cur_device_uri, "*"*20)) diff --git a/ui4/queuesconf.py b/ui4/queuesconf.py index c97f9dbff..2347847f1 100644 --- a/ui4/queuesconf.py +++ b/ui4/queuesconf.py @@ -192,14 +192,18 @@ class QueuesDiagnose(QDialog, Ui_Dialog): SuccessUI(self, self.__tr(msg)) else: - cups.delPrinter(self.printerName) - msg="' "+self.printerName+" ' removed successfully.\nRe-configuring this printer by hp-setup..." - log.debug(msg) - path = utils.which('hp-setup') - if path: - log.debug("Starting hp-setup") - utils.run('hp-setup --gui') + status, status_str = cups.cups_operation(cups.delPrinter, GUI_MODE, 'qt4', self, self.printerName) + if status != cups.IPP_OK: + msg="Failed to remove ' "+self.printerName+" ' queue.\nRemove using hp-toolbox..." + FailureUI(self, self.__tr(msg)) + else: + msg="' "+self.printerName+" ' removed successfully.\nRe-configuring this printer by hp-setup..." + log.debug(msg) + path = utils.which('hp-setup') + if path: + log.debug("Starting hp-setup") + utils.run('hp-setup --gui') finally: endWaitCursor() diff --git a/ui4/setupdialog.py b/ui4/setupdialog.py index ef16b307a..38755a315 100644 --- a/ui4/setupdialog.py +++ b/ui4/setupdialog.py @@ -189,6 +189,7 @@ class SetupDialog(QDialog, Ui_Dialog): QTimer.singleShot(0, self.showRemovePage) else: if self.skip_discovery: + self.discovery_method = 0 # SLP QTimer.singleShot(0, self.showDevicesPage) else: QTimer.singleShot(0, self.showDiscoveryPage) @@ -941,57 +942,72 @@ class SetupDialog(QDialog, Ui_Dialog): # def addPrinter(self): - self.setupPrinter() + print_sts = self.setupPrinter() + if print_sts == cups.IPP_FORBIDDEN or print_sts == cups.IPP_NOT_AUTHENTICATED or print_sts == cups.IPP_NOT_AUTHORIZED: + pass # User doesn't have sufficient permissions so ignored. + else: + if self.fax_setup: + if self.setupFax() == cups.IPP_OK: + self.readwriteFaxInformation(False) - if self.fax_setup: - self.setupFax() - self.readwriteFaxInformation(False) + if print_sts == cups.IPP_OK: + self.flashFirmware() - if self.print_test_page: - self.printTestPage() + if self.print_test_page: + self.printTestPage() self.close() + # + # Updating firmware download for supported devices. + # + def flashFirmware(self): + if self.mq.get('fw-download', False): + try: + d = device.Device(self.device_uri) + except Error , e: + FailureUI(self, self.__tr("<b>Error opening device. Firmware download is Failed.</b><p>%s (%s)." % (e.msg, e.opt))) + else: + if d.downloadFirmware(): + log.info("Firmware download successful.\n") + else: + FailureUI(self, self.__tr("<b>Firmware download is Failed.</b>")) + d.close() + # # SETUP PRINTER/FAX # def setupPrinter(self): + status = cups.IPP_BAD_REQUEST QApplication.setOverrideCursor(QCursor(Qt.WaitCursor)) try: - cups.setPasswordPrompt("You do not have permission to add a printer.") if not os.path.exists(self.print_ppd[0]): # assume foomatic: or some such - status, status_str = cups.addPrinter(self.printer_name.encode('utf8'), self.device_uri, - self.print_location, '', self.print_ppd[0], self.print_desc) + add_prnt_args = (self.printer_name.encode('utf8'), self.device_uri, self.print_location, '', self.print_ppd[0], self.print_desc) else: - status, status_str = cups.addPrinter(self.printer_name.encode('utf8'), self.device_uri, - self.print_location, self.print_ppd[0], '', self.print_desc) + add_prnt_args = (self.printer_name.encode('utf8'), self.device_uri, self.print_location, self.print_ppd[0], '', self.print_desc) - log.debug("addPrinter() returned (%d, %s)" % (status, status_str)) - self.installed_print_devices = device.getSupportedCUPSDevices(['hp']) - - log.debug(self.installed_print_devices) - - if self.device_uri not in self.installed_print_devices or \ - self.printer_name not in self.installed_print_devices[self.device_uri]: + status, status_str = cups.cups_operation(cups.addPrinter, GUI_MODE, 'qt4', self, *add_prnt_args) + log.debug(device.getSupportedCUPSDevices(['hp'])) + if status != cups.IPP_OK: QApplication.restoreOverrideCursor() - if os.geteuid!=0 and utils.get_cups_systemgroup_list()!=[]: - FailureUI(self, self.__tr("<b>Printer queue setup failed. Could not connect to CUPS Server</b><p>Is user added to %s group(s)" %utils.list_to_string(utils.get_cups_systemgroup_list()))) + FailureUI(self, self.__tr("<b>Printer queue setup failed.</b> <p>Error : %s"%status_str)) else: # sending Event to add this device in hp-systray utils.sendEvent(EVENT_CUPS_QUEUES_CHANGED,self.device_uri, self.printer_name) finally: QApplication.restoreOverrideCursor() + return status def setupFax(self): + status = cups.IPP_BAD_REQUEST QApplication.setOverrideCursor(QCursor(Qt.WaitCursor)) try: - cups.setPasswordPrompt("You do not have permission to add a fax device.") if not os.path.exists(self.fax_ppd): status, status_str = cups.addPrinter(self.fax_name.encode('utf8'), self.fax_uri, self.fax_location, '', self.fax_ppd, self.fax_desc) @@ -999,16 +1015,11 @@ class SetupDialog(QDialog, Ui_Dialog): status, status_str = cups.addPrinter(self.fax_name.encode('utf8'), self.fax_uri, self.fax_location, self.fax_ppd, '', self.fax_desc) - log.debug("addPrinter() returned (%d, %s)" % (status, status_str)) - self.installed_fax_devices = device.getSupportedCUPSDevices(['hpfax']) - - log.debug(self.installed_fax_devices) - - if self.fax_uri not in self.installed_fax_devices or \ - self.fax_name not in self.installed_fax_devices[self.fax_uri]: + log.debug(device.getSupportedCUPSDevices(['hpfax'])) + if status != cups.IPP_OK: QApplication.restoreOverrideCursor() - FailureUI(self, self.__tr("<b>Fax queue setup failed.</b><p>Please restart CUPS and try again.")) + FailureUI(self, self.__tr("<b>Fax queue setup failed.</b><p>Error : %s"%status_str)) else: # sending Event to add this device in hp-systray utils.sendEvent(EVENT_CUPS_QUEUES_CHANGED,self.fax_uri, self.fax_name) @@ -1016,6 +1027,8 @@ class SetupDialog(QDialog, Ui_Dialog): finally: QApplication.restoreOverrideCursor() + return status + def readwriteFaxInformation(self, read=True): try: @@ -1244,8 +1257,12 @@ class SetupDialog(QDialog, Ui_Dialog): item = self.RemoveDevicesTableWidget.item(row, 1) printer = unicode(item.data(Qt.UserRole).toString()).encode('utf-8') log.debug("Removing printer: %s" % printer) - if cups.delPrinter(printer) == 0 and os.geteuid!=0 and utils.get_cups_systemgroup_list()!=[]: - FailureUI(self, self.__tr("<b>Unable to delete printer queue. Could not connect to CUPS Server</b><p>Is user added to %s group(s)" %utils.list_to_string(utils.get_cups_systemgroup_list()))) + status, status_str = cups.cups_operation(cups.delPrinter, GUI_MODE, 'qt4', self, printer) + + if status != cups.IPP_OK: + FailureUI(self, self.__tr("<b>Unable to delete '%s' queue. </b><p>Error : %s"%(printer,status_str))) + if status == cups.IPP_FORBIDDEN or status == cups.IPP_NOT_AUTHENTICATED or status == cups.IPP_NOT_AUTHORIZED: + break self.close() else: diff --git a/ui4/systemtray.py b/ui4/systemtray.py index a82cad876..a3f32dad6 100644 --- a/ui4/systemtray.py +++ b/ui4/systemtray.py @@ -357,11 +357,11 @@ class SystemTrayApp(QApplication): self.update_timer.start(UPGRADE_CHECK_DELAY) # Cleans the /var/log/hp/tmp directory - self.handle_hplip_clean() + #self.handle_hplip_clean() - self.clean_timer = QTimer() - self.clean_timer.connect(self.clean_timer,SIGNAL("timeout()"),self.handle_hplip_clean) - self.clean_timer.start(CLEAN_EXEC_DELAY) + #self.clean_timer = QTimer() + #self.clean_timer.connect(self.clean_timer,SIGNAL("timeout()"),self.handle_hplip_clean) + #self.clean_timer.start(CLEAN_EXEC_DELAY) diff --git a/uninstall.py b/uninstall.py index 8b940a859..cea174b6a 100755 --- a/uninstall.py +++ b/uninstall.py @@ -106,7 +106,7 @@ if log_level is not None: if not log.set_level(log_level): usage() -log_file = os.path.normpath('/var/log/hp/hplip-uninstall.log') +log_file = os.path.normpath('%s/hplip-uninstall.log'%prop.user_dir) if os.getuid() != 0: log.error("To run 'hp-uninstall' utility, you must have root privileges.(Try using 'sudo' or 'su -c')") sys.exit(1) diff --git a/upgrade.py b/upgrade.py index fb0b597e5..9d7cc3540 100755 --- a/upgrade.py +++ b/upgrade.py @@ -49,7 +49,7 @@ USAGE = [(__doc__, "", "name", True), ("Check only available version:","--check","option",False), ("Non-interactive mode:","-n(Without asking permissions)(future use)","option",False), ("Download Path to install from local system:","-p<path>","option", False), - ("Download HPLIP package location:","-d<path> (default location /tmp/)","option", False), + ("Download HPLIP package location:","-d<path> (default location ~/.hplip/)","option", False), ("Override existing HPLIP installation even if latest vesrion is installed:","-o","option",False), ("Take options from the file instead of command line:","-f<file> (future use)","option",False) ] @@ -107,7 +107,7 @@ log.set_module(__mod__) mode = INTERACTIVE_MODE auto = False HPLIP_PATH=None -TEMP_DIR="/tmp/" +TEMP_DIR=prop.user_dir FORCE_INSTALL=False CHECKING_ONLY=False NOTIFY=False @@ -200,7 +200,7 @@ if NOTIFY or CHECKING_ONLY: else: mod.lockInstance('upgrade',True) -log_file = os.path.normpath('/var/log/hp/hp-upgrade.log') +log_file = os.path.normpath('%s/hp-upgrade.log'%prop.user_dir) if os.path.exists(log_file): try: @@ -240,6 +240,7 @@ try: if sts is True: HPLIP_latest_ver = parse_HPLIP_version(HPLIP_Ver_file, pat) + os.unlink(HPLIP_Ver_file) if HPLIP_latest_ver == "0.0.0": log.error("Failed to get latest version of HPLIP.") clean_exit(0) |