diff options
1818 files changed, 3291 insertions, 899 deletions
diff --git a/Makefile.in b/Makefile.in index ff6b5267d..6f0d739b3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -690,10 +690,13 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-laserjet_4350-ps.ppd.gz \ prnt/ps/hp-laserjet_3300_3310_3320-ps.ppd.gz \ prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_m680-ps.ppd.gz \ prnt/ps/hp-designjet_t920-postscript.ppd.gz \ prnt/ps/hp-laserjet_4100_series-ps.ppd.gz \ prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz \ + prnt/ps/hp-designjet_t7200-ps.ppd.gz \ prnt/ps/hp-designjet_4520mfp-ps.ppd.gz \ + prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz \ prnt/ps/hp-laserjet_2410-ps.ppd.gz \ prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz \ prnt/ps/hp-laserjet_500_color_mfp_m570-ps.ppd.gz \ @@ -719,9 +722,11 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz \ prnt/ps/hp-laserjet_3380-ps.ppd.gz \ + prnt/ps/hp-designjet_t3500-ps.ppd.gz \ prnt/ps/hp-laserjet_8100_series-ps.ppd.gz \ prnt/ps/hp-laserjet_5200lx-ps.ppd.gz \ prnt/ps/hp-laserjet_2100_series-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_flow_mfp_m680-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 \ @@ -745,6 +750,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-color_laserjet_5m-ps.ppd.gz \ prnt/ps/hp-color_laserjet_5500-ps.ppd.gz \ prnt/ps/hp-laserjet_3050-ps.ppd.gz \ + prnt/ps/hp-designjet_t795ps_44in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp5225dn-ps.ppd.gz \ prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz \ prnt/ps/hp-laserjet_4345_mfp-ps.ppd.gz \ @@ -759,6 +765,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp4020_series-ps.ppd.gz \ prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2300-ps.ppd.gz \ + prnt/ps/hp-officejet_color_mfp_x585.ppd.gz \ prnt/ps/hp-laserjet_3052-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2605-ps.ppd.gz \ prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz \ @@ -789,6 +796,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-laserjet_4ml-ps.ppd.gz \ prnt/ps/hp-laserjet_8000-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2800-ps.ppd.gz \ + prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz \ prnt/ps/hp-laserjet_m9040_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_1300-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4600_series-ps.ppd.gz \ @@ -822,6 +830,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz \ prnt/ps/hp-laserjet_200_color_m251-ps.ppd.gz \ prnt/ps/hp-laserjet_p4010_series-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m651-ps.ppd.gz \ prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz \ prnt/ps/hp-laserjet_1200-ps.ppd.gz \ prnt/ps/hp-laserjet_p3005-ps.ppd.gz \ @@ -844,11 +853,14 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-color_laserjet_3700-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2500-ps.ppd.gz \ prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz \ + prnt/ps/hp-designjet_d5800-ps.ppd.gz \ prnt/ps/hp-laserjet_m5035_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_9065mfp-ps.ppd.gz \ + prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz \ prnt/ps/hp-laserjet_m2727_mfp_series-ps.ppd.gz \ prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4550-ps.ppd.gz \ + prnt/ps/hp-designjet_z6600-postscript.ppd.gz \ prnt/ps/hp-laserjet_700_m712-ps.ppd.gz \ prnt/ps/hp-laserjet_4050_series-ps.ppd.gz \ prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz \ @@ -881,6 +893,8 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp2025n-ps.ppd.gz \ prnt/ps/hp-laserjet_3020-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz \ + prnt/ps/hp-officejet_color_x555-ps.ppd.gz \ prnt/ps/hp-laserjet_m1522n_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz \ prnt/ps/hp-designjet_4020ps-ps.ppd.gz \ @@ -931,6 +945,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_p4515xm-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_pro_b8300_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m128fw-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4600_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1022-hpijs-zjs.ppd.gz \ ppd/hpijs/hp-photosmart_240_series-hpijs.ppd.gz \ @@ -944,6 +959,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-photosmart_8400_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4250-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-psc_1500_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m125nw-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4si-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_816c-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_580-hpijs.ppd.gz \ @@ -1064,6 +1080,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-photosmart_a320_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_p1566-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_r80xi-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m127fp-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_d4100_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p3004-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_p4015-hpijs.ppd.gz \ @@ -1107,6 +1124,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-deskjet_842c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1022n-hpijs-zjs.ppd.gz \ ppd/hpijs/hp-deskjet_5600-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m126nw-hpijs.ppd.gz \ ppd/hpijs/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_3840-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_6500_e710a-f-hpijs.ppd.gz \ @@ -1182,10 +1200,12 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-deskjet_5652-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_c7200_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m126a-hpijs.ppd.gz \ ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_6mp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-color_laserjet_3600-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-officejet_pro_8610-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_960c-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp1515n-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_pro_k850-hpijs.ppd.gz \ @@ -1261,6 +1281,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-laserjet_5200lx-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_4105-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m1005-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_pro_8630-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_6980_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_d7300_series-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz \ @@ -1335,6 +1356,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-laserjet_6l-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_3500-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_656c-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m128fn-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3900-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_930c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_b8500_series-hpijs.ppd.gz \ @@ -1466,6 +1488,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-officejet_series_590-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_m1216nfh_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1160-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_pro_8640-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_1125-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_540-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4ml-hpijs.ppd.gz \ @@ -1477,6 +1500,8 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-color_laserjet_9500_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_p3005-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_100-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m128fp-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m125rnw-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1320tn-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_t_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz \ @@ -1534,6 +1559,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-deskjet_f4100_series-hpijs.ppd.gz \ ppd/hpijs/hp-mopier_320-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-psc_2350_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m125a-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p1505n-hpijs-zxs.ppd.gz \ ppd/hpijs/hp-laserjet_3050-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-psc_950vr-hpijs.ppd.gz \ @@ -1574,6 +1600,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-laserjet_professional_m1218nfg_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_p1106-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_7550-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_pro_8620-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_610c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_934c-hpijs.ppd.gz \ @@ -1619,8 +1646,10 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-laserjet_p1005-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_500-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_3700-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-deskjet_4640_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3920-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3816-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_pro_8660-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_6100_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p2014-hpijs-pcl3.ppd.gz \ @@ -1763,6 +1792,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpcups/hp-deskjet_460.ppd.gz \ ppd/hpcups/hp-deskjet_4610_series.ppd.gz \ ppd/hpcups/hp-deskjet_4620_series.ppd.gz \ + ppd/hpcups/hp-deskjet_4640_series.ppd.gz \ ppd/hpcups/hp-deskjet_500.ppd.gz \ ppd/hpcups/hp-deskjet_500c.ppd.gz \ ppd/hpcups/hp-deskjet_505j.ppd.gz \ @@ -2064,8 +2094,17 @@ 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_m125a.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m125nw.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m125rnw.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m126a.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m126nw.ppd.gz \ ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m127fp.ppd.gz \ ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m128fn.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m128fp.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m128fw.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 \ @@ -2182,6 +2221,11 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpcups/hp-officejet_pro_8500_a909n.ppd.gz \ ppd/hpcups/hp-officejet_pro_8500_a910.ppd.gz \ ppd/hpcups/hp-officejet_pro_8600.ppd.gz \ + ppd/hpcups/hp-officejet_pro_8610.ppd.gz \ + ppd/hpcups/hp-officejet_pro_8620.ppd.gz \ + ppd/hpcups/hp-officejet_pro_8630.ppd.gz \ + ppd/hpcups/hp-officejet_pro_8640.ppd.gz \ + ppd/hpcups/hp-officejet_pro_8660.ppd.gz \ ppd/hpcups/hp-officejet_pro_k5300.ppd.gz \ ppd/hpcups/hp-officejet_pro_k5400.ppd.gz \ ppd/hpcups/hp-officejet_pro_k550.ppd.gz \ @@ -2634,7 +2678,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -udev_acl_rules = @udev_acl_rules@ udev_sysfs_rules = @udev_sysfs_rules@ ui_toolkit = @ui_toolkit@ @@ -2685,6 +2728,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_p4515xm-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_pro_b8300_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m128fw-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4600_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1022-hpijs-zjs.ppd.gz \ ppd/hpijs/hp-photosmart_240_series-hpijs.ppd.gz \ @@ -2698,6 +2742,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-photosmart_8400_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4250-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-psc_1500_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m125nw-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4si-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_816c-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_580-hpijs.ppd.gz \ @@ -2818,6 +2863,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-photosmart_a320_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_p1566-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_r80xi-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m127fp-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_d4100_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p3004-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_p4015-hpijs.ppd.gz \ @@ -2861,6 +2907,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_842c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1022n-hpijs-zjs.ppd.gz \ ppd/hpijs/hp-deskjet_5600-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m126nw-hpijs.ppd.gz \ ppd/hpijs/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_3840-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_6500_e710a-f-hpijs.ppd.gz \ @@ -2936,10 +2983,12 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_5652-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_c7200_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m126a-hpijs.ppd.gz \ ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_6mp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-color_laserjet_3600-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-officejet_pro_8610-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_960c-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp1515n-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_pro_k850-hpijs.ppd.gz \ @@ -3015,6 +3064,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_5200lx-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_4105-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m1005-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_pro_8630-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_6980_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_d7300_series-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz \ @@ -3089,6 +3139,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_6l-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_3500-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_656c-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m128fn-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3900-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_930c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_b8500_series-hpijs.ppd.gz \ @@ -3220,6 +3271,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_series_590-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_m1216nfh_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1160-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_pro_8640-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_1125-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_540-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4ml-hpijs.ppd.gz \ @@ -3231,6 +3283,8 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-color_laserjet_9500_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_p3005-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_100-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m128fp-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m125rnw-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1320tn-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_t_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz \ @@ -3288,6 +3342,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_f4100_series-hpijs.ppd.gz \ ppd/hpijs/hp-mopier_320-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-psc_2350_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m125a-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p1505n-hpijs-zxs.ppd.gz \ ppd/hpijs/hp-laserjet_3050-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-psc_950vr-hpijs.ppd.gz \ @@ -3328,6 +3383,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_professional_m1218nfg_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_p1106-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_7550-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_pro_8620-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_610c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_934c-hpijs.ppd.gz \ @@ -3373,8 +3429,10 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_p1005-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_500-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_3700-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-deskjet_4640_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3920-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3816-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_pro_8660-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_6100_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p2014-hpijs-pcl3.ppd.gz \ @@ -3402,10 +3460,13 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_4350-ps.ppd.gz \ prnt/ps/hp-laserjet_3300_3310_3320-ps.ppd.gz \ prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_m680-ps.ppd.gz \ prnt/ps/hp-designjet_t920-postscript.ppd.gz \ prnt/ps/hp-laserjet_4100_series-ps.ppd.gz \ prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz \ + prnt/ps/hp-designjet_t7200-ps.ppd.gz \ prnt/ps/hp-designjet_4520mfp-ps.ppd.gz \ + prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz \ prnt/ps/hp-laserjet_2410-ps.ppd.gz \ prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz \ prnt/ps/hp-laserjet_500_color_mfp_m570-ps.ppd.gz \ @@ -3431,9 +3492,11 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz \ prnt/ps/hp-laserjet_3380-ps.ppd.gz \ + prnt/ps/hp-designjet_t3500-ps.ppd.gz \ prnt/ps/hp-laserjet_8100_series-ps.ppd.gz \ prnt/ps/hp-laserjet_5200lx-ps.ppd.gz \ prnt/ps/hp-laserjet_2100_series-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_flow_mfp_m680-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 \ @@ -3457,6 +3520,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_5m-ps.ppd.gz \ prnt/ps/hp-color_laserjet_5500-ps.ppd.gz \ prnt/ps/hp-laserjet_3050-ps.ppd.gz \ + prnt/ps/hp-designjet_t795ps_44in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp5225dn-ps.ppd.gz \ prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz \ prnt/ps/hp-laserjet_4345_mfp-ps.ppd.gz \ @@ -3471,6 +3535,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_cp4020_series-ps.ppd.gz \ prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2300-ps.ppd.gz \ + prnt/ps/hp-officejet_color_mfp_x585.ppd.gz \ prnt/ps/hp-laserjet_3052-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2605-ps.ppd.gz \ prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz \ @@ -3501,6 +3566,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_4ml-ps.ppd.gz \ prnt/ps/hp-laserjet_8000-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2800-ps.ppd.gz \ + prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz \ prnt/ps/hp-laserjet_m9040_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_1300-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4600_series-ps.ppd.gz \ @@ -3534,6 +3600,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz \ prnt/ps/hp-laserjet_200_color_m251-ps.ppd.gz \ prnt/ps/hp-laserjet_p4010_series-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m651-ps.ppd.gz \ prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz \ prnt/ps/hp-laserjet_1200-ps.ppd.gz \ prnt/ps/hp-laserjet_p3005-ps.ppd.gz \ @@ -3556,11 +3623,14 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_3700-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2500-ps.ppd.gz \ prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz \ + prnt/ps/hp-designjet_d5800-ps.ppd.gz \ prnt/ps/hp-laserjet_m5035_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_9065mfp-ps.ppd.gz \ + prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz \ prnt/ps/hp-laserjet_m2727_mfp_series-ps.ppd.gz \ prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4550-ps.ppd.gz \ + prnt/ps/hp-designjet_z6600-postscript.ppd.gz \ prnt/ps/hp-laserjet_700_m712-ps.ppd.gz \ prnt/ps/hp-laserjet_4050_series-ps.ppd.gz \ prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz \ @@ -3593,6 +3663,8 @@ foomatic_ps_printers = \ prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp2025n-ps.ppd.gz \ prnt/ps/hp-laserjet_3020-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz \ + prnt/ps/hp-officejet_color_x555-ps.ppd.gz \ prnt/ps/hp-laserjet_m1522n_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz \ prnt/ps/hp-designjet_4020ps-ps.ppd.gz \ @@ -3756,6 +3828,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-deskjet_460.ppd.gz \ ppd/hpcups/hp-deskjet_4610_series.ppd.gz \ ppd/hpcups/hp-deskjet_4620_series.ppd.gz \ + ppd/hpcups/hp-deskjet_4640_series.ppd.gz \ ppd/hpcups/hp-deskjet_500.ppd.gz \ ppd/hpcups/hp-deskjet_500c.ppd.gz \ ppd/hpcups/hp-deskjet_505j.ppd.gz \ @@ -4058,8 +4131,17 @@ 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_m125a.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m125nw.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m125rnw.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m126a.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m126nw.ppd.gz \ ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m127fp.ppd.gz \ ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m128fn.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m128fp.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m128fw.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 \ @@ -4176,6 +4258,11 @@ cups_ppd_printers = \ ppd/hpcups/hp-officejet_pro_8500_a909n.ppd.gz \ ppd/hpcups/hp-officejet_pro_8500_a910.ppd.gz \ ppd/hpcups/hp-officejet_pro_8600.ppd.gz \ + ppd/hpcups/hp-officejet_pro_8610.ppd.gz \ + ppd/hpcups/hp-officejet_pro_8620.ppd.gz \ + ppd/hpcups/hp-officejet_pro_8630.ppd.gz \ + ppd/hpcups/hp-officejet_pro_8640.ppd.gz \ + ppd/hpcups/hp-officejet_pro_8660.ppd.gz \ ppd/hpcups/hp-officejet_pro_k5300.ppd.gz \ ppd/hpcups/hp-officejet_pro_k5400.ppd.gz \ ppd/hpcups/hp-officejet_pro_k550.ppd.gz \ diff --git a/base/LedmWifi.py b/base/LedmWifi.py index 59f7b6211..b41aa2335 100644 --- a/base/LedmWifi.py +++ b/base/LedmWifi.py @@ -505,7 +505,7 @@ def readXmlTagDataFromURI(dev,URI,xmlRootNode,xmlReqDataNode,timeout=5): strResp = utils.unchunck_xml_data(strResp) pos = strResp.find(xmlRootNode,0,len(strResp)) repstr = strResp[pos:].strip() - repstr = repstr.replace('\r',' ').replace('\t',' ').replace('\n',' ') # To remove formating characters from the received xml + repstr = repstr.replace('\r','').replace('\t','').replace('\n','') # To remove formating characters from the received xml repstr = repstr.rstrip('0') # To remove trailing zero from the received xml try: parser_object = utils.extendedExpat() @@ -514,7 +514,7 @@ def readXmlTagDataFromURI(dev,URI,xmlRootNode,xmlReqDataNode,timeout=5): reqDataElementList = root_element.getElementsByTagName(xmlReqDataNode) for node in reqDataElementList: repstr = node.toString() - repstr = repstr.replace('\r',' ').replace('\t',' ').replace('\n',' ') # To remove formating characters from the received xml + repstr = repstr.replace('\r','').replace('\t','').replace('\n','') # To remove formating characters from the received xml params = utils.XMLToDictParser().parseXML(repstr) paramsList.append(params) except xml.parsers.expat.ExpatError, e: @@ -566,7 +566,7 @@ def readXmlDataFromURI(dev,URI,xmlRootNode,xmlChildNode,timeout=5): strResp = utils.unchunck_xml_data(strResp) pos = strResp.find(xmlRootNode,0,len(strResp)) repstr = strResp[pos:].strip() - repstr = repstr.replace('\r',' ').replace('\t',' ').replace('\n',' ') # To remove formating characters from the received xml + repstr = repstr.replace('\r','').replace('\t','').replace('\n','') # To remove formating characters from the received xml repstr = repstr.rstrip('0') # To remove trailing zero from the received xml elementCount = repstr.count(xmlChildNode) try: diff --git a/base/avahi.py b/base/avahi.py index 85d23c20a..b3fd2aee2 100755 --- a/base/avahi.py +++ b/base/avahi.py @@ -61,7 +61,7 @@ def detectNetworkDevices(ttl=4, timeout=10): y['hn'] = bits[6].replace('.local', '') details = bits[9].split('" "') for item in details: - key, value = item.split('=') + key, value = item.split('=', 1) if key == 'ty': y['mdns'] = value y['device1'] = "MFG:Hewlett-Packard;MDL:%s;CLS:PRINTER;" % value diff --git a/base/codes.py b/base/codes.py index 3d5eb8e9a..075c90ae0 100644 --- a/base/codes.py +++ b/base/codes.py @@ -71,6 +71,19 @@ ERROR_FAX_FILE_NOT_FOUND = 57 ERROR_INVALID_ARGUMENT = 58 # --> add new codes here <-- ERROR_INTERNAL = 99 +ERROR_FILE_NOT_FOUND = 101 +ERROR_DIRECTORY_NOT_FOUND = 102 +ERROR_NO_NETWORK = 103 +ERROR_CHECKSUM_ERROR = 104 +ERROR_GPG_CMD_NOT_FOUND = 105 +ERROR_UNABLE_TO_RECV_KEYS = 106 +ERROR_DIGITAL_SIGN_NOT_FOUND = 107 +ERROR_FAILED_TO_DOWNLOAD_FILE = 107 +ERROR_DIGITAL_SIGN_BAD = 108 +ERROR_INCORRECT_PASSWORD = 109 +ERROR_UNKNOWN_VALIDATION_ERROR = 110 +ERROR_NO_SI_DEVICE = 111 +ERROR_FAILED_TO_DISABLE_SI = 112 # If you add new codes, also add the appropriate description # to g.py for exception description strings. # Thank you, The Management @@ -276,7 +289,6 @@ EVENT_ERROR_DEVICEOPEN_FAILED_DEV_NODE_MOVED = 5038 # end # diagnosis tool codes -EVENT_ADD_PRINTQUEUE = 5501 EVENT_DIAGNOSE_PRINTQUEUE = 5502 #end @@ -306,7 +318,7 @@ EVENT_FAX_MAX = 8999 # UI EVENT_MIN_UI_EVENT = 9000 -EVENT_CUPS_QUEUES_CHANGED = 9000 # sent by hp-setup if queues added (or removed) +EVENT_CUPS_QUEUES_ADDED = 9000 # sent by hp-setup if queues added EVENT_RAISE_DEVICE_MANAGER = 9001 #EVENT_JOB_STORAGE_UI_REQUEST = 9002 # sent by hplipjs CUPS filter for job storage UI EVENT_HISTORY_UPDATE = 9003 # sent by hp-systray to hp-toolbox when a device's history changes @@ -321,6 +333,7 @@ EVENT_DEVICE_UPDATE_ACTIVE = 9030 EVENT_DEVICE_UPDATE_INACTIVE = 9031 EVENT_DEVICE_UPDATE_BLIP = 9032 EVENT_SYSTEMTRAY_EXIT = 9040 +EVENT_CUPS_QUEUES_REMOVED = 9041 # sent by hp-setup if queues removed EVENT_MAX_UI_EVENT = 9999 EVENT_MAX_EVENT = 9999 @@ -592,10 +605,13 @@ AGENT_TYPE_K_Y = 14 # black and yellow (for LJ Pro) AGENT_TYPE_C_M = 15 # cyan and magenta (for LJ Pro) AGENT_TYPE_LG_PK = 16 # light grey and photo black AGENT_TYPE_LG = 17 # light grey -AGENT_TYPE_G = 18 # medium grey +AGENT_TYPE_G = 18 # grey AGENT_TYPE_PG = 19 # photo grey AGENT_TYPE_PHOTO_BLACK = 20 # photo black AGENT_TYPE_MATTE_BLACK = 21 # matte black +AGENT_TYPE_LC = 22 #light cyan +AGENT_TYPE_LM = 23 #light magenta +AGENT_TYPE_DG = 24 #dark gray AGENT_TYPE_BLACK_B8800 = 39 # For PS B8800 AGENT_TYPE_WHITE = 0x20 # For ISO 10180 compatibility AGENT_TYPE_RED = 0x21 # For ISO 10180 compatibility diff --git a/base/device.py b/base/device.py index 0a0f62b0f..a9df7274a 100644 --- a/base/device.py +++ b/base/device.py @@ -45,7 +45,7 @@ import pml import status from prnt import pcl, ldl, cups from base import models, mdns, slp, avahi -from strings import StringTable +from strings import * http_result_pat = re.compile("""HTTP/\d.\d\s(\d+)""", re.I) @@ -375,7 +375,7 @@ def makeURI(param, port=1): result_code, uri = hpmudext.make_net_uri(param, port) if result_code == hpmudext.HPMUD_R_OK and uri: - uri = uri.replace("ip","hostname") + uri = uri.replace("ip=","hostname=") log.debug("Found: %s" % uri) found = True cups_uri = uri @@ -909,75 +909,6 @@ def validateFilterList(filter): return True -# -# UI String Queries (why is this here?) -# - -inter_pat = re.compile(r"""%(.*)%""", re.IGNORECASE) -st = StringTable() -strings_init = False - - -def initStrings(): - global strings_init, st - strings_init = True - cycles = 0 - - while True: - found = False - - for s in st.string_table: - short_string, long_string = st.string_table[s] - short_replace, long_replace = short_string, long_string - - try: - short_match = inter_pat.match(short_string).group(1) - except (AttributeError, TypeError): - short_match = None - - if short_match is not None: - found = True - - try: - short_replace, dummy = st.string_table[short_match] - except KeyError: - log.error("String interpolation error: %s" % short_match) - - try: - long_match = inter_pat.match(long_string).group(1) - except (AttributeError, TypeError): - long_match = None - - if long_match is not None: - found = True - - try: - dummy, long_replace = st.string_table[long_match] - except KeyError: - log.error("String interpolation error: %s" % long_match) - - if found: - st.string_table[s] = (short_replace, long_replace) - - if not found: - break - else: - cycles +=1 - if cycles > 1000: - break - - -def queryString(string_id, typ=0): - if not strings_init: - initStrings() - - #log.debug("queryString(%s)" % string_id) - s = st.string_table.get(str(string_id), ('', ''))[typ] - - if type(s) == type(''): - return s - - return s() AGENT_types = { AGENT_TYPE_NONE : 'invalid', @@ -999,12 +930,16 @@ AGENT_types = { AGENT_TYPE_NONE : 'invalid', #AGENT_TYPE_C_K : 'cyan_and_black', AGENT_TYPE_LG_PK : 'light_gray_and_photo_black', AGENT_TYPE_LG : 'light_gray', - AGENT_TYPE_G : 'medium_gray', + AGENT_TYPE_G : 'gray', + AGENT_TYPE_DG : 'dark_gray', AGENT_TYPE_PG : 'photo_gray', AGENT_TYPE_C_M : 'cyan_and_magenta', AGENT_TYPE_K_Y : 'black_and_yellow', AGENT_TYPE_PHOTO_BLACK : 'photo_black', + AGENT_TYPE_LC : 'light_cyan', + AGENT_TYPE_LM : 'light_magenta', AGENT_TYPE_MATTE_BLACK : 'matte_black', + AGENT_TYPE_RED : 'red', AGENT_TYPE_UNSPECIFIED : 'unspecified', # Kind=5,6 } @@ -160,13 +160,8 @@ class State(ConfigBase): class UserConfig(ConfigBase): def __init__(self): - 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)) - + sts, prop.user_dir = os_utils.getHPLIPDir() + if not os.geteuid() == 0: prop.user_config_file = os.path.join(prop.user_dir, 'hplip.conf') diff --git a/base/os_utils.py b/base/os_utils.py index 7969ca21d..0a3c52bef 100644 --- a/base/os_utils.py +++ b/base/os_utils.py @@ -22,6 +22,7 @@ # Global import import os import os.path +import stat #Local from base import logger @@ -45,3 +46,39 @@ def getFileSize(filename): return os.path.getsize(filename) + +def getHPLIPDir(): + homedir = os.path.expanduser('~') + hplipdir = os.path.join(homedir, ".hplip") + status = 0 + + if not os.path.exists(hplipdir): + try: + os.umask(0) + s = os.stat(homedir) + os.mkdir(hplipdir, 0755) + os.chown(hplipdir, s[stat.ST_UID], s[stat.ST_GID]) + except OSError: + status = 1 + log.error("Failed to create %s" % hplipdir) + + return status, hplipdir + +def changeOwner(path, user, group, Recursive = False ): + status = 0 + try: + if Recursive: + for root, dirs, files in os.walk(path): + for dr in dirs: + os.chown(os.path.join(root, dr), user, group) + for fl in files: + os.chown(os.path.join(root, fl), user, group) + else: + os.chown(path, user, group) + except OSError: + status = 1 + log.error("Failed to change ownership of %s" %path) + + return status + + diff --git a/base/password.py b/base/password.py index bfd244055..97049f5ae 100644 --- a/base/password.py +++ b/base/password.py @@ -76,7 +76,8 @@ def get_distro_name(): name = os.popen('lsb_release -i | cut -f 2') os_name = name.read().strip() name.close() - else: + + if not os_name: name = os.popen("cat /etc/issue | awk '{print $1}' | head -n 1") os_name = name.read().strip() name.close() @@ -176,7 +177,7 @@ class Password(object): ok, ret = False, '' try: - child = pexpect.spawn(cmd, timeout=1) + child = pexpect.spawn(cmd, timeout=timeout) except pexpect.ExceptionPexpect: return 1, '' @@ -193,7 +194,7 @@ class Password(object): # output start = time.time() log.log_to_file(cb) - log.debug(cb) + #log.debug(cb) output.write(cb) if i == 0: # EOF diff --git a/base/queues.py b/base/queues.py index c19e3883f..cec58bfca 100755 --- a/base/queues.py +++ b/base/queues.py @@ -335,8 +335,8 @@ def main_function(passwordObj = None, mode = GUI_MODE, ui_toolkit= UI_TOOLKIT_QT log.debug("Single print queue is configured for '%s'. " %val[0].PrinterName) reconfigure_Queue(val[0], mode) - SI_sts = smart_install.disable(mode, '', None, None, passwordObj) - if SI_sts != smart_install.SIH_NO_SI_DEVICES: + SI_sts, error_str = smart_install.disable(mode, '', None, None, passwordObj) + if SI_sts != ERROR_NO_SI_DEVICE: Error_Found = True if Error_Found is False: @@ -383,8 +383,8 @@ def main_function(passwordObj = None, mode = GUI_MODE, ui_toolkit= UI_TOOLKIT_QT log.debug("Single print queue is configured for '%s'. " %val[0].PrinterName) 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: + SI_sts, error_str = smart_install.disable(mode, ui_toolkit, dialog, app, passwordObj) + if SI_sts != ERROR_NO_SI_DEVICE: Error_Found = True if Error_Found is False: diff --git a/base/smart_install.py b/base/smart_install.py index a9e96b05d..6d9e04f3a 100755 --- a/base/smart_install.py +++ b/base/smart_install.py @@ -30,19 +30,15 @@ import os # Local from base.g import * from base import utils, tui +from base import password, validation +from base.codes import * +from base.strings import * ##### Global variables ### HPLIP_INFO_SITE ="http://hplip.sourceforge.net/hplip_web.conf" -SIH_DISABLED_SUCCESSFULLY = 0 -SIH_NO_SI_DEVICES = 1 -SIH_FAILED_TO_DISABLE = 2 -SIH_FAILED_TO_DOWNLOAD = 3 -SIH_FAILED_TO_VERIFY_DIG_SIGN = 4 -SIH_FAILED_TO_IMPORT_UI = 5 -SIH_VERIFIED_DIG_SIGN = 6 ########### methods ########### @@ -154,12 +150,26 @@ def get_SmartInstall_tool_info(): return url, file_name +def validate(mode, smart_install_run, smart_install_asc, req_checksum=''): + #Validate Checksum + calc_checksum = utils.get_checksum(open(smart_install_run, 'r').read()) + log.debug("File checksum=%s" % calc_checksum) + + if req_checksum and req_checksum != calc_checksum: + return ERROR_FILE_CHECKSUM, queryString(ERROR_CHECKSUM_ERROR, 0, plugin_file) + + + #Validate Digital signatures + gpg_obj = validation.GPG_Verification() + digsig_sts, error_str = gpg_obj.validate(smart_install_run, smart_install_asc) + + return digsig_sts, smart_install_run, smart_install_asc, error_str def download(mode, passwordObj): if not utils.check_network_connection(): log.error("Internet connection not found.") - return SIH_FAILED_TO_DOWNLOAD, "" , "" + return ERROR_NO_NETWORK, "" , "" ,queryString(ERROR_NO_NETWORK) else: sts, HPLIP_file = utils.download_from_network(HPLIP_INFO_SITE) @@ -168,30 +178,21 @@ def download(mode, passwordObj): source = hplip_si_conf.get("SMART_INSTALL","url","") if not source: log.error("Failed to download %s."%HPLIP_INFO_SITE) - return SIH_FAILED_TO_DOWNLOAD, "" , "" + return ERROR_FAILED_TO_DOWNLOAD_FILE, "" , "", queryString(ERROR_FAILED_TO_DOWNLOAD_FILE, 0, HPLIP_INFO_SITE) sts, smart_install_run = utils.download_from_network(source) if not sts: log.error("Failed to download %s."%source) - return SIH_FAILED_TO_DOWNLOAD, "" , "" + return ERROR_FAILED_TO_DOWNLOAD_FILE, "" , "", queryString(ERROR_FAILED_TO_DOWNLOAD_FILE, 0, source) sts, smart_install_asc = utils.download_from_network(source+'.asc') if not sts: log.error("Failed to download %s."%(source+'.asc')) - return SIH_FAILED_TO_VERIFY_DIG_SIGN, smart_install_run , "" + return ERROR_FAILED_TO_DOWNLOAD_FILE, "" , "", queryString(ERROR_FAILED_TO_DOWNLOAD_FILE, 0, source + ".asc") - if passwordObj == None: - try: - from base.password import Password - except ImportError: - return SIH_FAILED_TO_VERIFY_DIG_SIGN, smart_install_run , "" - passwordObj = Password(mode) + digsig_sts, smart_install_run, smart_install_asc, error_str = validate(mode, smart_install_run, smart_install_asc) - if utils.ERROR_NONE == utils.validateDownloadFile(smart_install_run, smart_install_asc,"",passwordObj): - return SIH_VERIFIED_DIG_SIGN, smart_install_run, smart_install_asc - else: - log.error("GPG verification failed for %s ."%source) - return SIH_FAILED_TO_VERIFY_DIG_SIGN, smart_install_run, smart_install_asc + return digsig_sts, smart_install_run, smart_install_asc, error_str def disable(mode, ui_toolkit='qt4', dialog=None, app=None, passwordObj = None): @@ -199,9 +200,10 @@ def disable(mode, ui_toolkit='qt4', dialog=None, app=None, passwordObj = None): dev_list = get_smartinstall_enabled_devices() if not dev_list: log.debug("No Smart Install Device found") - return SIH_NO_SI_DEVICES + return ERROR_NO_SI_DEVICE, queryString(ERROR_NO_SI_DEVICE) - return_val = SIH_FAILED_TO_DISABLE + return_val = ERROR_FAILED_TO_DISABLE_SI + return_error_str = queryString(ERROR_FAILED_TO_DISABLE_SI) url, file_name = get_SmartInstall_tool_info() printer_names = utils.list_to_string(dev_list) @@ -218,7 +220,7 @@ def disable(mode, ui_toolkit='qt4', dialog=None, app=None, passwordObj = None): else: #qt4 if not utils.canEnterGUIMode4(): log.error("%s requires GUI support . Is Qt4 installed?" % __mod__) - return SIH_FAILED_TO_DISABLE + return ERROR_FAILED_TO_DISABLE_SI, queryString(ERROR_FAILED_TO_DISABLE_SI) if dialog and app: # If QT app already opened, re-using same object dialog.init(printer_names, "", QUEUES_SMART_INSTALL_ENABLED) @@ -245,33 +247,41 @@ def disable(mode, ui_toolkit='qt4', dialog=None, app=None, passwordObj = None): response, value = tui.enter_choice("Do you want to download and disable smart install?(y=yes*, n=no):",['y', 'n'], 'y') if not response or value != 'y': #User exit - return_val = SIH_FAILED_TO_DISABLE + return_val = ERROR_FAILED_TO_DISABLE_SI + return_error_str = queryString(ERROR_FAILED_TO_DISABLE_SI) else: - sts, smart_install_run, smart_install_asc = download(mode, passwordObj) - if sts == SIH_FAILED_TO_VERIFY_DIG_SIGN: + sts, smart_install_run, smart_install_asc, error_str = download(mode, passwordObj) + disable_si = False + return_val = sts + if sts == ERROR_SUCCESS: + disable_si = True + elif sts in (ERROR_UNABLE_TO_RECV_KEYS, ERROR_DIGITAL_SIGN_NOT_FOUND): response, value = tui.enter_yes_no("Digital Sign verification failed, Do you want to continue?") if not response or not value: - return_val = SIH_FAILED_TO_VERIFY_DIG_SIGN + sys.exit(0) else: # Continue without validation succes. - sts = SIH_VERIFIED_DIG_SIGN + disable_si = True + else: + return_error_str = queryString(sts) - if sts == SIH_VERIFIED_DIG_SIGN: + if disable_si: sts, out = utils.run("sh %s"%smart_install_run) # Once smart install disabler installation completed, cross verifying to ensure no smart install devices found if sts or check_SmartInstall(): - log.error("Failed to disable smart install.") + log.error("Failed to disable smart install .") log.error("Please refer link \'%s\' to disable manually"%url) + return_val = ERROR_FAILED_TO_DISABLE_SI + return_error_str = queryString(ERROR_FAILED_TO_DISABLE_SI) else: log.info("Smart install disabled successfully.") - return_val = SIH_DISABLED_SUCCESSFULLY - else: - return_val = sts + return_val = ERROR_SUCCESS + return_error_str = "" except KeyboardInterrupt: log.error("User exit") sys.exit(0) - return return_val + return return_val ,return_error_str diff --git a/base/status.py b/base/status.py index f69f2cce2..7ce31a699 100644 --- a/base/status.py +++ b/base/status.py @@ -419,7 +419,12 @@ COLORANT_INDEX_TO_AGENT_TYPE_MAP = { 'black' : AGENT_TYPE_BLACK, 'photoblack': AGENT_TYPE_PHOTO_BLACK, 'matteblack' : AGENT_TYPE_MATTE_BLACK, - 'gray' : AGENT_TYPE_LG, + 'lightgray' : AGENT_TYPE_LG, + 'gray': AGENT_TYPE_G, + 'darkgray': AGENT_TYPE_DG, + 'lightcyan': AGENT_TYPE_LC, + 'lightmagenta': AGENT_TYPE_LM, + 'red' : AGENT_TYPE_RED, } MARKER_SUPPLES_TYPE_TO_AGENT_KIND_MAP = { @@ -1526,7 +1531,11 @@ def StatusType10FetchUrl(func, url, footer=""): else: data = func(url, data_fp) if data: - data = data.split('\r\n\r\n', 1)[1] + while data.find('\r\n\r\n') != -1: + data = data.split('\r\n\r\n', 1)[1] + if not data.startswith("HTTP"): + break + if data: data = ExtractXMLData(data) return data diff --git a/base/strings.py b/base/strings.py index 6766052bc..803691be5 100644 --- a/base/strings.py +++ b/base/strings.py @@ -34,6 +34,19 @@ class StringTable: 'unknown' : (self.__tr('Unknown'), ''), 'try_again' : ('', self.__tr('Please correct the problem and try again')), 'press_continue' : ('',self.__tr('Please correct the problem and press continue on the printer')), + 'unable_validate' : (self.__tr('Unable to validate'), ''), + '101' : (self.__tr('<STR1> file not found'), ''), + '102' : (self.__tr('<STR1> directory not found'), ''), + '103' : (self.__tr('Unable to connect to network. Please check your network connection and try again'), ''), + '104' : (self.__tr('<STR1> file does not match its checksum. File may have been corrupted or altered'), ''), + '105' : (self.__tr('GPG command not found'), ''), + '106' : (self.__tr('Unable to recieve key from keyserver'), ''), + '107' : (self.__tr('Failed to download <STR1>'), ''), + '108' : (self.__tr('Digital signature verification failed for the file <STR1>. File may have been corrupted or altered'), ''), + '109' : (self.__tr('Incorrect password'), ''), + '110' : (self.__tr('Unknown error'), ''), + '111' : (self.__tr('No device found having smart install enabled'), ''), + '112' : (self.__tr('Failed to disable smart install'), ''), '500' : (self.__tr('Started a print job'), ''), '501' : (self.__tr('Print job has completed'), ''), '502' : (self.__tr("Print job failed - required plug-in not found"), self.__tr("Please run hp-plugin (as root) to install the required plug-in")), @@ -180,12 +193,13 @@ class StringTable: '5026' : (self.__tr("Device status not available"), ''), '5031' : ('%5021%', ''), '5034' : (self.__tr('Device does not support requested operation'), '%try_again%'), - '5501' : (self.__tr('Device added'), ''), '6000' : (self.__tr('Photocard unload started'), ''), '6001' : (self.__tr('Photocard unload ended'), ''), '6002' : (self.__tr('Photocard unload failed'), self.__tr('Make sure photocard is inserted properly and try again')), '6003' : (self.__tr('Unable to mount photocard on device'), '%6002%'), '6004' : (self.__tr('Photocard unloaded successfully'), ''), + '9000' : (self.__tr('Device Added'), ''), + '9041' : (self.__tr('Device Removed'), ''), 'unknown_error' : (self.__tr('Unknown error'), ''), 'print' : (self.__tr('Print'), ''), 'scan' : (self.__tr('Scan'), ''), @@ -210,21 +224,33 @@ class StringTable: 'agent_cyan_head' : (self.__tr('Cyan print head'), ''), 'agent_cyan_supply' : (self.__tr('Cyan ink cartridge'), ''), 'agent_cyan_cartridge' : (self.__tr('Cyan cartridge'), ''), + 'agent_light_cyan_head' : (self.__tr('Light Cyan print head'), ''), + 'agent_light_cyan_supply' : (self.__tr('Light Cyan ink cartridge'), ''), + 'agent_light_cyan_cartridge' : (self.__tr('Light Cyan cartridge'), ''), 'agent_magenta_head' : (self.__tr('Magenta print head'), ''), 'agent_magenta_supply' : (self.__tr('Magenta ink cartridge'), ''), 'agent_magenta_cartridge':(self.__tr('Magenta cartridge'), ''), 'agent_yellow_head' : (self.__tr('Yellow print head'), ''), 'agent_yellow_supply' : (self.__tr('Yellow ink cartridge'), ''), 'agent_yellow_cartridge': (self.__tr('Yellow cartridge'), ''), + 'agent_red_head' : (self.__tr('Red print head'), ''), + 'agent_red_supply' : (self.__tr('Red ink cartridge'), ''), + 'agent_red_cartridge': (self.__tr('Red cartridge'), ''), 'agent_photo_black_head' : (self.__tr('Photo Black print head'), ''), 'agent_photo_black_supply' : (self.__tr('Photo Black ink cartridge'), ''), 'agent_photo_black_cartridge': (self.__tr('Photo Black cartridge'), ''), 'agent_matte_black_head' : (self.__tr('Matte Black print head'), ''), 'agent_matte_black_supply' : (self.__tr('Matte Black ink cartridge'), ''), 'agent_matte_black_cartridge': (self.__tr('Matte Black cartridge'), ''), - 'agent_light_gray_head' : (self.__tr('Gray print head'), ''), - 'agent_light_gray_supply' : (self.__tr('Gray ink cartridge'), ''), - 'agent_light_gray_cartridge': (self.__tr('Gray cartridge'), ''), + 'agent_gray_head' : (self.__tr('Gray print head'), ''), + 'agent_gray_supply' : (self.__tr('Gray ink cartridge'), ''), + 'agent_gray_cartridge': (self.__tr('Gray cartridge'), ''), + 'agent_light_gray_head' : (self.__tr('Light Gray print head'), ''), + 'agent_light_gray_supply' : (self.__tr('Light Gray ink cartridge'), ''), + 'agent_light_gray_cartridge': (self.__tr('Light Gray cartridge'), ''), + 'agent_dark_gray_head' : (self.__tr('Dark Gray print head'), ''), + 'agent_dark_gray_supply' : (self.__tr('Dark Gray ink cartridge'), ''), + 'agent_dark_gray_cartridge': (self.__tr('Dark Gray cartridge'), ''), 'agent_photo_cyan_head' : (self.__tr('Photo cyan print head'), ''), 'agent_photo_cyan_supply' : (self.__tr('Photo cyan ink cartridge'), ''), 'agent_photo_cyan_cartridge' : (self.__tr('Photo cyan cartridge'), ''), @@ -302,3 +328,81 @@ class StringTable: def __tr(self,s,c = None): return s + +import re +from base import logger +log = logger.Logger('', logger.Logger.LOG_LEVEL_INFO, logger.Logger.LOG_TO_CONSOLE) + +inter_pat = re.compile(r"""%(.*)%""", re.IGNORECASE) +st = StringTable() +strings_init = False + + +def initStrings(): + global strings_init, st + strings_init = True + cycles = 0 + + while True: + found = False + + for s in st.string_table: + short_string, long_string = st.string_table[s] + short_replace, long_replace = short_string, long_string + + try: + short_match = inter_pat.match(short_string).group(1) + except (AttributeError, TypeError): + short_match = None + + if short_match is not None: + found = True + + try: + short_replace, dummy = st.string_table[short_match] + except KeyError: + log.error("String interpolation error: %s" % short_match) + + try: + long_match = inter_pat.match(long_string).group(1) + except (AttributeError, TypeError): + long_match = None + + if long_match is not None: + found = True + + try: + dummy, long_replace = st.string_table[long_match] + except KeyError: + log.error("String interpolation error: %s" % long_match) + + if found: + st.string_table[s] = (short_replace, long_replace) + + if not found: + break + else: + cycles +=1 + if cycles > 1000: + break + + +def queryString(string_id, typ=0, str1=None, str2=None): + if not strings_init: + initStrings() + + s = st.string_table.get(str(string_id), ('', ''))[typ] + + if str1 is not None: + s = s.replace("<STR1>", str1) + elif "<STR" in s: + raise Exception("Substitution string needed for this string. <STRING: %s>" %s) + + if str2 is not None: + s = s.replace("<STR2>", str2) + + if type(s) == type(''): + return s + + return s() + diff --git a/base/utils.py b/base/utils.py index 205c175bb..95d36cf1e 100644 --- a/base/utils.py +++ b/base/utils.py @@ -2222,9 +2222,9 @@ def Is_Process_Running(process_name): if output: for p in output.splitlines(): - cmd = "echo %s | awk {'print $2'}" %p + cmd = "echo '%s' | awk {'print $2'}" %p status,pid = commands.getstatusoutput(cmd) - cmd = "echo %s | awk {'print $11,$12'}" %p + cmd = "echo '%s' | awk {'print $11,$12'}" %p status,cmdline = commands.getstatusoutput(cmd) if pid : process[pid] = cmdline @@ -2250,36 +2250,3 @@ def remove(path, passwordObj = None, cksudo = False): log.debug("Failed to remove=%s "%path) -def validateDownloadFile(downloaded_file, digsig_file, req_checksum='', passwordObj = None): - calc_checksum = get_checksum(file(downloaded_file, 'r').read()) - log.debug("File checksum=%s" % calc_checksum) - - if req_checksum and req_checksum != calc_checksum: - return ERROR_FILE_CHECKSUM - - gpg = which('gpg',True) - if gpg: - cmd = '%s --no-permission-warning --keyserver pgp.mit.edu --recv-keys 0xA59047B9' % gpg - if passwordObj: - cmd = passwordObj.getAuthCmd()%cmd - - log.info("Receiving digital keys: %s" % cmd) - status, output = run(cmd, passwordObj) - log.debug(output) - - if status != 0: - return ERROR_UNABLE_TO_RECV_KEYS - - cmd = '%s --no-permission-warning --verify %s %s' % (gpg, digsig_file, downloaded_file) - if passwordObj: - cmd = passwordObj.getAuthCmd()%cmd - - log.debug("Verifying plugin with digital keys: %s" % cmd) - status, output = run(cmd,passwordObj) - log.debug(output) - log.debug("%s status: %d" % (gpg, status)) - - if status != 0: - return ERROR_DIGITAL_SIGN_BAD - - return ERROR_NONE diff --git a/base/validation.py b/base/validation.py index da60c5ed3..f2a493acc 100644 --- a/base/validation.py +++ b/base/validation.py @@ -17,27 +17,19 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Author: Amarnath Chitumalla +# Author: Amarnath Chitumalla, Sanjay Kumar # #Global imports import os +import stat #Local imports +from base.codes import * +from base.strings import * from base import utils +from base import os_utils from base.g import * - - -# GPGP validation errors -DIGSIG_ERROR_NONE = 0 -DIGSIG_ERROR_FILE_NOT_FOUND = 1 -DIGSIG_ERROR_DIGITAL_SIGN_NOT_FOUND = 2 -DIGSIG_ERROR_DIGITAL_SIGN_BAD = 3 -DIGSIG_ERROR_UNABLE_TO_RECV_KEYS = 4 -DIGSIG_ERROR_GPG_CMD_NOT_FOUND = 5 -DIGSIG_ERROR_INCORRECT_PASSWORD = 6 - - -DIGSIG_ERROR_GPG_CMD_NOT_FOUND_STR ="GPG Command Not Found" +from subprocess import Popen, PIPE class DigiSign_Verification(object): def __init__(self): @@ -48,56 +40,82 @@ class DigiSign_Verification(object): class GPG_Verification(DigiSign_Verification): + def __init__(self, pgp_site = 'pgp.mit.edu', key = 0xA59047B9): self.__pgp_site = pgp_site self.__key = key self.__gpg = utils.which('gpg',True) - if not self.__gpg: - raise Exception(DIGSIG_ERROR_GPG_CMD_NOT_FOUND_STR) + sts, self.__hplipdir = os_utils.getHPLIPDir() + self.__gpg_dir = os.path.join(self.__hplipdir, ".gnupg") + + if not os.path.exists(self.__gpg_dir): + try: + os.mkdir(self.__gpg_dir, 0755) + except OSError: + log.error("Failed to create %s" % self.__gpg_dir) + + self.__change_owner() + + + def __change_owner(self, Recursive = False): + try: + os.umask(0) + s = os.stat(self.__hplipdir) + + #When validation is done is sudo mode, files and directories created will have root as owner. + #Changing the ownership back to normal user otherwise next validation operation will fail when run as normal user. + os_utils.changeOwner(self.__gpg_dir, s[stat.ST_UID], s[stat.ST_GID], Recursive) + + except OSError: + log.error("Failed to Change ownership of %s" %self.__gpg_dir) + + def __gpg_check(self, hplip_package, hplip_digsig): - def __gpg_check(self, hplip_package, hplip_digsig, passwordObj): - cmd = '%s --no-permission-warning --verify %s %s' % (self.__gpg, hplip_digsig, hplip_package) - cmd = passwordObj.getAuthCmd()%cmd - log.debug("Verifying file %s with digital keys: %s" % (hplip_package,cmd)) + cmd = '%s --homedir %s -no-permission-warning --verify %s %s' % (self.__gpg, self.__gpg_dir, hplip_digsig, hplip_package) + + log.debug("Verifying file %s : cmd = [%s]" % (hplip_package,cmd)) + + status, output = utils.run(cmd) - status, output = utils.run(cmd, passwordObj) log.debug("%s status: %d output:%s" % (self.__gpg, status,output)) + return status - def acquire_gpg_key(self, passwordObj): - cmd = '%s --no-permission-warning --keyserver %s --recv-keys 0x%X' \ - % (self.__gpg, self.__pgp_site, self.__key) + def __acquire_gpg_key(self): - cmd = passwordObj.getAuthCmd()%cmd - log.info("Receiving digital keys: %s" % cmd) + cmd = '%s --homedir %s --no-permission-warning --keyserver %s --recv-keys 0x%X' \ + % (self.__gpg, self.__gpg_dir, self.__pgp_site, self.__key) - status, output = utils.run(cmd, passwordObj) + log.info("Receiving digital keys: %s" % cmd) + status, output = utils.run(cmd) log.debug(output) + + self.__change_owner(True) + return status - def validate(self, hplip_package, hplip_digsig, passwordObj): + def validate(self, hplip_package, hplip_digsig): + + log.debug("Validating %s with %s signature file" %(hplip_package, hplip_digsig)) + if not self.__gpg: + return ERROR_GPG_CMD_NOT_FOUND, queryString(ERROR_GPG_CMD_NOT_FOUND) + if not os.path.exists(hplip_package): - log.error("%s file doesn't exists." %(hplip_package)) - return DIGSIG_ERROR_FILE_NOT_FOUND + return ERROR_FILE_NOT_FOUND, queryString(ERROR_FILE_NOT_FOUND, 0, hplip_package) if not os.path.exists(hplip_digsig): - log.warn("%s file doesn't exists." %(hplip_digsig)) - return DIGSIG_ERROR_DIGITAL_SIGN_NOT_FOUND - - log.info(log.bold("\n\nNeed authentication to validate HPLIP package.")) - if not passwordObj.getPassword(): - return DIGSIG_ERROR_INCORRECT_PASSWORD + return ERROR_DIGITAL_SIGN_NOT_FOUND, queryString(ERROR_DIGITAL_SIGN_NOT_FOUND, 0, hplip_digsig) - status = self.acquire_gpg_key(passwordObj) + status = self.__acquire_gpg_key() if status != 0: - return DIGSIG_ERROR_UNABLE_TO_RECV_KEYS + return ERROR_UNABLE_TO_RECV_KEYS, queryString(ERROR_UNABLE_TO_RECV_KEYS) - status = self.__gpg_check(hplip_package, hplip_digsig, passwordObj) + status = self.__gpg_check(hplip_package, hplip_digsig) if status != 0: - return DIGSIG_ERROR_DIGITAL_SIGN_BAD + return ERROR_DIGITAL_SIGN_BAD, queryString(ERROR_DIGITAL_SIGN_BAD, 0, hplip_package) else: - return DIGSIG_ERROR_NONE + return ERROR_SUCCESS, "" diff --git a/common/utils.c b/common/utils.c index c8f8b10c8..2bad6e866 100644 --- a/common/utils.c +++ b/common/utils.c @@ -245,4 +245,30 @@ int createTempFile(char* szFileName, FILE** pFilePtr) } return iFD; -}
\ No newline at end of file +} + +int getHPLogLevel() +{ + FILE *fp; + char str[258]; + char *p; + int iLogLevel = 0; + fp = fopen ("/etc/cups/cupsd.conf", "r"); + if (fp == NULL) + return 0; + while (!feof (fp)) + { + if (!fgets (str, 256, fp)) + { + break; + } + if ((p = strstr (str, "hpLogLevel"))) + { + p += strlen ("hpLogLevel") + 1; + iLogLevel = atoi (p); + break; + } + } + fclose (fp); + return iLogLevel; +} diff --git a/common/utils.h b/common/utils.h index 89d9700e8..0ffecc24d 100644 --- a/common/utils.h +++ b/common/utils.h @@ -13,6 +13,8 @@ #define UTILS_LINE_SIZE 256 /* Length of a line. */ #define UTILS_BUFFER_SIZE 16384 /* General Read/Write buffer. */ +#define MAX_FILE_PATH_LEN 512 + #define PRNT_PLUGIN_LJ "lj.so" #define PRNT_PLUGIN_HBPL1 "hbpl1.so" #define SCAN_PLUGIN_MARVELL "bb_marvell.so" @@ -149,6 +151,7 @@ extern "C" { */ int createTempFile(char* szFileName, FILE** pFilePtr); + int getHPLogLevel(); #ifdef __cplusplus } diff --git a/config_usb_printer.py b/config_usb_printer.py index 368c0655d..f6f42b847 100755 --- a/config_usb_printer.py +++ b/config_usb_printer.py @@ -20,81 +20,24 @@ # Author: Amarnath Chitumalla # -__version__ = '1.1' -__title__ = 'HP device setup using USB' +__version__ = '1.2' +__title__ = 'HP device config using USB' __mod__ = 'hp-config_usb_printer' -__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." +__doc__ = "Udev invokes this tool. Tool detects the plugin, Smart Install (C/DVD-ROM) issues and notifies to logged-in user. Tool also downloads firmware to the device." # Std Lib import sys import os -import getopt -import commands -import re -import time # Local from base.g import * -from base import device,utils, tui, models,module, services, os_utils -from prnt import cups +from base import device, utils, module, services from installer import pluginhandler -LPSTAT_PAT = re.compile(r"""(\S*): (.*)""", re.IGNORECASE) -USB_PATTERN = re.compile(r'''serial=(.*)''',re.IGNORECASE) -BACK_END_PATTERN = re.compile(r'''(.*):(.*)''',re.IGNORECASE) -USB_SERIAL_INTERFACE = re.compile(r'''(.*)&interface.*''',re.IGNORECASE) -DBUS_SERVICE='com.hplip.StatusService' -DBUS_AVIALABLE=False +DBUS_SERVICE = 'com.hplip.StatusService' +DBUS_AVIALABLE = False ##### METHODS ##### - -# remove queues using cups API -def remove_queues(arg_queues_list): - for queue_name in arg_queues_list: - cups.delPrinter(queue_name) - - -#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:/") 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("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: - hp_conf_queues.append(printer_name) - - except AttributeError: - pass - - 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 - sts, output = utils.run('lpstat -r') - if sts == 0 and ('is running' in output): - cups_running_sts = True - - return cups_running_sts - # Send dbus event to hpssd on dbus system bus def send_message(device_uri, printer_name, event_code, username, job_id, title, pipe_name=''): if DBUS_AVIALABLE == False: @@ -138,17 +81,15 @@ def start_systray(): USAGE = [ (__doc__, "", "name", True), - ("Usage: %s [OPTIONS] [SERIAL NO.|USB bus:device]" % __mod__, "", "summary", True), + ("Usage: %s [OPTIONS] [USB bus:device]" % __mod__, "", "summary", True), utils.USAGE_OPTIONS, utils.USAGE_LOGGING1, utils.USAGE_LOGGING2, utils.USAGE_LOGGING3, utils.USAGE_HELP, - ("[SERIAL NO.|USB bus:device]", "", "heading", False), + ("[USB bus:device]", "", "heading", False), ("USB bus:device :", """"xxx:yyy" where 'xxx' is the USB bus and 'yyy' is the USB device. (Note: The ':' and all leading zeros must be present.)""", 'option', False), ("", "Use the 'lsusb' command to obtain this information.", "option", False), - ("SERIAL NO.:", '"serial no." (future use)', "option", True), utils.USAGE_EXAMPLES, ("USB, IDs specified:", "$%s 001:002"%(__mod__), "example", False), - ("USB, using serial number:", "$%s US12345678A"%(__mod__), "example", False), utils.USAGE_SPACE, utils.USAGE_NOTES, ("1. Using 'lsusb' to obtain USB IDs: (example)", "", 'note', False), @@ -201,8 +142,6 @@ try: # ******************************* QUERY MODEL AND CHECKING SUPPORT log.debug("\nSetting up device: %s\n" % device_uri) - back_end, is_hp, bus, model, serial, dev_file, host, zc, port = device.parseDeviceURI(device_uri) - mq = device.queryModelByURI(device_uri) if not mq or mq.get('support-type', SUPPORT_TYPE_NONE) == SUPPORT_TYPE_NONE: log.error("Unsupported printer model.") @@ -211,31 +150,13 @@ try: printer_name = "" username = prop.username job_id = 0 - # ******************************* STARTING CUPS SERVICE, IF NOT RUNNING. - while check_cups_process() is False: - log.debug("CUPS is not running.. waiting for 30 sec") - time.sleep(30) - - # ******************************* RUNNING HP-SETUP, IF QUEUE IS NOT ADDED - time.sleep(1) - norm_model = models.normalizeModelName(model).lower() - if not mq.get('fax-type', FAX_TYPE_NONE) in (FAX_TYPE_NONE, FAX_TYPE_NOT_SUPPORTED): - fax_queues_list, fax_config_list_non_hp_conf = get_queues(serial, 'hpfax') - remove_queues(fax_config_list_non_hp_conf) - - 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) - os_utils.execute(cmd) + # ******************************* Detecting smart install /CD-DVD ROM enable. + if "SMART_INSTALL_ENABLED" in device_uri: if start_systray(): - if "SMART_INSTALL_ENABLED" in device_uri: - send_message( device_uri, printer_name, EVENT_DIAGNOSE_PRINTQUEUE, username, job_id,'') - else: - send_message( device_uri, printer_name, EVENT_ADD_PRINTQUEUE, username, job_id,'') + send_message( device_uri, printer_name, EVENT_DIAGNOSE_PRINTQUEUE, username, job_id,'') + else: + log.error("SMART INSTALL (CD/DVD-ROM) is enabled in the system. Refer http://hplipopensource.com/hplip-web/index.html for more information.") # ******************************* TRIGGERING PLUGIN POP-UP FOR PLUGING SUPPORTED PRINTER'S plugin = mq.get('plugin', PLUGIN_NONE) @@ -248,10 +169,12 @@ try: log.info("HP Device Plug-in is not found") else: log.info("HP Device Plug-in version mismatch or some files are corrupted") - + if plugin_sts != pluginhandler.PLUGIN_INSTALLED: if start_systray(): send_message( device_uri, printer_name, EVENT_AUTO_CONFIGURE, username, job_id, "AutoConfig") + else: + log.error("HP Device plugin's are not installed. Please install plugin's using hp-plugin command.") # ******************************* RUNNING FIRMWARE DOWNLOAD TO DEVICE FOR SUPPORTED PRINTER'S fw_download_req = mq.get('fw-download', False) @@ -264,20 +187,6 @@ try: else: log.warn("Failed to download firmware to %s device"%device_uri) - # ******************************* REMOVING CUPS CREATED QUEUE, If any - i =0 - while i <12: - time.sleep(2) - 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 - except KeyboardInterrupt: log.error("User exit") @@ -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.14.1. +# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.14.6. # -# Report bugs to <3.14.1>. +# Report bugs to <3.14.6>. # # # 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.14.1 about your + $as_echo "$0: Please tell bug-autoconf@gnu.org and 3.14.6 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.14.1' -PACKAGE_STRING='HP Linux Imaging and Printing 3.14.1' -PACKAGE_BUGREPORT='3.14.1' +PACKAGE_VERSION='3.14.6' +PACKAGE_STRING='HP Linux Imaging and Printing 3.14.6' +PACKAGE_BUGREPORT='3.14.6' PACKAGE_URL='' # Factoring default headers for most tests. @@ -615,7 +615,6 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS udev_sysfs_rules -udev_acl_rules SNMPLIB hpcups_only_build lite_build @@ -715,8 +714,6 @@ SHADOW_BUILD_FALSE SHADOW_BUILD_TRUE UDEV_SYSFS_RULES_FALSE UDEV_SYSFS_RULES_TRUE -UDEV_ACL_RULES_FALSE -UDEV_ACL_RULES_TRUE FAX_BUILD_FALSE FAX_BUILD_TRUE GUI_BUILD_FALSE @@ -884,7 +881,6 @@ enable_gui_build enable_fax_build enable_dbus_build enable_cups11_build -enable_udev_acl_rules enable_udev_sysfs_rules enable_shadow_build enable_libusb01_build @@ -1468,7 +1464,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.14.1 to adapt to many kinds of systems. +\`configure' configures HP Linux Imaging and Printing 3.14.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1538,7 +1534,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.14.1:";; + short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.14.6:";; esac cat <<\_ACEOF @@ -1567,7 +1563,6 @@ Optional Features: --enable-fax-build enable fax build (default=yes) --enable-dbus-build enable dbus build (default=yes) --enable-cups11-build enable cups 1.1.x build (default=no) - --enable-udev-acl-rules enable udev acl rules (default=no) --enable-udev_sysfs_rules Use SYSFS attribute instead of ATTR/ATTRS attribute in udev rules(default=no) --enable-shadow-build enable shadow build (default=no) --enable-libusb01_build Use libusb-0.1 instead of libusb-1.0 (default=no. i.e. libusb-1.0) @@ -1634,7 +1629,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.14.1>. +Report bugs to <3.14.6>. _ACEOF ac_status=$? fi @@ -1697,7 +1692,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HP Linux Imaging and Printing configure 3.14.1 +HP Linux Imaging and Printing configure 3.14.6 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2164,7 +2159,7 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" > { $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.14.1 ## +## Report this to 3.14.6 ## ## --------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -2241,7 +2236,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.14.1, which was +It was created by HP Linux Imaging and Printing $as_me 3.14.6, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3057,7 +3052,7 @@ fi # Define the identity of the package. PACKAGE='hplip' - VERSION='3.14.1' + VERSION='3.14.6' cat >>confdefs.h <<_ACEOF @@ -16092,31 +16087,6 @@ else $as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for udev acl rules" >&5 -$as_echo_n "checking for udev acl rules... " >&6; } -# Check whether --enable-udev_acl_rules was given. -if test "${enable_udev_acl_rules+set}" = set; then : - enableval=$enable_udev_acl_rules; udev_acl_rules=$enableval -else - udev_acl_rules=no -fi - -if test "$udev_acl_rules" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - if test x$udev_acl_rules = xyes; then - UDEV_ACL_RULES_TRUE= - UDEV_ACL_RULES_FALSE='#' -else - UDEV_ACL_RULES_TRUE='#' - UDEV_ACL_RULES_FALSE= -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for udev sysfs enable rules" >&5 $as_echo_n "checking for udev sysfs enable rules... " >&6; } # Check whether --enable-udev_sysfs_rules was given. @@ -16270,6 +16240,7 @@ 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. @@ -17581,7 +17552,6 @@ 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 @@ -17806,10 +17776,6 @@ if test -z "${FAX_BUILD_TRUE}" && test -z "${FAX_BUILD_FALSE}"; then as_fn_error $? "conditional \"FAX_BUILD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${UDEV_ACL_RULES_TRUE}" && test -z "${UDEV_ACL_RULES_FALSE}"; then - as_fn_error $? "conditional \"UDEV_ACL_RULES\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${UDEV_SYSFS_RULES_TRUE}" && test -z "${UDEV_SYSFS_RULES_FALSE}"; then as_fn_error $? "conditional \"UDEV_SYSFS_RULES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18263,7 +18229,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.14.1, which was +This file was extended by HP Linux Imaging and Printing $as_me 3.14.6, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18314,13 +18280,13 @@ $config_files Configuration commands: $config_commands -Report bugs to <3.14.1>." +Report bugs to <3.14.6>." _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.14.1 +HP Linux Imaging and Printing config.status 3.14.6 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 85e12c8db..c2a77fec1 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.14.1], [3.14.1], [hplip]) +AC_INIT([HP Linux Imaging and Printing], [3.14.6], [3.14.6], [hplip]) #AM_INIT_AUTOMAKE([1.9 foreign]) AM_INIT_AUTOMAKE AC_DISABLE_STATIC @@ -279,17 +279,6 @@ else AC_MSG_RESULT(no) fi -AC_MSG_CHECKING([for udev acl rules]) -AC_ARG_ENABLE(udev_acl_rules, - [ --enable-udev-acl-rules enable udev acl rules (default=no)], - udev_acl_rules=$enableval, udev_acl_rules=no) -if test "$udev_acl_rules" = "yes"; then - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi -AM_CONDITIONAL(UDEV_ACL_RULES, test x$udev_acl_rules = xyes) - AC_MSG_CHECKING([for udev sysfs enable rules]) AC_ARG_ENABLE(udev_sysfs_rules, [ --enable-udev_sysfs_rules Use SYSFS attribute instead of ATTR/ATTRS attribute in udev rules(default=no)], @@ -352,6 +341,7 @@ AC_ARG_WITH(docdir, AC_HELP_STRING([--with-docdir=DIR], [set hplip documentation 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], @@ -648,7 +638,6 @@ AC_SUBST(lite_build) AC_SUBST(hpcups_only_build) AC_SUBST(SNMPLIB) AC_SUBST(prefix) -AC_SUBST(udev_acl_rules) AC_SUBST(udev_sysfs_rules) 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) diff --git a/cups_drv.inc b/cups_drv.inc index c50eccfe7..0b5c8f726 100644 --- a/cups_drv.inc +++ b/cups_drv.inc @@ -141,6 +141,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-deskjet_460.ppd.gz \ ppd/hpcups/hp-deskjet_4610_series.ppd.gz \ ppd/hpcups/hp-deskjet_4620_series.ppd.gz \ + ppd/hpcups/hp-deskjet_4640_series.ppd.gz \ ppd/hpcups/hp-deskjet_500.ppd.gz \ ppd/hpcups/hp-deskjet_500c.ppd.gz \ ppd/hpcups/hp-deskjet_505j.ppd.gz \ @@ -443,8 +444,17 @@ 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_m125a.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m125nw.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m125rnw.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m126a.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m126nw.ppd.gz \ ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m127fp.ppd.gz \ ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m128fn.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m128fp.ppd.gz \ + ppd/hpcups/hp-laserjet_pro_mfp_m128fw.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 \ @@ -561,6 +571,11 @@ cups_ppd_printers = \ ppd/hpcups/hp-officejet_pro_8500_a909n.ppd.gz \ ppd/hpcups/hp-officejet_pro_8500_a910.ppd.gz \ ppd/hpcups/hp-officejet_pro_8600.ppd.gz \ + ppd/hpcups/hp-officejet_pro_8610.ppd.gz \ + ppd/hpcups/hp-officejet_pro_8620.ppd.gz \ + ppd/hpcups/hp-officejet_pro_8630.ppd.gz \ + ppd/hpcups/hp-officejet_pro_8640.ppd.gz \ + ppd/hpcups/hp-officejet_pro_8660.ppd.gz \ ppd/hpcups/hp-officejet_pro_k5300.ppd.gz \ ppd/hpcups/hp-officejet_pro_k5400.ppd.gz \ ppd/hpcups/hp-officejet_pro_k550.ppd.gz \ diff --git a/data/models/models.dat b/data/models/models.dat index 4c96334cf..ad037fa3c 100644 --- a/data/models/models.dat +++ b/data/models/models.dat @@ -2727,7 +2727,7 @@ usb-vid=3f0 wifi-config=0 [envy_100_d410_series] -align-type=16 +align-type=-1 clean-type=3 color-cal-type=0 copy-type=0 @@ -3618,7 +3618,7 @@ usb-vid=3f0 wifi-config=0 [envy_110_series] -align-type=16 +align-type=-1 clean-type=3 color-cal-type=0 copy-type=0 @@ -3695,7 +3695,7 @@ usb-vid=3f0 wifi-config=3 [photosmart_d110_series] -align-type=1 +align-type=-1 clean-type=1 color-cal-type=0 copy-type=0 @@ -3984,6 +3984,258 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 + +[hp_laserjet_pro_mfp_m125a] +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=2 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Pro MFP M125a +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=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.14.3 +tech-class=Hbpl1 +tech-subclass=Mono +tech-type=3 +usb-pid=222a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_pro_mfp_m125nw] +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=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Pro MFP M125nw +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=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.14.3 +tech-class=Hbpl1 +tech-subclass=Mono +tech-type=3 +usb-pid=222a +usb-vid=3f0 +wifi-config=3 + +[hp_laserjet_pro_mfp_m125rnw] +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=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Pro MFP M125rnw +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=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.14.3 +tech-class=Hbpl1 +tech-subclass=Mono +tech-type=3 +usb-pid=222a +usb-vid=3f0 +wifi-config=3 + +[hp_laserjet_pro_mfp_m126a] +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=2 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Pro MFP M126a +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=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.14.3 +tech-class=Hbpl1 +tech-subclass=Mono +tech-type=3 +usb-pid=222a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_pro_mfp_m126nw] +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=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Pro MFP M126nw +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=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.14.3 +tech-class=Hbpl1 +tech-subclass=Mono +tech-type=3 +usb-pid=222a +usb-vid=3f0 +wifi-config=3 + +[hp_laserjet_pro_mfp_m127fp] +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 M127fp +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.14.3 +tech-class=Hbpl1 +tech-subclass=Mono +tech-type=3 +usb-pid=322a +usb-vid=3f0 +wifi-config=0 [hp_laserjet_pro_mfp_m127fn] align-type=0 clean-type=0 @@ -4067,6 +4319,132 @@ tech-type=3 usb-pid=322a usb-vid=3f0 wifi-config=3 + +[hp_laserjet_pro_mfp_m128fn] +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 M128fn +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.14.4 +tech-class=Hbpl1 +tech-subclass=Mono +tech-type=3 +usb-pid=322a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_pro_mfp_m128fp] +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 M128fp +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.14.4 +tech-class=Hbpl1 +tech-subclass=Mono +tech-type=3 +usb-pid=322a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_pro_mfp_m128fw] +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 M128fw +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.14.4 +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 @@ -4292,7 +4670,7 @@ scan-src=2 scan-type=1 status-battery-check=2 status-dynamic-counters=1 -status-type=1 +status-type=2 support-released=True support-subtype=219b2b support-type=2 @@ -8483,7 +8861,7 @@ scan-src=0 scan-type=0 status-battery-check=0 status-dynamic-counters=0 -status-type=3 +status-type=10 support-released=True support-subtype=219b2b support-type=2 @@ -8526,7 +8904,7 @@ scan-src=0 scan-type=0 status-battery-check=0 status-dynamic-counters=0 -status-type=3 +status-type=10 support-released=True support-subtype=219b2b support-type=2 @@ -9985,6 +10363,126 @@ usb-pid=c011 usb-vid=3f0 wifi-config=3 +[hp_color_laserjet_mfp_m476dw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=HP_Color_LaserJet_2840.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color Laserjet Pro MFP M476dw +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +ppd-name=color_laserjet_pro_mfp_m476 +pq-diag-type=0 +r-type=0 +scan-src=3 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=447b +support-type=2 +support-ver=3.14.4 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=342a +usb-vid=3f0 +wifi-config=3 + +[hp_color_laserjet_mfp_m476nw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=default_printer.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color Laserjet Pro MFP M476nw +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +ppd-name=color_laserjet_pro_mfp_m476 +pq-diag-type=0 +r-type=0 +scan-src=3 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=447b +support-type=2 +support-ver=3.14.4 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=342a +usb-vid=3f0 +wifi-config=3 + +[hp_color_laserjet_mfp_m476dn] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=HP_Color_LaserJet_2840.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color Laserjet Pro MFP M476dn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +ppd-name=color_laserjet_pro_mfp_m476 +pq-diag-type=0 +r-type=0 +scan-src=3 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=447b +support-type=2 +support-ver=3.14.4 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=342a +usb-vid=3f0 +wifi-config=0 + [hp_designjet_488ca] align-type=0 clean-type=0 @@ -11027,7 +11525,7 @@ io-mode=1 io-support=6 job-storage=0 linefeed-cal-type=0 -model1=HP LaserJet Pro M521dn Multifunction Printer +model1=HP LaserJet Pro M521dn Multifunction Printer monitor-type=0 panel-check-type=0 pcard-type=0 @@ -11383,6 +11881,59 @@ usb-pid=b211 usb-vid=3f0 wifi-config=3 +[hp_officejet_color_x555] +align-type=-1 +clean-type=-1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=Officejet_9100_series.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=1 +linefeed-cal-type=0 +model1=HP Officejet Enterprise Color X555dn Printer +model2=HP Officejet Enterprise Color X555xh Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-officejet_color_x555 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=2 +r0-agent1-sku=HP 980 (D8J10A) +r0-agent1-type=1 +r0-agent2-kind=2 +r0-agent2-sku=HP 980 (D8J09A) +r0-agent2-type=6 +r0-agent3-kind=2 +r0-agent3-sku=HP 980 (D8J08A) +r0-agent3-type=5 +r0-agent4-kind=2 +r0-agent4-sku=HP 980 (D8J07A) +r0-agent4-type=4 +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.14.4 +tech-class=Postscript +tech-subclass=Normal +tech-type=2 +usb-pid=352a +usb-vid=3f0 +wifi-config=0 + [officejet_series_570] align-type=0 clean-type=0 @@ -11578,6 +12129,111 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[hp_officejet_color_mfp_x585] +align-type=-1 +clean-type=-1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=officejet_k550.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Officejet Enterprise Color X585dn Multifunction Printer +model2=HP Officejet Enterprise Color X585f Multifunction Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-officejet_color_mfp_x585 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=2 +r0-agent1-sku=HP 980 (D8J10A) +r0-agent1-type=1 +r0-agent2-kind=2 +r0-agent2-sku=HP 980 (D8J09A) +r0-agent2-type=6 +r0-agent3-kind=2 +r0-agent3-sku=HP 980 (D8J08A) +r0-agent3-type=5 +r0-agent4-kind=2 +r0-agent4-sku=HP 980 (D8J07A) +r0-agent4-type=4 +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.14.4 +tech-class=Postscript +tech-subclass=Normal +tech-type=2 +usb-pid=2b2a +usb-vid=3f0 +wifi-config=0 + +[hp_officejet_color_flowmfp_x585] +align-type=-1 +clean-type=-1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=officejet_k550.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Officejet Enterprise Color Flow X585z Multifunction Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-officejet_color_mfp_x585 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=2 +r0-agent1-sku=HP 980 (D8J10A) +r0-agent1-type=1 +r0-agent2-kind=2 +r0-agent2-sku=HP 980 (D8J09A) +r0-agent2-type=6 +r0-agent3-kind=2 +r0-agent3-sku=HP 980 (D8J08A) +r0-agent3-type=5 +r0-agent4-kind=2 +r0-agent4-sku=HP 980 (D8J07A) +r0-agent4-type=4 +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.14.4 +tech-class=Postscript +tech-subclass=Normal +tech-type=2 +usb-pid=362a +usb-vid=3f0 +wifi-config=0 + [officejet_series_590] align-type=0 clean-type=0 @@ -12603,6 +13259,59 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[hp_color_laserjet_m651] +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=3 +io-mode=1 +io-support=6 +job-storage=1 +linefeed-cal-type=0 +model1=HP Color LaserJet Enterprise M651dn Printer +model2=HP Color LaserJet Enterprise M651n Printer +model3=HP Color LaserJet Enterprise M651xh Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=color_laserjet_m651 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF320A/CF330X +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CF331A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CF333A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CF332A +r0-agent4-type=6 +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.14.4 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=1a2a +usb-vid=3f0 +wifi-config=0 [deskjet_656c] align-type=0 clean-type=0 @@ -12924,6 +13633,110 @@ tech-type=2 usb-pid=0 usb-vid=3f0 wifi-config=0 +[hp_color_laserjet_mfp_m680] +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=3 +io-mode=1 +io-support=6 +job-storage=1 +linefeed-cal-type=0 +model1=HP Color LaserJet Enterprise Multifunction M680dn Printer +model2=HP Color LaserJet Enterprise Multifunction M680f Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=color_laserjet_mfp_m680 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF320A/CF320X +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CF321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CF323A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CF322A +r0-agent4-type=6 +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.14.4 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=1b2a +usb-vid=3f0 +wifi-config=0 + +[hp_color_laserjet_flow_mfp_m680] +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=3 +io-mode=1 +io-support=6 +job-storage=1 +linefeed-cal-type=0 +model1=HP Color LaserJet Enterprise Flow Multifunction M680z 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_m680 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF320A/CF320X +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CF321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CF323A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CF322A +r0-agent4-type=6 +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.14.4 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=442a +usb-vid=3f0 +wifi-config=0 [deskjet_682] align-type=0 @@ -13516,6 +14329,126 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[hp_laserjet_pro_m701a] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=default_laserjet.png +io-mfp-mode=1 +io-mode=1 +io-support=2 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Pro M701a Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=laserjet_pro_m701 +pq-diag-type=0 +r-type=0 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=447b +support-type=2 +support-ver=3.14.4 +tech-class=Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=312a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_pro_m701n] +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_laserjet.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Pro M701n Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=laserjet_pro_m701 +pq-diag-type=0 +r-type=0 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=447b +support-type=2 +support-ver=3.14.4 +tech-class=Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=312a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_pro_m706n] +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_LaserJet_2100.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Pro M706n Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=laserjet_pro_m706 +pq-diag-type=0 +r-type=0 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=447b +support-type=2 +support-ver=3.14.4 +tech-class=Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=452a +usb-vid=3f0 +wifi-config=0 + [hp_deskjet_710c] align-type=0 clean-type=1 @@ -14570,6 +15503,63 @@ usb-pid=f14 usb-vid=3f0 wifi-config=0 +[hp_designjet_t795ps_44in] +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=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Designjet T795 44-in ePrinter +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 +r0-agent1-kind=3 +r0-agent1-sku=C9374A +r0-agent1-type=18 +r0-agent2-kind=3 +r0-agent2-sku=C9370A +r0-agent2-type=20 +r0-agent3-kind=3 +r0-agent3-sku=CH575A +r0-agent3-type=21 +r0-agent4-kind=3 +r0-agent4-sku=C9373A +r0-agent4-type=6 +r0-agent5-kind=3 +r0-agent5-sku=C9372A +r0-agent5-type=5 +r0-agent6-kind=3 +r0-agent6-sku=C9371A +r0-agent6-type=4 +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.14.4 +tech-class=Postscript +tech-subclass=Normal +tech-type=2 +usb-pid=f14 +usb-vid=3f0 +wifi-config=0 + [hp_designjet_cc800ps] align-type=0 clean-type=0 @@ -18079,10 +19069,11 @@ io-support=2 job-storage=0 linefeed-cal-type=0 model1=HP Deskjet 1010 Printer -model2=HP Deskjet 1012 Printer -model3=HP Deskjet Ink Advantage 1010 Printer Series -model4=HP Deskjet Ink Advantage 1015 Printer -model5=HP Deskjet Ink Advantage 1018 Printer +model2=HP Deskjet 1011 Printer +model3=HP Deskjet 1012 Printer +model4=HP Deskjet Ink Advantage 1010 Printer Series +model5=HP Deskjet Ink Advantage 1015 Printer +model6=HP Deskjet Ink Advantage 1018 Printer monitor-type=0 panel-check-type=0 pcard-type=0 @@ -23716,13 +24707,14 @@ io-support=2 job-storage=0 linefeed-cal-type=0 model1=HP Deskjet 1510 All-in-One Printer -model2=HP Deskjet 1512 All-in-One Printer -model3=HP Deskjet 1513 All-in-One Printer -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 +model2=HP Deskjet 1511 All-in-One Printer +model3=HP Deskjet 1512 All-in-One Printer +model4=HP Deskjet 1513 All-in-One Printer +model5=HP Deskjet 1514 All-in-One Printer +model6=HP Deskjet Ink Advantage 1510 All-in-One Printer Series +model7=HP Deskjet Ink Advantage 1515 All-in-One Printer +model8=HP Deskjet Ink Advantage 1516 All-in-One Printer +model9=HP Deskjet Ink Advantage 1518 All-in-One Printer monitor-type=0 panel-check-type=1 pcard-type=0 @@ -29502,11 +30494,13 @@ job-storage=0 linefeed-cal-type=0 model1=HP Deskjet 2540 All-in-One Printer 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 +model3=HP Deskjet 2543 All-in-One Printer +model4=HP Deskjet 2544 All-in-One Printer +model5=HP Deskjet 2549 All-in-One Printer +model6=HP Deskjet Ink Advantage 2540 All-in-One Printer Series +model7=HP Deskjet Ink Advantage 2545 All-in-One Printer +model8=HP Deskjet Ink Advantage 2546 All-in-One Printer +model9=HP Deskjet Ink Advantage 2548 All-in-One Printer monitor-type=0 panel-check-type=0 pcard-type=0 @@ -31821,7 +32815,7 @@ usb-vid=3f0 wifi-config=0 [deskjet_3050a_j611_series] -align-type=16 +align-type=-1 clean-type=1 color-cal-type=0 copy-type=0 @@ -33520,6 +34514,64 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[hp_designjet_t3500ps] +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 T3500 36-in Production eMFP +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-designjet_t3500-ps.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=3 +r0-agent1-sku=C1Q14A +r0-agent1-type=4 +r0-agent2-kind=3 +r0-agent2-sku=C1Q15A +r0-agent2-type=5 +r0-agent3-kind=3 +r0-agent3-sku=C1Q16A +r0-agent3-type=6 +r0-agent4-kind=3 +r0-agent4-sku=C1Q13A +r0-agent4-type=21 +r0-agent5-kind=3 +r0-agent5-sku=C1Q17A +r0-agent5-type=20 +r0-agent6-kind=3 +r0-agent6-sku=C1Q18A +r0-agent6-type=18 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=3 +support-released=True +support-subtype=47f3 +support-type=2 +support-ver=3.14.6 +tech-class=Postscript +tech-subclass=Normal +tech-type=2 +usb-pid=0 +usb-vid=0 +wifi-config=0 + [hp_color_laserjet_3500n] align-type=0 clean-type=0 @@ -39094,7 +40146,7 @@ usb-vid=3f0 wifi-config=0 [officejet_4500_g510n-z] -align-type=1 +align-type=-1 clean-type=1 color-cal-type=0 copy-type=0 @@ -40321,7 +41373,7 @@ wifi-config=3 [officejet_4630_series] align-type=15 -clean-type=1 +clean-type=4 color-cal-type=0 copy-type=0 embedded-server-type=1 @@ -40333,9 +41385,12 @@ io-mode=1 io-support=10 job-storage=0 linefeed-cal-type=0 -model1=HP Officejet 4630 e-All-in-One -model2=HP Officejet 4632 e-All-in-One Printer -model3=HP Officejet 4635 e-All-in-One Printer +model1=HP Officejet 4630 e-All-in-One Printer +model2=HP Officejet 4631 e-All-in-One Printer +model3=HP Officejet 4632 e-All-in-One Printer +model4=HP Officejet 4634 e-All-in-One Printer +model5=HP Officejet 4635 e-All-in-One Printer +model6=HP Officejet 4636 e-All-in-One Printer monitor-type=0 panel-check-type=0 pcard-type=0 @@ -40360,6 +41415,48 @@ usb-pid=c611 usb-vid=3f0 wifi-config=3 +[deskjet_4640_series] +align-type=15 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=6 +fw-download=False +icon=officejet_k550.png +io-mfp-mode=1 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP Deskjet Ink Advantage 4640 e-All-in-One Printer series +model2=HP Deskjet Ink Advantage 4645 e-All-in-One Printer +model3=HP Deskjet Ink Advantage 4646 e-All-in-One Printer +model4=HP Deskjet Ink Advantage 4648 e-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.14.3 +tech-class=MimasTDR +tech-subclass=Normal +tech-type=2 +usb-pid=c811 +usb-vid=3f0 +wifi-config=3 + [hp_color_laserjet_4650] align-type=0 clean-type=0 @@ -44324,6 +45421,58 @@ usb-pid=a004 usb-vid=3f0 wifi-config=0 +[hp_designjet_d5800ps_photo] +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=3 +io-mode=1 +io-support=4 +job-storage=0 +linefeed-cal-type=0 +model1=HP DesignJet D5800 60-in Production Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-designjet_d5800-ps.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=3 +r0-agent1-sku=CE021A +r0-agent1-type=21 +r0-agent2-kind=3 +r0-agent2-sku=CE023A +r0-agent2-type=5 +r0-agent3-kind=3 +r0-agent3-sku=CE024A +r0-agent3-type=6 +r0-agent4-kind=3 +r0-agent4-sku=CE025A +r0-agent4-type=4 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=3 +support-released=True +support-subtype=47f3 +support-type=2 +support-ver=3.14.6 +tech-class=Postscript +tech-subclass=Normal +tech-type=2 +usb-pid=0 +usb-vid=0 +wifi-config=0 + [deskjet_5850] align-type=1 clean-type=1 @@ -45092,7 +46241,7 @@ usb-vid=3f0 wifi-config=0 [officejet_6100] -align-type=1 +align-type=15 clean-type=1 color-cal-type=0 copy-type=0 @@ -47211,6 +48360,64 @@ usb-pid=ba11 usb-vid=3f0 wifi-config=3 +[hp_designjet_z6600ps] +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=3 +io-mode=1 +io-support=4 +job-storage=0 +linefeed-cal-type=0 +model1=HP DesignJet Z6600 PostScript +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-designjet_z6600-postscript +pq-diag-type=0 +r-type=0 +r0-agent1-kind=3 +r0-agent1-sku=CE021A +r0-agent1-type=21 +r0-agent2-kind=3 +r0-agent2-sku=CE023A +r0-agent2-type=5 +r0-agent3-kind=3 +r0-agent3-sku=CE024A +r0-agent3-type=6 +r0-agent4-kind=3 +r0-agent4-sku=CE025A +r0-agent4-type=4 +r0-agent5-kind=3 +r0-agent5-sku=CE026A +r0-agent5-type=20 +r0-agent6-kind=3 +r0-agent6-sku=CE027A +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=47f3 +support-type=2 +support-ver=3.14.6 +tech-class=Postscript +tech-subclass=Normal +tech-type=2 +usb-pid=0 +usb-vid=0 +wifi-config=0 + [deskjet_6600] align-type=1 clean-type=1 @@ -47452,6 +48659,70 @@ usb-pid=5c12 usb-vid=3f0 wifi-config=3 +[hp_designjet_z6800ps_photo] +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=3 +io-mode=1 +io-support=4 +job-storage=0 +linefeed-cal-type=0 +model1=HP DesignJet Z6800PS Photo +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-designjet_z6800_photo-postscript +pq-diag-type=0 +r-type=0 +r0-agent1-kind=3 +r0-agent1-sku=CE021A +r0-agent1-type=21 +r0-agent2-kind=3 +r0-agent2-sku=CE022A +r0-agent2-type=33 +r0-agent3-kind=3 +r0-agent3-sku=CE023A +r0-agent3-type=5 +r0-agent4-kind=3 +r0-agent4-sku=CE024A +r0-agent4-type=6 +r0-agent5-kind=3 +r0-agent5-sku=CE025A +r0-agent5-type=8 +r0-agent6-kind=3 +r0-agent6-sku=CE026A +r0-agent6-type=4 +r0-agent7-kind=3 +r0-agent7-sku=CE027A +r0-agent7-type=20 +r0-agent8-kind=3 +r0-agent8-sku=CE028A +r0-agent8-type=17 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=3 +support-released=True +support-subtype=47f3 +support-type=2 +support-ver=3.14.6 +tech-class=Postscript +tech-subclass=Normal +tech-type=2 +usb-pid=0 +usb-vid=0 +wifi-config=0 + [deskjet_6800] align-type=1 clean-type=1 @@ -49122,6 +50393,64 @@ usb-pid=4111 usb-vid=3f0 wifi-config=0 +[hp_designjet_t7200ps] +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=3 +io-mode=1 +io-support=4 +job-storage=0 +linefeed-cal-type=0 +model1=HP Designjet T7200 42-in Production Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-designjet_t7200-ps +pq-diag-type=0 +r-type=0 +r0-agent1-kind=3 +r0-agent1-sku=CM991A +r0-agent1-type=21 +r0-agent2-kind=3 +r0-agent2-sku=CM992A +r0-agent2-type=6 +r0-agent3-kind=3 +r0-agent3-sku=CM993A +r0-agent3-type=5 +r0-agent4-kind=3 +r0-agent4-sku=CM994A +r0-agent4-type=4 +r0-agent5-kind=3 +r0-agent5-sku=CM995A +r0-agent5-type=18 +r0-agent6-kind=3 +r0-agent6-sku=CM996A +r0-agent6-type=24 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=3 +support-released=True +support-subtype=47f3 +support-type=2 +support-ver=3.14.6 +tech-class=Postscript +tech-subclass=Normal +tech-type=2 +usb-pid=0 +usb-vid=0 +wifi-config=0 + [photosmart_c7200_series] align-type=1 clean-type=1 @@ -51052,7 +52381,7 @@ usb-vid=3f0 wifi-config=0 [officejet_7610_series] -align-type=17 +align-type=-1 clean-type=4 color-cal-type=0 copy-type=0 @@ -53308,6 +54637,199 @@ usb-pid=5912 usb-vid=3f0 wifi-config=3 +[hp_officejet_pro_8610] +align-type=-1 +clean-type=-1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=6 +fw-download=False +icon=officejet_k550.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP OfficeJet Pro 8610 e-All-in-One Printer +model2=HP OfficeJet Pro 8615 e-All-in-One Printer +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +scan-src=3 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=11 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.14.4 +tech-class=Ampere +tech-subclass=Normal +tech-type=2 +usb-pid=7112 +usb-vid=3f0 +wifi-config=3 + +[hp_officejet_pro_8620] +align-type=-1 +clean-type=-1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=6 +fw-download=False +icon=officejet_k550.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP OfficeJet Pro 8620 e-All-in-One Printer +model2=HP OfficeJet Pro 8625 e-All-in-One Printer +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +scan-src=3 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=11 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.14.4 +tech-class=Ampere +tech-subclass=Normal +tech-type=2 +usb-pid=7012 +usb-vid=3f0 +wifi-config=3 + +[hp_officejet_pro_8630] +align-type=-1 +clean-type=-1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=6 +fw-download=False +icon=officejet_k550.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP OfficeJet Pro 8630 e-All-in-One Printer +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +scan-src=3 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=11 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.14.4 +tech-class=Ampere +tech-subclass=Normal +tech-type=2 +usb-pid=6f12 +usb-vid=3f0 +wifi-config=3 + +[hp_officejet_pro_8640] +align-type=-1 +clean-type=-1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=6 +fw-download=False +icon=officejet_k550.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP OfficeJet Pro 8640 e-All-in-One Printer +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +scan-src=3 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=11 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.14.6 +tech-class=Ampere +tech-subclass=Normal +tech-type=2 +usb-pid=7712 +usb-vid=3f0 +wifi-config=3 + + +[hp_officejet_pro_8660] +align-type=-1 +clean-type=-1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=6 +fw-download=False +icon=officejet_k550.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP OfficeJet Pro 8660 e-All-in-One Printer +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +scan-src=3 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=11 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.14.6 +tech-class=Ampere +tech-subclass=Normal +tech-type=2 +usb-pid=7612 +usb-vid=3f0 +wifi-config=3 + [photosmart_8700_series] align-type=1 clean-type=1 @@ -54924,6 +56446,7 @@ wifi-config=0 # DJ9xx # DJ9xxVIP # DJGenericVIP +# Hbpl1 # Kapan # LJColor # LJFastRaster diff --git a/data/rules/56-hpmud.rules b/data/rules/56-hpmud.rules index c943df69a..9b6a73237 100644 --- a/data/rules/56-hpmud.rules +++ b/data/rules/56-hpmud.rules @@ -12,7 +12,7 @@ ATTR{idVendor}=="03f0", ATTR{idProduct}=="????", OWNER="root", GROUP="lp", MODE= # 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/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM} ; fi'" +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 &'" # 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/data/rules/56-hpmud_sysfs.rules b/data/rules/56-hpmud_sysfs.rules index 2b12a46dc..2fab449e3 100644 --- a/data/rules/56-hpmud_sysfs.rules +++ b/data/rules/56-hpmud_sysfs.rules @@ -15,7 +15,7 @@ SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="????", OWNER="root", GROUP="lp", MOD 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'" +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 &'" # 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/data/rules/hplip-printer@.service b/data/rules/hplip-printer@.service index 287d11b54..be87e3cfb 100644 --- a/data/rules/hplip-printer@.service +++ b/data/rules/hplip-printer@.service @@ -2,4 +2,4 @@ Description=Configure HP Plugged-In Printer [Service] -ExecStart=/usr/bin/hp-config_usb_printer "%i" +ExecStart=/usr/bin/python /usr/bin/hp-config_usb_printer "%i" @@ -43,14 +43,14 @@ USAGE = [(__doc__, "", "name", True), utils.USAGE_SPACE, utils.USAGE_MODE, ("Run in interactive mode:", "-i or --interactive (Default)", "option", False), - ("Run in graphical UI mode:", "-u or --gui (future use)", "option", False), +# ("Run in graphical UI mode:", "-u or --gui (future use)", "option", False), utils.USAGE_SPACE, utils.USAGE_OPTIONS, utils.USAGE_HELP, utils.USAGE_LOGGING1, utils.USAGE_LOGGING2, utils.USAGE_LOGGING3, - ("Non-interactive mode:","-n(Without asking permissions)(future use)","option",False), - ("Perform the task for the given device id:","-d<device id>(future use)","option",False), - ("Take options from the file instead of command line:","-f<file> (future use)","option",False) +# ("Non-interactive mode:","-n(Without asking permissions)(future use)","option",False), +# ("Perform the task for the given device id:","-d<device id>(future use)","option",False), +# ("Take options from the file instead of command line:","-f<file> (future use)","option",False) ] @@ -125,7 +125,7 @@ def install_plugin(core): log.info("Plugin's already installed") return True else: - log.info("HP Properitery Plugin's are not required as no plug-in printer is present.") + log.info("No plug-in printers are configured.") return True if ok and user_input == 'y': @@ -149,8 +149,7 @@ def deprecated_check(core): log.info("No Deprecated items are found") else: log.error("This distro (i.e %s %s) is either deprecated or not yet supported."%(core.distro_name, core.distro_version)) - ok,user_input =tui.enter_choice(log.red("The diagnosis is limited on unsupported platforms. Do you want to continue?(y=yes, n=no*):"),['y', 'n'], 'n') -# ok,user_input =tui.enter_choice(log.red("This tool may not diagnose all the problems. Do you want to continue?(y=yes, n=no*)"),['y', 'n'], 'n') + ok,user_input =tui.enter_choice(log.red("The diagnosis is limited on unsupported platforms. Do you want to continue?(y=yes*, n=no):"),['y', 'n'], 'y') if not ok or user_input !='y': clean_exit(2) diff --git a/fax/fax.py b/fax/fax.py index 58a0e29d3..21f127018 100644 --- a/fax/fax.py +++ b/fax/fax.py @@ -930,6 +930,7 @@ class FaxSendThread(threading.Thread): def render_cover_page(self, a): log.debug("Creating cover page...") + user_conf.read() pdf = self.cover_func(page_size=coverpages.PAGE_SIZE_LETTER, total_pages=self.job_total_pages, diff --git a/fax/ppd/HP-Fax-hpcups.ppd.gz b/fax/ppd/HP-Fax-hpcups.ppd.gz Binary files differindex 3122f5831..01cd43e23 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 02e125694..c87a2a83d 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 3e7ceb239..65684a632 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 6b4b178b5..894d9adb7 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 96d422419..9b9b52f89 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 0243ffe5e..8b98a5fda 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 d150b1184..1f6e5bc8a 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 1f18b62dc..0c09b9926 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 a43df72c4..e58e86e4d 100644 --- a/foomatic_drv.inc +++ b/foomatic_drv.inc @@ -33,6 +33,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_p4515xm-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_pro_b8300_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m128fw-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4600_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1022-hpijs-zjs.ppd.gz \ ppd/hpijs/hp-photosmart_240_series-hpijs.ppd.gz \ @@ -46,6 +47,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-photosmart_8400_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4250-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-psc_1500_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m125nw-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4si-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_816c-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_580-hpijs.ppd.gz \ @@ -166,6 +168,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-photosmart_a320_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_p1566-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_r80xi-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m127fp-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_d4100_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p3004-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_p4015-hpijs.ppd.gz \ @@ -209,6 +212,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_842c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1022n-hpijs-zjs.ppd.gz \ ppd/hpijs/hp-deskjet_5600-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m126nw-hpijs.ppd.gz \ ppd/hpijs/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_3840-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_6500_e710a-f-hpijs.ppd.gz \ @@ -284,10 +288,12 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_5652-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_c7200_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m126a-hpijs.ppd.gz \ ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_6mp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-color_laserjet_3600-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-officejet_pro_8610-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_960c-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp1515n-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_pro_k850-hpijs.ppd.gz \ @@ -363,6 +369,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_5200lx-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_4105-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m1005-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_pro_8630-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_6980_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_d7300_series-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz \ @@ -437,6 +444,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_6l-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_3500-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_656c-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m128fn-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3900-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_930c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_b8500_series-hpijs.ppd.gz \ @@ -568,6 +576,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_series_590-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_m1216nfh_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1160-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_pro_8640-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_1125-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_540-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4ml-hpijs.ppd.gz \ @@ -579,6 +588,8 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-color_laserjet_9500_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_p3005-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_100-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m128fp-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m125rnw-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1320tn-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_t_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz \ @@ -636,6 +647,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_f4100_series-hpijs.ppd.gz \ ppd/hpijs/hp-mopier_320-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-psc_2350_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_pro_mfp_m125a-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p1505n-hpijs-zxs.ppd.gz \ ppd/hpijs/hp-laserjet_3050-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-psc_950vr-hpijs.ppd.gz \ @@ -676,6 +688,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_professional_m1218nfg_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_p1106-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_7550-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_pro_8620-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_610c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_934c-hpijs.ppd.gz \ @@ -721,8 +734,10 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_p1005-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_500-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_3700-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-deskjet_4640_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3920-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3816-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_pro_8660-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_6100_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p2014-hpijs-pcl3.ppd.gz \ @@ -750,10 +765,13 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_4350-ps.ppd.gz \ prnt/ps/hp-laserjet_3300_3310_3320-ps.ppd.gz \ prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_m680-ps.ppd.gz \ prnt/ps/hp-designjet_t920-postscript.ppd.gz \ prnt/ps/hp-laserjet_4100_series-ps.ppd.gz \ prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz \ + prnt/ps/hp-designjet_t7200-ps.ppd.gz \ prnt/ps/hp-designjet_4520mfp-ps.ppd.gz \ + prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz \ prnt/ps/hp-laserjet_2410-ps.ppd.gz \ prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz \ prnt/ps/hp-laserjet_500_color_mfp_m570-ps.ppd.gz \ @@ -779,9 +797,11 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz \ prnt/ps/hp-laserjet_3380-ps.ppd.gz \ + prnt/ps/hp-designjet_t3500-ps.ppd.gz \ prnt/ps/hp-laserjet_8100_series-ps.ppd.gz \ prnt/ps/hp-laserjet_5200lx-ps.ppd.gz \ prnt/ps/hp-laserjet_2100_series-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_flow_mfp_m680-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 \ @@ -805,6 +825,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_5m-ps.ppd.gz \ prnt/ps/hp-color_laserjet_5500-ps.ppd.gz \ prnt/ps/hp-laserjet_3050-ps.ppd.gz \ + prnt/ps/hp-designjet_t795ps_44in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp5225dn-ps.ppd.gz \ prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz \ prnt/ps/hp-laserjet_4345_mfp-ps.ppd.gz \ @@ -819,6 +840,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_cp4020_series-ps.ppd.gz \ prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2300-ps.ppd.gz \ + prnt/ps/hp-officejet_color_mfp_x585.ppd.gz \ prnt/ps/hp-laserjet_3052-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2605-ps.ppd.gz \ prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz \ @@ -849,6 +871,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_4ml-ps.ppd.gz \ prnt/ps/hp-laserjet_8000-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2800-ps.ppd.gz \ + prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz \ prnt/ps/hp-laserjet_m9040_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_1300-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4600_series-ps.ppd.gz \ @@ -882,6 +905,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz \ prnt/ps/hp-laserjet_200_color_m251-ps.ppd.gz \ prnt/ps/hp-laserjet_p4010_series-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m651-ps.ppd.gz \ prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz \ prnt/ps/hp-laserjet_1200-ps.ppd.gz \ prnt/ps/hp-laserjet_p3005-ps.ppd.gz \ @@ -904,11 +928,14 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_3700-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2500-ps.ppd.gz \ prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz \ + prnt/ps/hp-designjet_d5800-ps.ppd.gz \ prnt/ps/hp-laserjet_m5035_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_9065mfp-ps.ppd.gz \ + prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz \ prnt/ps/hp-laserjet_m2727_mfp_series-ps.ppd.gz \ prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4550-ps.ppd.gz \ + prnt/ps/hp-designjet_z6600-postscript.ppd.gz \ prnt/ps/hp-laserjet_700_m712-ps.ppd.gz \ prnt/ps/hp-laserjet_4050_series-ps.ppd.gz \ prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz \ @@ -941,6 +968,8 @@ foomatic_ps_printers = \ prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp2025n-ps.ppd.gz \ prnt/ps/hp-laserjet_3020-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz \ + prnt/ps/hp-officejet_color_x555-ps.ppd.gz \ prnt/ps/hp-laserjet_m1522n_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz \ prnt/ps/hp-designjet_4020ps-ps.ppd.gz \ diff --git a/hplip.conf.in b/hplip.conf.in index e28b3d98f..f1df71a4c 100644 --- a/hplip.conf.in +++ b/hplip.conf.in @@ -42,7 +42,6 @@ qt3=@qt3@ qt4=@qt4@ policy-kit=@policykit@ lite-build=@lite_build@ -udev-acl-rules=@udev_acl_rules@ udev_sysfs_rules=@udev_sysfs_rules@ hpcups-only-build=@hpcups_only_build@ hpijs-only-build=@hpijs_only_build@ @@ -489,7 +489,7 @@ def handle_event(event, more_args=None): handle_hpdio_event(event, bytes_written) # Qt4 only - elif event.event_code == EVENT_CUPS_QUEUES_CHANGED: + elif event.event_code == EVENT_CUPS_QUEUES_ADDED or event.event_code == EVENT_CUPS_QUEUES_REMOVED: send_event_to_systray_ui(event) send_toolbox_event(event, EVENT_HISTORY_UPDATE) diff --git a/installer/core_install.py b/installer/core_install.py index 5a00fd42e..34c822c31 100644 --- a/installer/core_install.py +++ b/installer/core_install.py @@ -723,13 +723,14 @@ class CoreInstall(object): vv = self.distros[distro]['versions'][v].copy() vv['same_as_version'] = v self.distros[distro]['versions'][ver] = vv + + for key in distros_dat.keys(ver_section): + vv[key] = self.__fixup_data(key, distros_dat.get(ver_section, key)) + except KeyError: log.debug("Missing 'same_as_version=' version in distros.dat for section [%s:%s]." % (distro, v)) continue - #import pprint - #pprint.pprint(self.distros) - def pre_install(self): pass diff --git a/installer/dcheck.py b/installer/dcheck.py index b49109f92..46b648bc1 100644 --- a/installer/dcheck.py +++ b/installer/dcheck.py @@ -361,7 +361,10 @@ def get_libpthread_version(): return '-' else: # LIBC = ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True) - LIBC = ctypes.CDLL(ctypes.util.find_library('c'),ctypes.DEFAULT_MODE,None, True) + try: + LIBC = ctypes.CDLL(ctypes.util.find_library('c'),ctypes.DEFAULT_MODE,None, True) + except: + LIBC = ctypes.CDLL(ctypes.util.find_library('c'),ctypes.DEFAULT_MODE,None) #python2.4 and below syntax LIBC.gnu_get_libc_version.restype = ctypes.c_char_p return LIBC.gnu_get_libc_version() diff --git a/installer/distros.dat b/installer/distros.dat index dd2baebee..c1438d7de 100644 --- a/installer/distros.dat +++ b/installer/distros.dat @@ -117,7 +117,7 @@ display_name=SUSE Linux alt_names= display=1 notes= -package_mgrs=yast,yast2,opensuse-updater,zypper +package_mgrs=yast,yast2,opensuse-updater,zypper,package-manager package_mgr_cmd=su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses $packages_to_install" pre_depend_cmd= post_depend_cmd= @@ -141,7 +141,7 @@ parallel_supported=0 usb_supported=1 packaged_version=3.11.6 release_date=2012-07-11 -notes=Please be sure to disable the CD repositories in YaST and after installation you must log out and back in to become a member of the lp and sys group to enable printing. +notes=Please be sure to disable the CD repositories in YaST. ppd_install=drv udev_mode_fix=1 ppd_dir=/usr/share/cups/model/HP @@ -261,7 +261,7 @@ parallel_supported=0 usb_supported=1 packaged_version=3.12.11 release_date=2013-03-13 -notes=Please be sure to disable the CD repositories in YaST and after installation you must log out and back in to become a member of the lp and sys group to enable printing. +notes=Please be sure to disable the CD repositories in YaST. ppd_install=drv udev_mode_fix=1 ppd_dir=/usr/share/cups/model/HP @@ -579,7 +579,7 @@ ui_toolkit=qt3 # **************************************** [fedora] index=5 -versions=17,18,19 +versions=17,18,19,20 display_name=Fedora alt_names=Fedora Core display=1 @@ -840,6 +840,17 @@ release_date=02/07/2013 same_as_version=17 + +# **************************************** + +[fedora:20] +code_name=Heisenbug +supported=1 +packaged_version=3.13.9 +release_date=12/11/2013 +same_as_version=19 + + # **************************************** [linspire] index=15 @@ -1015,7 +1026,8 @@ packages=polkit,polkit-gnome [rhel:5.0:network] packages=wget - +[rhel:5.0:avahi-utils] +packages=avahi-tools # ******************** [rhel:6.0] code_name=Santiago @@ -2231,7 +2243,7 @@ packages=avahi # **************************************** [ubuntu] index=12 -versions=10.04,11.10,12.04,12.10,13.04,13.10 +versions=10.04,11.10,12.04,12.10,13.04,13.10,14.04 display_name=Ubuntu alt_names=kubuntu,edubuntu,xubuntu display=1 @@ -2260,7 +2272,7 @@ parallel_supported=1 usb_supported=1 packaged_version=3.10.2 release_date=2010 -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 group, please quit the installer before the setup stage, log out, log back in, and run hp-setup to complete the install. +notes=Enable the universe/multiverse repositories. Also be sure you are using the Ubuntu "Main" Repositories. See: https://help.ubuntu.com/community/Repositories/Ubuntu for more information. Disable the CD-ROM/DVD source if you do not have the Ubuntu installation media inserted in the drive. ppd_install=drv udev_mode_fix=1 ppd_dir=/usr/share/ppd/HP @@ -2367,6 +2379,8 @@ packages=wget [ubuntu:10.04:avahi-utils] packages=avahi-utils + + # ******************** [ubuntu:11.10] code_name=Oneiric @@ -2379,7 +2393,7 @@ parallel_supported=1 usb_supported=1 packaged_version=3.11.5 release_date=13/10/2011 -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. +notes=Enable the universe/multiverse repositories. Also be sure you are using the Ubuntu "Main" Repositories. See: https://help.ubuntu.com/community/Repositories/Ubuntu for more information. Disable the CD-ROM/DVD source if you do not have the Ubuntu installation media inserted in the drive. ppd_install=drv udev_mode_fix=1 ppd_dir=/usr/share/ppd/HP @@ -2499,7 +2513,7 @@ parallel_supported=1 usb_supported=1 packaged_version=3.12.2 release_date=28/04/2012 -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. +notes=Enable the universe/multiverse repositories. Also be sure you are using the Ubuntu "Main" Repositories. See: https://help.ubuntu.com/community/Repositories/Ubuntu for more information. Disable the CD-ROM/DVD source if you do not have the Ubuntu installation media inserted in the drive. ppd_install=drv udev_mode_fix=1 ppd_dir=/usr/share/ppd/HP @@ -2600,20 +2614,141 @@ packages=cups packages=policykit-1,policykit-1-gnome [ubuntu:12.04:python-notify] -packages=python-notify +packages=python-notify2 [ubuntu:12.04:network] packages=wget [ubuntu:12.04:avahi-utils] packages=avahi-utils + # ******************** [ubuntu:12.10] +code_name=Quantal +packaged_version=3.12.11 +release_date=18/10/2012 same_as_version=12.04 # ******************** [ubuntu:13.04] -same_as_version=12.04 +code_name=Raring +supported=1 +scan_supported=1 +fax_supported=1 +pcard_supported=1 +network_supported=1 +parallel_supported=0 +usb_supported=1 +packaged_version=3.13.4 +release_date=25/04/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. +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.04:cups] +packages=libcups2 + +[ubuntu:13.04:cups-devel] +packages=libcups2-dev,cups-bsd,cups-client + +[ubuntu:13.04:gcc] +packages=build-essential + +[ubuntu:13.04:gs] +packages=ghostscript + +[ubuntu:13.04:libcrypto] +packages=openssl + +[ubuntu:13.04:libjpeg] +packages=libjpeg-dev + +[ubuntu:13.04:libnetsnmp-devel] +packages=libsnmp-dev + +[ubuntu:13.04:libpthread] +packages=build-essential + +[ubuntu:13.04:libtool] +packages=libtool + +[ubuntu:13.04:libusb] +packages=libusb-1.0.0-dev + +[ubuntu:13.04:make] +packages=build-essential + +[ubuntu:13.04:pil] +packages=python-imaging + +[ubuntu:13.04:ppdev] +packages= +commands=sudo modprobe ppdev,sudo cp -f /etc/modules /etc/modules.hplip,echo ppdev | sudo tee -a /etc/modules + +[ubuntu:13.04:pyqt] +packages=gtk2-engines-pixbuf,python-qt4 + +[ubuntu:13.04:python-devel] +packages=python-dev + +[ubuntu:13.04:pyqt4] +packages=gtk2-engines-pixbuf,python-qt4 + +[ubuntu:13.04:pyqt4-dbus] +packages=python-qt4-dbus + +#[ubuntu:13.04:python23] +#packages=python + +[ubuntu:13.04:python2X] +packages=python + +[ubuntu:13.04:reportlab] +packages=python-reportlab + +[ubuntu:13.04:sane] +packages=libsane + +[ubuntu:13.04:sane-devel] +packages=libsane-dev + +[ubuntu:13.04:scanimage] +packages=sane-utils + +[ubuntu:13.04:xsane] +packages=gtk2-engines-pixbuf,xsane + +[ubuntu:13.04:python-dbus] +packages=python-dbus,python-gobject + +[ubuntu:13.04:dbus] +packages=libdbus-1-dev + +[ubuntu:13.04:cups-image] +packages=libcupsimage2-dev + +[ubuntu:13.04:cups-ddk] +packages=cups + +[ubuntu:13.04:policykit] +packages=policykit-1,policykit-1-gnome + +[ubuntu:13.04:python-notify] +packages=python-notify2 + +[ubuntu:13.04:network] +packages=wget + +[ubuntu:13.04:avahi-utils] +packages=avahi-utils # ******************** [ubuntu:13.10] @@ -2627,7 +2762,7 @@ 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. +notes=Enable the universe/multiverse repositories. Also be sure you are using the Ubuntu "Main" Repositories. See: https://help.ubuntu.com/community/Repositories/Ubuntu for more information. Disable the CD-ROM/DVD source if you do not have the Ubuntu installation media inserted in the drive. ppd_install=drv udev_mode_fix=1 ppd_dir=/usr/share/ppd/HP @@ -2735,10 +2870,18 @@ packages=wget [ubuntu:13.10:avahi-utils] packages=avahi-utils + +# ******************** +[ubuntu:14.04] +code_name=Trusty +packaged_version=3.14.1 +release_date=17/04/2014 +same_as_version=13.10 + # **************************************** [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,6.0.8,7.0,7.1,7.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,6.0.8,6.0.9,7.0,7.1,7.2,7.3,7.4,7.5 display_name=Debian alt_names= display=1 @@ -2902,6 +3045,9 @@ same_as_version=6.0 [debian:6.0.8] same_as_version=6.0 +[debian:6.0.9] +same_as_version=6.0 + # ********************* [debian:7.0] @@ -3035,6 +3181,14 @@ same_as_version=7.0 [debian:7.2] same_as_version=7.0 +[debian:7.3] +same_as_version=7.0 + +[debian:7.4] +same_as_version=7.0 +[debian:7.5] +same_as_version=7.0 + # ********************* [xandros] @@ -3792,7 +3946,7 @@ parallel_supported=1 usb_supported=1 packaged_version=0.9.1 release_date=2004-9-16 -notes=Before proceeding, please add the "contrib", "main", and "updates" installation sources to your URPMI configuration./n Open your browser and go to http://easyurpmi.zarb.org/ and follow the instructions provided and then proceed with the HPLIP install. Also be sure to disable the cdrom1-12 media sources. *Important* After the install run: su -c "/usr/sbin/usermod -G lp <your.username> Then logout and log back in. +notes=Before proceeding, please add the "contrib", "main", and "updates" installation sources to your URPMI configuration./n Open your browser and go to http://easyurpmi.zarb.org/ and follow the instructions provided and then proceed with the HPLIP install. Also be sure to disable the cdrom1-12 media sources. ppd_install=ppd udev_mode_fix=1 ppd_dir=/usr/share/cups/model/HP @@ -5029,10 +5183,11 @@ packages=wget [mandriva:2011.0:avahi-utils] packages=avahi + # **************************************** [linuxmint] index=22 -versions=13,14,15 +versions=13,14,15,16,17 display_name=Linux Mint alt_names=mint, mint linux display=1 @@ -5063,7 +5218,7 @@ parallel_supported=1 usb_supported=1 packaged_version=3.12.2 release_date=2012 -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 group, please quit the installer before the setup stage, log out, log back in, and run hp-setup to complete the install. +notes=Enable the universe/multiverse repositories. Also be sure you are using the Ubuntu "Main" Repositories. See: https://help.ubuntu.com/community/Repositories/Ubuntu for more information. Disable the CD-ROM/DVD source if you do not have the Ubuntu installation media inserted in the drive. ppd_install=drv udev_mode_fix=1 ppd_dir=/usr/share/ppd/HP @@ -5091,7 +5246,7 @@ packages=ghostscript packages=openssl [linuxmint:13:libjpeg] -packages=libjpeg62-dev +packages=libjpeg8-dev [linuxmint:13:libnetsnmp-devel] packages=libsnmp-dev @@ -5176,9 +5331,120 @@ packages=avahi-utils [linuxmint:14] code_name=Nadia supported=1 +scan_supported=1 +fax_supported=1 +pcard_supported=0 +network_supported=1 +parallel_supported=0 +usb_supported=1 packaged_version=3.13.3 release_date=2012 -same_as_version=13 +notes=Enable the universe/multiverse repositories. Also be sure you are using the Ubuntu "Main" Repositories. See: https://help.ubuntu.com/community/Repositories/Ubuntu for more information. Disable the CD-ROM/DVD source if you do not have the Ubuntu installation media inserted in the drive. +ppd_install=drv +udev_mode_fix=1 +ppd_dir=/usr/share/ppd/HP +fix_ppd_symlink=0 +drv_dir=/usr/share/cups/drv/HP +ui_toolkit=qt4 +native_cups=1 +acl_rules=1 + +[linuxmint:14:cups] +packages=libcups2 + +[linuxmint:14:cups-devel] +packages=libcups2-dev,cups-bsd,cups-client + +[linuxmint:14:gcc] +packages=build-essential + +[linuxmint:14:gs] +packages=ghostscript + +[linuxmint:14:libcrypto] +packages=openssl + +[linuxmint:14:libjpeg] +packages=libjpeg8-dev + +[linuxmint:14:libnetsnmp-devel] +packages=libsnmp-dev + +[linuxmint:14:libpthread] +packages=build-essential + +[linuxmint:14:libtool] +packages=libtool + +[linuxmint:14:libusb] +packages=libusb-1.0.0-dev + +[linuxmint:14:make] +packages=build-essential + +[linuxmint:14:pil] +packages=python-imaging + +[linuxmint:14:ppdev] +packages= +commands=sudo modprobe ppdev,sudo cp -f /etc/modules /etc/modules.hplip,echo ppdev | sudo tee -a /etc/modules + +[linuxmint:14:pyqt] +packages=python-qt4 + +[linuxmint:14:python-devel] +packages=python-dev + +[linuxmint:14:pyqt4] +packages=python-qt4 + +[linuxmint:14:pyqt4-dbus] +packages=python-qt4-dbus + +#[linuxmint:14:python23] +#packages=python + +[linuxmint:14:python2X] +packages=python + +[linuxmint:14:reportlab] +packages=python-reportlab + +[linuxmint:14:sane] +packages=libsane + +[linuxmint:14:sane-devel] +packages=libsane-dev + +[linuxmint:14:scanimage] +packages=sane-utils + +[linuxmint:14:xsane] +packages=xsane + +[linuxmint:14:python-dbus] +packages=python-dbus,python-gobject + +[linuxmint:14:dbus] +packages=libdbus-1-dev + +[linuxmint:14:cups-image] +packages=libcupsimage2-dev + +[linuxmint:14:cups-ddk] +packages=cups,libcupsimage2-dev + +[linuxmint:14:policykit] +packages=policykit-1,policykit-1-gnome + +[linuxmint:14:python-notify] +packages=python-notify + +[linuxmint:14:network] +packages=wget + +[linuxmint:14:avahi-utils] +packages=avahi-utils # **************************************** @@ -5193,7 +5459,7 @@ parallel_supported=1 usb_supported=1 packaged_version=3.13.3 release_date=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 group, please quit the installer before the setup stage, log out, log back in, and run hp-setup to complete the install. +notes=Enable the universe/multiverse repositories. Also be sure you are using the Ubuntu "Main" Repositories. See: https://help.ubuntu.com/community/Repositories/Ubuntu for more information. Disable the CD-ROM/DVD source if you do not have the Ubuntu installation media inserted in the drive. ppd_install=drv udev_mode_fix=1 ppd_dir=/usr/share/ppd/HP @@ -5224,7 +5490,7 @@ packages=openssl packages=libjpeg8-dev [linuxmint:15:libnetsnmp-devel] -packages=libsnmp-dev +packages=libsnmp-dev,snmp-mibs-downloader [linuxmint:15:libpthread] packages=build-essential @@ -5301,6 +5567,24 @@ packages=wget [linuxmint:15:avahi-utils] packages=avahi-utils + +# **************************************** + +[linuxmint:16] +code_name=Petra +packaged_version=3.13.10 +release_date=30/11/2013 +same_as_version=15 + + +# **************************************** + +[linuxmint:17] +code_name=Qiana +packaged_version=3.14.3 +release_date=31/05/2014 +same_as_version=15 + # **************************************** [linpus] @@ -5685,17 +5969,18 @@ packages=wget [gos:8.04.1:avahi-utils] packages=avahi + # **************************************** [boss] index=34 -versions=3.0 +versions=3.0,5.0 display_name=Boss alt_names= display=1 notes= package_mgrs=dpkg,apt-get,synaptic,update-manager,adept,aptitude package_mgr_cmd=su -c "apt-get install --force-yes -y $packages_to_install" -pre_depend_cmd=su -c "dpkg --configure -a",su -c "apt-get install -f",su -c "apt-get update",gnome-terminal -x su -c "apt-get install --yes cupsys-bsd" +pre_depend_cmd=su -c "dpkg --configure -a",su -c "apt-get install -f",su -c "apt-get update",su -c "apt-get install --yes cupsys-bsd" post_depend_cmd= hplip_remove_cmd=su -c "apt-get remove --yes hplip hpijs" su_sudo=su @@ -5707,12 +5992,12 @@ drv_dir=/usr/share/cups/drv/HP [boss:3.0] code_name=tejas -supported=0 +supported=1 scan_supported=1 -fax_supported=0 -pcard_supported=1 +fax_supported=1 +pcard_supported=0 network_supported=1 -parallel_supported=1 +parallel_supported=0 usb_supported=1 packaged_version=3.9.2 release_date=2008-09-04 @@ -5723,7 +6008,8 @@ ppd_dir=/usr/share/ppd/HP fix_ppd_symlink=0 drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt4 -foomatic_rip_hplip=1 +libusb01=1 +native_cups=1 [boss:3.0:cups] packages=cupsys,cupsys-client @@ -5753,7 +6039,7 @@ packages=libc6 packages=libtool [boss:3.0:libusb] -packages=libusb-1.0-0-dev +packages=libusb-dev [boss:3.0:make] packages=make @@ -5817,7 +6103,117 @@ packages=libcupsimage2-dev packages=wget [boss:3.0:avahi-utils] -packages=avahi +packages=avahi-utils + +[boss:5.0] +code_name=anokha +supported=1 +scan_supported=1 +fax_supported=1 +pcard_supported=0 +network_supported=1 +parallel_supported=0 +usb_supported=1 +packaged_version=3.13.4 +release_date=2013-08-08 +notes=Be sure to disable the CD-ROM repositories and also ensure that the main/security repositories are enabled. +ppd_install=ppd +udev_mode_fix=1 +ppd_dir=/usr/share/ppd/HP +fix_ppd_symlink=0 +drv_dir=/usr/share/cups/drv/HP +ui_toolkit=qt4 +libusb01=0 +native_cups=1 + +[boss:5.0:cups] +packages=libcups2 + +[boss:5.0:cups-devel] +packages=libcups2-dev + +[boss:5.0:gcc] +packages=gcc,g++ + +[boss:5.0:gs] +packages=ghostscript + +[boss:5.0:libcrypto] +packages=libssl-dev + +[boss:5.0:libjpeg] +packages=libjpeg-dev + +[boss:5.0:libnetsnmp-devel] +packages=libsnmp-dev + +[boss:5.0:libpthread] +packages=libc6 + +[boss:5.0:libtool] +packages=libtool + +[boss:5.0:libusb] +packages=libusb-1.0-0-dev, libusb-1.0-0 + +[boss:5.0:make] +packages=make + +[boss:5.0:pil] +packages=python-imaging + +[boss:5.0:python-devel] +packages=python-dev + +[boss:5.0:pyqt4] +packages=python-qt4 + +[boss:5.0:pyqt4-dbus] +packages=python-qt4-dbus + +[boss:5.0:python23] +packages=python + +[boss:5.0:python2x] +packages=python + +[boss:5.0:reportlab] +packages=python-reportlab + +[boss:5.0:sane] +packages=sane + +[boss:5.0:sane-devel] +packages=libsane-dev + +[boss:5.0:scanimage] +packages=sane-utils + +[boss:5.0:xsane] +packages=xsane + +[boss:5.0:cups-ddk] +packages= + +[boss:5.0:python-dbus] +packages=python-dbus,libdbus-1-dev,python-gobject + +[boss:5.0:dbus] +packages=libdbus-1-dev + +[boss:5.0:python-ctypes] +packages=python-ctypeslib + +[boss:5.0:cups-image] +packages=libcupsimage2-dev + +[boss:5.0:network] +packages=wget + +[boss:5.0:avahi-utils] +packages=avahi-utils + + # **************************************** [lfs] index=50 diff --git a/installer/pluginhandler.py b/installer/pluginhandler.py index 4720f449a..41e5b99f2 100755 --- a/installer/pluginhandler.py +++ b/installer/pluginhandler.py @@ -26,8 +26,10 @@ import string import shutil import urllib # TODO: Replace with urllib2 (urllib is deprecated in Python 3.0) -from base import utils, tui, os_utils +from base import utils, tui, os_utils, validation from base.g import * +from base.codes import * +from base.strings import * from installer import core_install from base import pexpect @@ -48,15 +50,6 @@ PLUGIN_STATE_FILE = '/var/lib/hp/hplip.state' PLUGIN_FALLBACK_LOCATION = 'http://hplipopensource.com/hplip-web/plugin/' -# Plug-in download errors -PLUGIN_INSTALL_ERROR_NONE = 0 -PLUGIN_INSTALL_ERROR_PLUGIN_FILE_NOT_FOUND = 1 -PLUGIN_INSTALL_ERROR_DIGITAL_SIGN_NOT_FOUND = 2 -PLUGIN_INSTALL_ERROR_DIGITAL_SIGN_BAD = 3 -PLUGIN_INSTALL_ERROR_PLUGIN_FILE_CHECKSUM_ERROR = 4 -PLUGIN_INSTALL_ERROR_NO_NETWORK = 5 -PLUGIN_INSTALL_ERROR_DIRECTORY_ERROR = 6 -PLUGIN_INSTALL_ERROR_UNABLE_TO_RECV_KEYS = 7 class PluginHandle(object): @@ -178,12 +171,12 @@ class PluginHandle(object): def __getPluginInformation(self, callback=None): - status, url, check_sum = PLUGIN_INSTALL_ERROR_NO_NETWORK, '','' + status, url, check_sum = ERROR_NO_NETWORK, '','' if self.__plugin_conf_file.startswith('http://'): if not utils.check_network_connection(): log.error("Network connection not detected.") - return PLUGIN_INSTALL_ERROR_NO_NETWORK, '',0 + return ERROR_NO_NETWORK, '', 0 local_conf_fp, local_conf = utils.make_temp_file() @@ -214,13 +207,13 @@ class PluginHandle(object): plugin_conf_p = ConfigBase(local_conf) url = plugin_conf_p.get(self.__required_version, 'url','') check_sum = plugin_conf_p.get(self.__required_version, 'checksum') - status = PLUGIN_INSTALL_ERROR_NONE + status = ERROR_SUCCESS except (KeyError, ConfigParser.NoSectionError): log.error("Error reading plugin.conf: Missing section [%s]" % self.__required_version) - return PLUGIN_INSTALL_ERROR_PLUGIN_FILE_NOT_FOUND, url, check_sum + return ERROR_FILE_NOT_FOUND, url, check_sum if url == '': - return PLUGIN_INSTALL_ERROR_PLUGIN_FILE_NOT_FOUND, url, check_sum + return ERROR_FILE_NOT_FOUND, url, check_sum finally: os.close(local_conf_fp) @@ -232,30 +225,14 @@ class PluginHandle(object): def __validatePlugin(self,plugin_file, digsig_file, req_checksum): calc_checksum = get_checksum(file(plugin_file, 'r').read()) log.debug("D/L file checksum=%s" % calc_checksum) - if req_checksum and req_checksum != calc_checksum: - return PLUGIN_INSTALL_ERROR_PLUGIN_FILE_CHECKSUM_ERROR - - gpg = utils.which('gpg',True) - if gpg: - cmd = '%s --no-permission-warning --keyserver pgp.mit.edu --recv-keys 0xA59047B9' % gpg - log.info("Receiving digital keys: %s" % cmd) - status, output = utils.run(cmd) - log.debug(output) - - if status != 0: - return PLUGIN_INSTALL_ERROR_UNABLE_TO_RECV_KEYS + return ERROR_CHECKSUM_ERROR, queryString(ERROR_CHECKSUM_ERROR, 0, plugin_file) - cmd = '%s --no-permission-warning --verify %s %s' % (gpg, digsig_file, plugin_file) - log.debug("Verifying plugin with digital keys: %s" % cmd) - status, output = utils.run(cmd) - log.debug(output) - log.debug("%s status: %d" % (gpg, status)) + gpg_obj = validation.GPG_Verification() + digsig_sts, error_str = gpg_obj.validate(plugin_file, digsig_file) - if status != 0: - return PLUGIN_INSTALL_ERROR_DIGITAL_SIGN_BAD + return digsig_sts, error_str - return PLUGIN_INSTALL_ERROR_NONE def __setPluginConfFile(self): @@ -283,8 +260,8 @@ class PluginHandle(object): else: sts, url, checksum = self.__getPluginInformation(callback) src = url - if sts != PLUGIN_INSTALL_ERROR_NONE: - return sts, "" + if sts != ERROR_SUCCESS: + return sts, "", queryString(ERROR_CHECKSUM_ERROR, 0, src) log.debug("Downloading %s plug-in file from '%s' to '%s'..." % (self.__required_version, src, self.__plugin_path)) plugin_file = os.path.join(self.__plugin_path, self.__plugin_name) @@ -299,7 +276,7 @@ class PluginHandle(object): except (OSError, IOError), e: log.error("Failed in OS operations:%s "%e.strerror) - return PLUGIN_INSTALL_ERROR_DIRECTORY_ERROR, "" + return ERROR_DIRECTORY_NOT_FOUND, "", self.__plugin_path + queryString(102) try: if src.startswith('file://'): @@ -322,16 +299,16 @@ class PluginHandle(object): if status != 0 or os_utils.getFileSize(plugin_file) <= 0: log.error("Plug-in download is failed from both URL and fallback location.") - return PLUGIN_INSTALL_ERROR_PLUGIN_FILE_NOT_FOUND, "" + return ERROR_FILE_NOT_FOUND, "", queryString(ERROR_FILE_NOT_FOUND, 0, plugin_file) except IOError, e: log.error("Plug-in download failed: %s" % e.strerror) - return PLUGIN_INSTALL_ERROR_PLUGIN_FILE_NOT_FOUND, "" + return ERROR_FILE_NOT_FOUND, "", queryString(ERROR_FILE_NOT_FOUND, 0, plugin_file) if core.isErrorPage(file(plugin_file, 'r').read(1024)): log.debug(file(plugin_file, 'r').read(1024)) os.remove(plugin_file) - return PLUGIN_INSTALL_ERROR_PLUGIN_FILE_NOT_FOUND, "" + return ERROR_FILE_NOT_FOUND, "", queryString(ERROR_FILE_NOT_FOUND, 0, plugin_file) # Try to download and check the GPG digital signature digsig_url = src + '.asc' @@ -348,15 +325,15 @@ class PluginHandle(object): status, output = utils.run(cmd) except IOError, e: log.error("Plug-in GPG file [%s] download failed: %s" % (digsig_url,e.strerror)) - return PLUGIN_INSTALL_ERROR_DIGITAL_SIGN_NOT_FOUND, plugin_file + return ERROR_DIGITAL_SIGN_NOT_FOUND, plugin_file, queryString(ERROR_DIGITAL_SIGN_NOT_FOUND, 0, digsig_file) if core.isErrorPage(file(digsig_file, 'r').read(1024)): log.debug(file(digsig_file, 'r').read()) os.remove(digsig_file) - return PLUGIN_INSTALL_ERROR_DIGITAL_SIGN_NOT_FOUND, plugin_file + return ERROR_DIGITAL_SIGN_NOT_FOUND, plugin_file, queryString(ERROR_DIGITAL_SIGN_NOT_FOUND, 0, digsig_file) - sts = self.__validatePlugin(plugin_file, digsig_file, checksum) - return sts, plugin_file + sts, error_str = self.__validatePlugin(plugin_file, digsig_file, checksum) + return sts, plugin_file, error_str def run_plugin(self, plugin_file, mode=GUI_MODE): diff --git a/installer/text_install.py b/installer/text_install.py index 45696671b..d9d6b7da9 100755 --- a/installer/text_install.py +++ b/installer/text_install.py @@ -780,9 +780,19 @@ def start(language, auto=True, test_depends=False, 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) + ok, choice = tui.enter_choice("Do you want to install plug-in's in GUI mode?. (u=GUI mode*, i=Interactive mode) : ",['u', 'i'], 'u') + if ok and choice == 'u': + if not services.run_hp_tools_with_auth('hp-plugin', core.passwordObj): + log.error("hp-plugin command failed. Please run hp-plugin manually.") + elif ok and choice == 'i': + plugin_cmd = core.passwordObj.getAuthCmd() % 'hp-plugin -i' + log.info("Running '%s' command...."%plugin_cmd) + if os_utils.execute(plugin_cmd) != 0: + log.error("hp-plugin command failed. Please run hp-plugin manually.") + else: + log.info(log.bold("Please install hp plugin's manually, otherwise some functionality may break")) else: - log.info(log.bold("Please install manually hp plugin's, otherwise some functionality may break")) + log.info(log.bold("Please install hp plugin's manually, otherwise some functionality may break")) if core.selected_component == 'hplip': tui.title("RESTART OR RE-PLUG IS REQUIRED") @@ -843,8 +853,16 @@ 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_with_auth( 'hp-setup', core.passwordObj): - log.error("hp-setup failed. Please run hp-setup manually.") + ok, choice = tui.enter_choice("Do you want to setup printer in GUI mode? (u=GUI mode*, i=Interactive mode) : ",['u', 'i'], 'u') + if ok and choice == 'u': + if not services.run_hp_tools_with_auth('hp-setup', core.passwordObj): + log.error("hp-setup failed. Please run hp-setup manually.") + + elif ok and choice == 'i': + setup_cmd = core.passwordObj.getAuthCmd() % 'hp-setup -i' + log.info("Running '%s' command...."%setup_cmd) + if os_utils.execute(setup_cmd) != 0: + log.error("hp-setup failed. Please run hp-setup manually.") tui.title("RE-STARTING HP_SYSTRAY") services.run_systray() diff --git a/io/hpmud/hpmudi.h b/io/hpmud/hpmudi.h index e7b23aae8..345a39198 100644 --- a/io/hpmud/hpmudi.h +++ b/io/hpmud/hpmudi.h @@ -212,5 +212,10 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) service_to_channel(mud int (*getSIData)(char **pData , int *pDataLen, char **pModeSwitch, int *pModeSwitchLen); void (*freeSIData)(char *pData, char *pModeSwitch); +static const char *SnmpPort[] = { "","public","public.1","public.2","public.3"}; +#define PORT_PUBLIC 1 +#define PORT_PUBLIC_1 2 +#define PORT_PUBLIC_2 3 +#define PORT_PUBLIC_3 4 #endif // _HPMUDI_H diff --git a/io/hpmud/jd.c b/io/hpmud/jd.c index 033acc8c6..afd882af4 100644 --- a/io/hpmud/jd.c +++ b/io/hpmud/jd.c @@ -56,11 +56,11 @@ static mud_channel_vf jd_channel_vf = .channel_read = jd_s_channel_read }; -static const int PrintPort[] = { 0, 9100, 9101, 9102 }; -static const int ScanPort0[] = { 0, 9290, 9291, 9292 }; -static const int GenericPort[] = { 0, 9220, 9221, 9222 }; -static const int ScanPort1[] = { 0, 8290, 0, 0 }; /* hack for CLJ28xx */ -static const int GenericPort1[] = { 0, 8292, 0, 0 }; /* hack for CLJ28xx (fax) */ +static const int PrintPort[] = { 0, 9100, 9100, 9101, 9102 }; +static const int ScanPort0[] = { 0, 9290, 9290, 9291, 9292 }; +static const int GenericPort[] = { 0, 9220, 9220, 9221, 9222 }; +static const int ScanPort1[] = { 0, 8290, 8290, 0, 0 }; /* hack for CLJ28xx */ +static const int GenericPort1[] = { 0, 8292, 8292, 0, 0 }; /* hack for CLJ28xx (fax) */ const char __attribute__ ((visibility ("hidden"))) *kStatusOID = "1.3.6.1.4.1.11.2.3.9.1.1.7.0"; /* device id snmp oid */ @@ -83,13 +83,12 @@ static int ReadReply(mud_channel *pc) static int device_id(const char *iporhostname, int port, char *buffer, int size) { int len=0, maxSize, result, dt, status; - int public_comunity_index = 4; //By default we need to pass community name = "public" maxSize = (size > 1024) ? 1024 : size; /* RH8 has a size limit for device id */ - if ((len = GetSnmp(iporhostname, public_comunity_index, (char *)kStatusOID, (unsigned char *)buffer, maxSize, &dt, &status, &result)) == 0) + if ((len = GetSnmp(iporhostname, port, (char *)kStatusOID, (unsigned char *)buffer, maxSize, &dt, &status, &result)) == 0) { - if ((len = GetSnmp(iporhostname, port, (char *)kStatusOID, (unsigned char *)buffer, maxSize, &dt, &status, &result)) == 0) + if ((len = GetSnmp(iporhostname, PORT_PUBLIC_1, (char *)kStatusOID, (unsigned char *)buffer, maxSize, &dt, &status, &result)) == 0) { BUG("unable to read device-id\n"); } @@ -172,8 +171,8 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_open(mud_device *pd if ((p = strcasestr(pd->uri, "port=")) != NULL) pd->port = strtol(p+5, &tail, 10); else - pd->port = 1; - if (pd->port > 3) + pd->port = PORT_PUBLIC; + if (pd->port > PORT_PUBLIC_3) { stat = HPMUD_R_INVALID_IP_PORT; BUG("invalid ip port=%d\n", pd->port); @@ -858,7 +857,7 @@ enum HPMUD_RESULT hpmud_make_net_uri(const char *ip, int port, char *uri, int ur if (device_id(ip, port, id, sizeof(id)) > 0 && is_hp(id)) { hpmud_get_model(id, model, sizeof(model)); - if (port == 1) + if (port == PORT_PUBLIC) *bytes_read = snprintf(uri, uri_size, "hp:/net/%s?ip=%s", model, ip); else *bytes_read = snprintf(uri, uri_size, "hp:/net/%s?ip=%s&port=%d", model, ip, port); diff --git a/io/hpmud/pml.c b/io/hpmud/pml.c index 03f21bd3e..4e0b61b0e 100644 --- a/io/hpmud/pml.c +++ b/io/hpmud/pml.c @@ -44,7 +44,6 @@ #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> #endif -static const char *SnmpPort[] = { "","public.1","public.2","public.3","public" }; #endif static int PmlOidToHex(const char *szoid, unsigned char *oid, int oidSize) @@ -341,7 +340,7 @@ enum HPMUD_RESULT hpmud_set_pml(HPMUD_DEVICE device, HPMUD_CHANNEL channel, cons if ((psz = strstr(ds.uri, "port=")) != NULL) port = strtol(psz+5, &tail, 10); else - port = 1; + port = PORT_PUBLIC; SetSnmp(ip, port, snmp_oid, type, data, data_size, &status, &result); if (result != HPMUD_R_OK) @@ -433,14 +432,19 @@ enum HPMUD_RESULT hpmud_get_pml(HPMUD_DEVICE device, HPMUD_CHANNEL channel, cons if ((psz = strstr(ds.uri, "port=")) != NULL) port = strtol(psz+5, &tail, 10); else - port = 1; + port = PORT_PUBLIC; dLen = GetSnmp(ip, port, snmp_oid, message, sizeof(message), &dt, &status, &result); if (result != HPMUD_R_OK) { - BUG("GetPml failed ret=%d\n", result); - stat = result; - goto bugout; + //Try one more time with previous default community name string ("public.1" which was used for old HP printers) + dLen = GetSnmp(ip, PORT_PUBLIC_1, snmp_oid, message, sizeof(message), &dt, &status, &result); + if (result != HPMUD_R_OK) + { + BUG("GetPml failed ret=%d\n", result); + stat = result; + goto bugout; + } } p = message; } diff --git a/logcapture.py b/logcapture.py index 9f1ac30d6..8484da753 100755 --- a/logcapture.py +++ b/logcapture.py @@ -233,7 +233,7 @@ if sts != 0: 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)) @@ -260,24 +260,6 @@ if ok and user_input == "y": backup_clearLog('/var/log/messages') backup_clearLog('/var/log/cups/error_log') -''' -sts = os.system('rm -f %s/hpcupsfilter*'%TMP_DIR) -if sts != 0: - log.error("Failed to remove hpcupsfilter tmp files.") - -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 ####### while 1: @@ -313,10 +295,6 @@ if os.path.exists('/var/log/cups/error_log'): 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)) - -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: @@ -360,36 +360,23 @@ else: # INTERACTIVE_MODE log.info("Downloading plug-in from: %s" % plugin_path) pm = tui.ProgressMeter("Downloading plug-in:") - status, plugin_path = pluginObj.download(plugin_path, plugin_download_callback) - print + status, plugin_path, error_str = pluginObj.download(plugin_path, plugin_download_callback) + print() - if status in (pluginhandler.PLUGIN_INSTALL_ERROR_UNABLE_TO_RECV_KEYS, pluginhandler.PLUGIN_INSTALL_ERROR_DIGITAL_SIGN_NOT_FOUND): - log.error("Digital signature file download failed. Without this file, it is not possible to authenticate and validate the plug-in prior to installation.") - cont, ans = tui.enter_yes_no("Do you still want to install the plug-in?", 'n') - if not cont or not ans: - clean_exit(0) - - elif status != pluginhandler.PLUGIN_INSTALL_ERROR_NONE: - - if status == pluginhandler.PLUGIN_INSTALL_ERROR_PLUGIN_FILE_NOT_FOUND: - desc = "Plug-in file not found (server returned 404 or similar error)" - - elif status == pluginhandler.PLUGIN_INSTALL_ERROR_DIGITAL_SIGN_BAD: - desc = "Plug-in file does not match its digital signature. File may have been corrupted or altered. " + if status != ERROR_SUCCESS: - elif status == pluginhandler.PLUGIN_INSTALL_ERROR_PLUGIN_FILE_CHECKSUM_ERROR: - desc = "Plug-in file does not match its checksum. File may have been corrupted or altered." + log.error(error_str) - elif status == pluginhandler.PLUGIN_INSTALL_ERROR_NO_NETWORK: - desc = "Unable to connect to network to download the plug-in. Please check your network connection and try again." + if status in (ERROR_UNABLE_TO_RECV_KEYS, ERROR_DIGITAL_SIGN_NOT_FOUND): + cont, ans = tui.enter_yes_no("Do you still want to install the plug-in?", 'n') - elif status == pluginhandler.PLUGIN_INSTALL_ERROR_DIRECTORY_ERROR: - desc = "Unable to create the plug-in directory. Please check your permissions and try again." - - pluginObj.deleteInstallationFiles(plugin_path) - log.error(desc) - clean_exit(1) + if not cont or not ans: + pluginObj.deleteInstallationFiles(plugin_path) + clean_exit(0) + else: + pluginObj.deleteInstallationFiles(plugin_path) + clean_exit(1) tui.header("INSTALLING PLUG-IN") diff --git a/ppd/hpcups/apollo-2100.ppd.gz b/ppd/hpcups/apollo-2100.ppd.gz Binary files differindex ea3ca9b02..8f91cddd0 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 4bc006ebe..68816375d 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 29f17b9db..c86c5c6db 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 25c7255aa..648c7f902 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 9b321521d..35bbbf991 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 8284b6a5d..b9be4af65 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 4968065bf..7ef2b6e20 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 1547890f4..c508038f2 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 c8574120a..7eb4cc84d 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 9084136f1..80bd13343 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 e76422a2e..ac7935f88 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 c56a7d177..e24b4774a 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 6c4dcd88b..ea79d4fec 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 2bee3bbd3..a17057943 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 9609109cc..95f104782 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 27874354e..75ae2f8df 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 27f97dc44..66de8b91c 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 527394c1f..1a7b01742 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 0e3de29ac..299dbb217 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 62fc2b2e4..bd94add54 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 712493bd3..c22f211fb 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 65ddfa973..30a9bc9cc 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 dccb59fcb..434f43cd5 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 ab34a429a..ff9ca7a9e 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 a8cc67289..6f18dc785 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 c57495fd8..8d152a1f8 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 4968aed82..cf8493b2e 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 be0180694..b7b2e3c94 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 575bf79e0..567a1e931 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 2b31e7cf7..bec474f64 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 c41da291e..5ea9dd6a8 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 b66672a99..7d3648b9a 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 f6b98f024..231d63f00 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 9c59e8964..bda473896 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 325b32304..2d4283dc0 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 30a475e57..9d16a523e 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 13fb428fa..02d5606b3 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 b29ef2167..5156ed89a 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 04fa45d05..de093e7ef 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 7f6ec40e3..2f95d3365 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 a34a07f2b..96f38eb00 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 2051e24ed..3e2b5eb47 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 75e47b2a9..8304165cd 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 f1978b17f..3e0ab5ec4 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 a40daf4f3..775656a72 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 8e009bc10..863beb9a0 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 46e2edca0..c6acc2660 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 14bc3a898..e9b1af7b8 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 d908f8a26..c8aea7f07 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 f965f3229..7aee899ad 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 2f365b4ed..4feff9987 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 1118b7ecf..ee45aaac4 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 21531ead8..19998d43c 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 c1ed084db..300b0b5f2 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 120642374..78e968b93 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 628bd153c..086cc33da 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 e1d0885bb..51ecf5c59 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 f3f2ec09b..dfbe21948 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 295a5e8dc..630d00966 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 52a2fc539..20ff1b6ee 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 7e421ecf5..0207be60d 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 c6cb63fb4..d206250c1 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 f83a4d847..27a78edf4 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 9f317f8c1..102ae01c7 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 9e7452256..0530e3765 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 969bb7ce2..3a571263d 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 b462178e1..ad0febb9c 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 115dae4a6..6ccd58d99 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 f1b6b467d..05ce05935 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 7dd9bb990..2f5437839 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 38747f8c9..fd435b6e1 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 198de9d2f..575f303ce 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 3d99b284d..e8cad59bd 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 95bdfb46c..ee49a4d25 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 d3bd23fa6..f0e27b642 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 d4612eed9..4bfac7ce4 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 2cb2d1a1f..2f7f0f3aa 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 0fb7f9c17..0e1f69386 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 ad81d1bcc..6e2f14aff 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 18e699839..477dbe786 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 27e749fe2..d53439314 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 1974af2d4..cae832302 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 696510d4c..5778d06f7 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 756d45aba..0c5e665cc 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 a9926d6c2..2508fd744 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 differindex a255b0175..bb5ba7f65 100644 --- a/ppd/hpcups/hp-color_laserjet_pro_mfp_m176n.ppd.gz +++ 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 differindex 8830388ab..b49c9d310 100644 --- a/ppd/hpcups/hp-color_laserjet_pro_mfp_m177fw.ppd.gz +++ 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 307cfe8fc..f2cf14a2b 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 6356423f0..4858212d8 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 bb64e0e85..6d90a4855 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 36ba2206a..aaee75ee3 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 411c1f112..a61eab4ee 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 2c4d06432..43626adbe 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 0b8e2abff..9b21e0322 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 f3ec751c3..19c449ec1 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 755ba2db5..9a007aa8f 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 be0c2d3f7..330e616ee 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 4574fa203..2eedab720 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 f0a2d1c30..b4a86c60f 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 6663c8ca4..2e1df830e 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 904530947..c054ca043 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 f5d431b1f..4cc74e4ea 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 94999f034..2973a1811 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 7d1d8ce9f..f6eb0afd0 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 c6f596f52..58df6ce4b 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 e0cbfb82a..f76236864 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 fe934f555..dd04a3c48 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 differindex 0e0dbde96..1d910d9db 100644 --- a/ppd/hpcups/hp-deskjet_2640_series.ppd.gz +++ 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 ced0c3d07..6ac0268ff 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 b1777fd80..8c6387083 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 549439b1a..37d2505d7 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 2abcd8507..6b41bbc2b 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 c8c561a68..04539f71c 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 3cf86098e..1ceabcfee 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 ef5a6004f..011144775 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 ca186f19f..e34a4958b 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 a0a98a32e..4ba702c9c 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 51c1a9693..614e8dfcd 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 3cc33f0bc..ba0373835 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 e00fd46ad..b702230e5 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 506d8b978..930949c51 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 bb633d5b4..7a6334b60 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 e4d0ff376..4b5036b2e 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 5aeec1217..0380dad35 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 377fe9f8a..d7eb6ee38 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 c52786e79..64359e3ca 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 15e29f109..2b20cc748 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 de5a4d077..311dc22de 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 151be4b9b..9fcbff2a2 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 fcdb1c58c..a252d11a0 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 74e6b1250..1228dd7dd 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 3eb5121c5..3fb45d5c0 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 4f8dec3a4..a77a5626c 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 0da289e1f..9eef988ba 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 b3b526f76..ec5d8e38d 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 284ccb41f..415b6d138 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 4fde44876..2492474e1 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 e3185387b..de6506c2b 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 fa92e99f4..e91c19d85 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 8fc27035a..16d8df7bd 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 115a22708..a0f317d26 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 99a19721a..f350a924b 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_4640_series.ppd.gz b/ppd/hpcups/hp-deskjet_4640_series.ppd.gz Binary files differnew file mode 100644 index 000000000..29ba3c19c --- /dev/null +++ b/ppd/hpcups/hp-deskjet_4640_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_500.ppd.gz b/ppd/hpcups/hp-deskjet_500.ppd.gz Binary files differindex c70aa7446..1a01a7656 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 9e56f3904..065ff823e 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 d237300d7..dbe5d46aa 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 9e3111921..844678a47 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 35880300f..7ec9eb60e 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 305119d89..4e75d40c3 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 a91223759..5cd874d84 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 3f3af6204..e4331543d 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 1a1879866..82620c8f9 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 b9dd93f1b..55b6ff0b5 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 ee288126d..818b45a72 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 d48082898..ea89e39a4 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 4024aac52..cda94a228 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 326aea45c..754aad2f4 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 81db9e021..b63952ca5 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 3bfe21f3f..6b0f158bb 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 a28727a6f..c835a6969 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 06b0ae132..e59d91166 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 92ff6a74e..edc32afe4 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 94a13330f..86f250e59 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 42a7de192..a71c0fd87 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 bb51c1f39..ecf0e9551 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 5786c8f74..47b496eb0 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 4231cd511..dedfac16f 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 f6a8adf14..4045e8d88 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 3cbbd265a..5d2a1545c 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 d39cb404d..7fcb7e2b9 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 9879ea077..e99dea243 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 29381ac01..21a8fac84 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 4634fbc6d..cdfb1b045 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 7bf359b62..d2c7ddb11 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 d6cc5cc21..3e49284d1 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 26ec49fb0..d0d0c5326 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 db643e7a3..0400f1e71 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 7bf2a8ead..4dae77221 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 1a5416f15..3ecd0192d 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 52dc3ebd4..e2d3d0f45 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 d987efd60..df14dfe32 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 0ca500a65..58c0b1c51 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 268d33662..6221f998b 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 5942a4a2a..b3fab44a6 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 bcfd2aea5..6e0248427 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 0ed255a53..8f52e6f4f 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 a1b4dbd98..742872ded 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 8c83f0587..885cd9606 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 990fabf8c..ca2ed6474 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 1e10a6ddf..82b6bb70b 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 96cdd146c..e236b7213 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 ed21a1f81..38776fbc9 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 adf5eee18..2703b2b87 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 c3d500afe..6de9d405c 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 47d751dd7..173f0b283 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 e8bc1d41b..32bbd590d 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 56643c950..cd5081c88 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 ba89cbe72..f94e4d1e8 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 dae7bb0e4..fa1cf52e6 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 ce17ae14d..33fa27930 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 7f0e9a135..932ddd54c 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 6af59c40a..41bfa08ff 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 e14556eaf..6777397ef 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 3d7fd3bca..f6429b7a7 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 e9b448089..a953f2403 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 7dcb20484..d9fa4e431 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 deee446bc..b7d3c512c 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 b538b4735..59dd6f791 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 a0d57527f..b8e988203 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 0935c500c..ad5806037 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 700cd8240..1b854fa66 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 0d26f850d..883b81358 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 72cf0f8b9..509ed932c 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 79be1436a..e2f6dd3ca 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 33a6066b4..3839f79f9 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 f10ad27a4..77dc4171b 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 3876d32ce..1ebec06e1 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 0e381e2d6..03670ef64 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 e549d77c0..989d93c06 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 1eb053c60..6ee62735a 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 bd6c53078..b38001669 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 576d62e37..86c3ebd3b 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 a27ae24ef..11f87e104 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 d4b5270a9..41f72f860 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 54ba1529f..62afeff86 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 a134784fc..083996369 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 57f7badf1..6f02665be 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 618565caa..cf2a1e71c 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 f273aa725..781104acf 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 da8ecc1bf..abd2ba435 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 7190de39a..83d11f3d0 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 ad61e4640..b74a5ab09 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 8cb758e97..6170a048b 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 0d16dfa04..471f28530 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 24544c4f8..3df524706 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 8136dc759..16b5549e3 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 9a4692e9f..5b112a450 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 7db5ade64..706f23881 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 57c59e311..058204190 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 e9d9738b6..753ad2314 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 53dc76ad3..778e96841 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 6c83dc4f7..605a21f5c 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 e3fcf4dcb..c6da59e27 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 a144b8f54..fdef5c071 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 e500d2dfc..7b3e5ac4d 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 0f5188c34..f736ae80b 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 537948cf5..42d29650e 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 3aa3bc7ad..466bf79cb 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 07007e5b4..00d233931 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 935534224..81c4c1451 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 2616bca84..577b686d5 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 49dd98983..b54402518 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 f061b5036..bc42be9b0 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 b6272d39b..1d1edc944 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 8e8fcb979..1a90a4065 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 15aa2fbdf..13f0217c3 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 a317c5218..47972fbeb 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 7b2de6ef3..2c8de9eb7 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 9928e8778..437b4e64e 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 9b93f12e0..cb8cc974f 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 7a420bd5f..aff3f38b2 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 e71f5afe1..1651e1279 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 ac8434d55..71ef34e38 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 f524e33f4..7324b167e 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 94d9dd346..d840fd159 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 035a8d711..507130c96 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 d3cbc2ec9..b0b488e80 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 113b461a8..b846a9d2c 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 035477656..1b9779399 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 55deb8330..18cc8090b 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 2426382c9..af1e5c2d4 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 d6f25d1dc..47f5e9a0b 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 41988fecf..a9c2dce32 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 f0e533db1..6ad0bc5ed 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 3e469ac07..8259730d1 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 3c9c616ce..918c1ad0d 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 cf008c20f..29606f402 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 2654e7522..f7d9a2155 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 20340745a..710f30366 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 e1cdc5737..d6adfc806 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 96c0bd347..13dda35e3 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 6a8ce4646..68ae92934 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 78dbb77e8..179d388de 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 766c9c75e..d90f6ab21 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 38a6952a9..356607ad2 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 119d9c325..cce8d01bb 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 5f5cfd697..5ddf723de 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 ff3ba303f..e7b91fabe 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 38c563512..c9c0fae74 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 2d67f575a..2054ed9af 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 55865217e..827e2d175 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 036a59389..b06824bc0 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 8f01baaaa..16c6205d2 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 afdfb4b00..c9dfee8e3 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 597a794dc..8f2c57f56 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 91eda5efb..3df79eaca 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 3f806e964..f1bc37520 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 3b97b631d..13ff3d58b 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 40a77fee1..e16c98b43 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 ac132e138..d1feda374 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 237d27f18..bc11ce486 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 0178ccdb8..849c59186 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 373ab754f..bb39cb2ff 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 66a4d71be..575f80043 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 37f3fa9e0..6aa4ccce7 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 c80a6ea7e..3c9467e94 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 770937e78..537cdd29f 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 2defcf098..071583171 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 8b973f49d..e7a0e7b96 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 005bc4e98..234768979 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 678067a61..4127c01cc 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 6f316caeb..132c2b356 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 c9cc744fd..9e73972c1 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 c7ebbcc38..fc16b0cb1 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 b7caef90e..437442370 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 12085f846..9b1427cc1 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 fdec466d5..6c1c57b65 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 c825ddb4b..f740cee24 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 b8c8fb1ed..b6994fa1c 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 9e1bdb6d0..fac475f4f 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 67ef8bb07..b2386cae6 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 09254286a..c3e0711d2 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 a890be838..7f2b5e319 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 cb62b9c22..6309b2bfa 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 343a3d1e7..9904a856d 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 677b66bc1..1d56f0f24 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 700579a22..afd7694f8 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 c595231a6..cfe805c52 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 f1b67694a..9c79d5714 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 04f704bb0..b5b53b1ac 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 e284e3435..910b91ab9 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 d7c8396fe..2e289fbd6 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 daaa5fae0..a65d4fc45 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 d80b9948c..0958fccdb 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 4494ddd7a..6242dac57 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 04244e37a..2edc5cab0 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 ec989fff0..a8e7eb341 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 b29a9fc69..1c059b230 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 fa121c929..ceda818eb 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 ffb09ae15..28fb4d2fb 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 2b9d8cc32..3a51e13f2 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 2769b48a6..52c581756 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 b7d2bc1d0..0f966bcb4 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 79a23038e..1a4538a42 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 27b573a1a..53f8afd37 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 b183e4ef7..ea90c966c 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 83e85ee05..d287088c4 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 4290cc8dc..40f0ba855 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 edebd5046..47ab9a0df 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 35d1f6648..0418d225b 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 fe136d83a..18d77be63 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 fdcddfe8b..e79b1b654 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 1f3f3bf2e..3e953ac6e 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 a0498188f..f13ab0c64 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 4c32d2303..1578b247a 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 30337ccff..5b022f044 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 c78a73bba..37654aaa2 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 6a394bba9..404edcbf2 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 f30f7d16c..a5e6bdaa4 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 d6bed3e01..efeef8a41 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 2529d9d04..ea9c29ce6 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 27aba100f..571fdd990 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 8ca5b9d68..f292bbeeb 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 8ae78ab9f..3c4f19b62 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 82226d16d..556b8172c 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 8e8e3a6b3..9dfc70bc8 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 d527a6224..295704351 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 0d48ad2a9..0f76e24bf 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 5dfbfc54f..c11f2eda8 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 e085236be..fb0035bd4 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 05f982ea3..8305102f5 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 b56332718..2c6df2729 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 781e7df22..a5f943526 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 391148d2d..194df8055 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 6e6598d5e..ad8f2db4a 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 24682978f..aeb05bd61 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 07f16a593..be0b99e05 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 2211c8e9d..0696aeb7e 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 e4b3ad899..d21a69f4a 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 bd74966e2..57d5d07a7 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 80c1f5433..0643e9a53 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 041d895c7..e568b6f5a 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 321f5d5aa..b80d7d8e3 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 a58a57442..577233d9a 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 99846fcfb..b52239744 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 16fd9e9ea..8930eb533 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 83c71ee3f..948187126 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 7718ad60b..19c1461c3 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 c52574ec6..fe34a5a38 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 bef7dfc26..9e147264e 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 a4a9c3d12..d3f1e210c 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 afa411a8f..e5d6e861c 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 61a0b7070..088ff4644 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 c67a038bb..1212a9ef4 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 839416a56..ce0460ce2 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 94485e6d7..102c4687d 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 d69bb5a47..3444b518c 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 d35043960..841c00ca5 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 035a14b43..ca2430299 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 ec8aa2210..f005c518d 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 19ec534e0..1986cd69d 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 f73a81d8f..318c2a2d2 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 bf49dc783..27cc91e20 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 0a475c739..55bfa6d7c 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 2860b6857..16e2feb28 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 f246b3a8a..46ee2e48a 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 97e32fad1..cfdcc796d 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 df9615c7d..c06a7382a 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 372bbabd2..4e4d3e045 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 eea064cb7..3fd811b17 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 eb9d1a64e..fe3808438 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 a8d5db512..61db87914 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 e9422a4d5..217585db1 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 adab39d62..ec30c4797 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 538d3bcff..d35b453c4 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 e678686fe..6bf410cf8 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 66baedce7..ae5162939 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 1078f0df3..61a012463 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 bf17017d0..72d3044f9 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 9b1edbfe4..e1ba83691 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 53b7172da..477f173c6 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 61119d2ae..5cddc17ee 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 a1689feed..1f48a8062 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 788282a84..7e350951f 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 e79b18d77..1dd96507d 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 cd8aab04a..856d7360b 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 b88634e3c..c3c2f41e7 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 3853cde1c..edb400b56 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 6db17e23e..ba3bf1a41 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 bc2b54dea..d4c835817 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 bfeb12872..0b5339d12 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 13e9965ac..520fd3cc6 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 044d58f8d..116700054 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 cd573e2d5..62a06783f 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 f469d9ba0..866ede558 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 590b3ed86..360265ba8 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 28d878f4a..bc1808d1a 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 af4648e25..e49851b6d 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 c77f9ed3e..c13653071 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 9ee9e949f..5d629e724 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 17ee928cb..b61549afa 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 3cdfb4f21..cb8b35193 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 d878bbea8..5fd71e4c9 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 6f70b6a40..fda50c39c 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 4729fdd1f..b1cfb50bd 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_m125a.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125a.ppd.gz Binary files differnew file mode 100644 index 000000000..ded90a74c --- /dev/null +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125a.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m125nw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125nw.ppd.gz Binary files differnew file mode 100644 index 000000000..10efd731c --- /dev/null +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m125rnw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125rnw.ppd.gz Binary files differnew file mode 100644 index 000000000..e8d8bce43 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125rnw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m126a.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m126a.ppd.gz Binary files differnew file mode 100644 index 000000000..0c6bcbf69 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m126a.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m126nw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m126nw.ppd.gz Binary files differnew file mode 100644 index 000000000..2bfae55e8 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m126nw.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 differindex 99fbf1400..4bed99e91 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m127fp.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m127fp.ppd.gz Binary files differnew file mode 100644 index 000000000..5e8a01dfa --- /dev/null +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m127fp.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 differindex 4d9aa65f5..a6225a6ac 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m128fn.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m128fn.ppd.gz Binary files differnew file mode 100644 index 000000000..d557cb557 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m128fn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m128fp.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m128fp.ppd.gz Binary files differnew file mode 100644 index 000000000..66c0c5a98 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m128fp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m128fw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m128fw.ppd.gz Binary files differnew file mode 100644 index 000000000..2daa79012 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m128fw.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 4e8f5aade..d6da8776e 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 58a800d5f..76b5bdc61 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 a024657a2..434c2ada0 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 c675027da..740dabb6c 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 013fe628a..4842d2150 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 1789727f5..382acc020 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 06d762151..9a91c3a12 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 afc048224..0722a7d0b 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 258f57ac1..2ff37191b 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 d6e0cb2c7..6acb63278 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 40d157049..bd3589d6c 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 8908a573d..3104a0ab4 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 4d2d5d415..1cc6c3316 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 510c53af1..a2734047e 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 9d5220a6a..38d561350 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 88dabaad6..0bd13cad6 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 5484ea6f0..a2e8e162f 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 3ddb0979a..9d4c4dd3a 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 dbd2e936d..e79273d95 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 b486d4694..e033b2484 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 0de3c6039..894c57a0d 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 203faf0ed..8f9319ab4 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 e8bf23c01..76878e437 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 1fa8dfa48..e9e00b1cb 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 e8aa64ac5..74d5b52dc 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 bebd08931..f63cec9da 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 aee3f80ed..bcb836b27 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 a9bdd3531..1f7de8465 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 0f7817649..55194373d 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 102b3128f..0ed6bbd8b 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 cfb40e24a..d1c3165f9 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 f1be151b1..3e2be51b8 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 bb2badc5c..a328bd0e9 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 3ad154fa8..d02a26335 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 ec21034bd..c40336f15 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 5bf367d6d..9efff9570 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 177d72a43..7b33498f9 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 57c9c90e6..2857d18c5 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 0f907310c..06ba193e2 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 differindex 36a7d920d..012750a73 100644 --- a/ppd/hpcups/hp-officejet_2620_series.ppd.gz +++ 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 f65d285b9..ab1511e16 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 d1f9bd53f..9ec498f88 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 ce99c2d2a..f811d2086 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 f6a108ae9..63a562205 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 b00e88c98..6518802c8 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 fdc41ae33..126bc1d4f 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 8b1db29d4..d7501d941 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 e19ceba4a..ef6951ab5 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 228e745fe..e09e8a8bf 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 94927fb2c..0430d2998 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 792373401..479eaf2f7 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 a50a7451d..c58084b13 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 ab75ed3d3..1f5822ed0 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 8d9c85e61..705e21c9b 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 e8fcc1234..f0064cf04 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 c5a5b2f47..34b00a03b 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 1af7147c1..d9df6bc57 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 a5c88861f..bec1c4440 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 2850f9500..d7d66b90c 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 4bf7f7f92..5e23254cd 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 66835b272..16637b775 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 169bfc442..dee932a7d 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 8fe6082a8..53f3a7ac9 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 22e786f8e..eca61973e 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 a99c86878..3a49f4620 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 2c253e648..7266dd23b 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 dd3f102c4..c18200ec1 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 36afd0300..03c610b73 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 66e343443..086fc2e30 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 81224e06e..7fba6779e 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 18b2e3bc1..e1a01d6a8 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 4f068e596..b824b03f6 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 d80a80f0b..0ad71fe08 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 3db38fe3a..01599b7a1 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 35c091aca..3cd30e999 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 e41ecacfb..a20532c36 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 b4b086c3b..fc0579a9e 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 0dca3a1dc..e3f062fd0 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 b076b9780..d2cdde86d 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 493c2689d..e5ff97bf0 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 6211632ac..d668b3e2b 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 99c7598ea..b59328f46 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 39ea7ae87..31d61abc3 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 e6f91a865..25e6b3530 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 3d8200e68..6c7ed3efb 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 ff3c64ab7..f3b729af3 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 bb340badb..5bb4cbc5e 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 650a29572..72fd7c9ce 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 90c2f34eb..8642ac94d 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 9a15a8836..6e0b2e6ad 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 6333f0d86..c3a312ca2 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 a008698cd..9a3735961 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 9223ef3b5..a6c4f4afb 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 abd744864..ab53f8b90 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 2764009dc..bd37268ce 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 297278e8b..cfe78dcd0 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 0f7502010..99a83b7dd 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 653c420df..7f11458c2 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 4639ef36b..cb6d87a5a 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 beb4b63e8..5292438e1 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 77ff99ad3..cfe1445a7 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 8b47b39c0..92672cfae 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 0b415bb50..db9db28c2 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 b4d01cad3..aa15ff33c 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 608b32d3d..fd1c83cbc 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 9cc6087fe..82cb6511c 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 f83886669..821730742 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 809a8256c..b5ed1cf7d 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 360d6e398..2443e3707 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 a0a2fca9e..058c896bf 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 655a9ecf2..dcf0c50e9 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 e6156c0b9..3122e9201 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 ed3781f43..1f212dfc9 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 38d02512f..d69b7e289 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 16429d297..382dc2f59 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 9efa44f1e..5561c7bad 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_8610.ppd.gz b/ppd/hpcups/hp-officejet_pro_8610.ppd.gz Binary files differnew file mode 100644 index 000000000..91dd27c1b --- /dev/null +++ b/ppd/hpcups/hp-officejet_pro_8610.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8620.ppd.gz b/ppd/hpcups/hp-officejet_pro_8620.ppd.gz Binary files differnew file mode 100644 index 000000000..87e589183 --- /dev/null +++ b/ppd/hpcups/hp-officejet_pro_8620.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8630.ppd.gz b/ppd/hpcups/hp-officejet_pro_8630.ppd.gz Binary files differnew file mode 100644 index 000000000..7e7255ad6 --- /dev/null +++ b/ppd/hpcups/hp-officejet_pro_8630.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8640.ppd.gz b/ppd/hpcups/hp-officejet_pro_8640.ppd.gz Binary files differnew file mode 100644 index 000000000..61b666943 --- /dev/null +++ b/ppd/hpcups/hp-officejet_pro_8640.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8660.ppd.gz b/ppd/hpcups/hp-officejet_pro_8660.ppd.gz Binary files differnew file mode 100644 index 000000000..b1ca2da84 --- /dev/null +++ b/ppd/hpcups/hp-officejet_pro_8660.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 79edbc129..9cba5c342 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 6f76f070b..5af845708 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 e9e0c204b..4af26cfba 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 2e84169ea..3dc5775a5 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 01b52973a..e1c37764d 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 a59b29f8c..0338eb102 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 595013398..eba6984d2 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 db79c7b69..5c9b5663d 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 cb6e18f12..6fef34ba4 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 b78f6003b..d798357fd 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 b5fc76025..45146426f 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 0f10a131b..08ec86de9 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 ff807f341..06528db57 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 6f9f748da..afece8e7e 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 43527f63e..6c79dafef 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 9f36ebddc..fc3754938 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 4a239c862..12381e6c9 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 d0287b43a..d93e25095 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 60bc893b6..58d254a21 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 643fa2208..e67538929 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 63ae06fab..e791fab13 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 1f1693a4d..f9e025652 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 db1245b4e..9dab9c61e 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 68a4bb3ed..9a274f5ba 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 09bc44e50..157bf416f 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 e14b5eda8..d93606973 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 64d74bf72..90aae4762 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 eeb348533..f10020725 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 165d296fd..6f5b945d4 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 08f791b69..c725e46a6 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 a5ce5fa71..f576e5659 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 1d89c2bf6..9cdcc2e41 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 161203e57..04f30bf48 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 bd0e2cae0..c221e21a3 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 ab210c1a4..3788c6a47 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 ecdd4826c..43aadba21 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 68563ec07..7ef123ec1 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 d207e7ea0..0224fbcb0 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 44bc86f2d..5b02bc980 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 45267722e..1d2e48b80 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 970d933a5..16c1fc365 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 dadd5cf73..f177a1845 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 53cb63ae1..d774678f4 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 526c11e7a..959a9eefb 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 5fdc3523a..82496d3c2 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 e86bc0211..978bd589e 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 11ee28556..19f5b80e8 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 71290b665..cb0303fda 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 74ca253f4..78dcd1d99 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 c79a9262f..d933411fc 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 cf71e4ac1..01b647d04 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 40f7ef193..c170800e8 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 3066de1ae..af4529084 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 8bea94f24..767016c41 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 b4cbf8430..2b8bfccae 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 bbffe9dfc..8e8d5104e 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 e0f4f8ab9..bce3f740c 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 1985d96a8..c54081258 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 68aee6b2c..7ec8634bd 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 3eb4f49bc..d4eab7def 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 9ea7dd3b1..146036201 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 29bf3c69b..a7b8c9828 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 fdc294d05..a11f00f52 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 e8b1c943d..fbf726114 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 642399c3e..5546d875e 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 c060f3d9e..12c60adfc 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 2148ddc3c..2c52c3bc8 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 67a4793f0..cf90f2434 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 12ea2e08e..293dde214 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 c4ca5b0b7..f5f8f574a 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 2494628af..553e976ef 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 8504e8d02..866a290fd 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 e4eb7a8e2..e8e37d1c5 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 9b1f5b46e..88d17c0a1 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 8ad4b52db..42a791f54 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 8cc56e6b3..51c643fd1 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 e0d688387..957c4c3cd 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 1a957b09a..c683537c6 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 84ccc691f..4dbacc43f 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 ad5d161bd..566554038 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 fa7a471a1..333791ff1 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 a4589707e..d0d1f1485 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 8ef095e12..f0f97ad30 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 3734ae429..21853112c 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 32fc91d77..ebc76c005 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 acc8ed126..c1ca38feb 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 19dc19e8a..05df6d7a6 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 989a3b747..9ec5ba72f 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 4ce09a76e..dacae6044 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 8f15460bc..4a562817a 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 8cdf54f02..3f57e1a73 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 bfe3f68e0..c09c1a942 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 fce1f36c6..5fa5cea9d 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 3d92f4c10..89e2d269a 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 ed794a796..db9a748fc 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 0f29ad5d5..b73b91f73 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 7ad90fda1..c7366e0a6 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 9e870a4ad..c52265548 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 6cd90a2c8..7ba0122d4 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 7619adc18..68950e0f8 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 120ae0c21..f178ff5d3 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 7a7c72856..f0555df5f 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 49a84d8f2..7efc021ce 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 31e171920..04c3de147 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 ae9dd0acd..afc91f07d 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 3c819208f..a574b0b57 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 193b6f1b8..3f1416168 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 1ad4a18b6..9a4c30d5c 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 111ce5c96..f01a1d476 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 959502436..5a079b45a 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 219dc4351..d0c633740 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 4c6cd3332..6b95e475e 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 0ff895d1d..72a55f3b2 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 83a842973..ebcc1b83d 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 219d7d9f1..26f61070c 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 0308991d8..9caf56e23 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 eb2b4e9d4..a5c50b595 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 54f77b595..4138dede0 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 f7f519406..f8d9cbce4 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 03f8be525..a414dbea3 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 8924341da..e3829b894 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 8a14940a3..0f22c5563 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 3092c3ce6..d97a03b5a 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 7a694a98c..ca08ad80a 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 e21c29565..206fd343e 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 491d50d66..d253ba3ce 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 d88b9c51a..346d19b86 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 8e2618fbc..1370eec25 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 786059028..62dffd805 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 fe4416e26..c320a4dec 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 e30b50f7a..2e11f7736 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 1744d80fe..ce33bb563 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 25f58b327..f94cdb6bc 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 3c9f613de..13f525215 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 061809a05..8c6a73a53 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 8fb31d126..1169bc310 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 01043ddc4..7c85a6a84 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 244a5a433..709877628 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 46f7ccdd1..701f881ac 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 4eab9d825..86c72f44f 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 c59789ae0..e4253f745 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 75f8c52e5..b9174ffc3 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 b465d0ee9..636cb0797 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 286e2e93d..75a1c6db1 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 2ca97d251..2c00855fb 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 6e461d948..f0cf6f42e 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 9cb94b078..86677d5cd 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 648b6f664..3c251938c 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 9d17488f7..a0ba7d4a9 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 791755c61..540066981 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 43a53dd9a..decbea500 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 27a60c465..bd295a87a 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 29991d847..5f5dc49eb 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 cd66593fc..59aba3eb8 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 07404cb3b..7b6b4d7b4 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 351d07134..55e7ba49a 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 2100331eb..9f919168c 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 d67c04f1a..a6a71102f 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 0b2f6a367..0022a4526 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 f3f33140c..47db95a84 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 af19f19a1..695b57c6d 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 bbcb7bd45..646da0c54 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 d5be6f508..c20692b07 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 1b59a45d3..d8d3fa538 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 de2be0dff..dcbbf3077 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 8270053a5..05577c3b3 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 685a17d9a..991cd005d 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 301291986..08b2e7f25 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 c9aaacadc..b57385543 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 99ce5f7b5..51327cb39 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 f5c3d0033..5b31aea9b 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 c0738defc..a74cfb9cf 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 7c5080202..893aed8e0 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 6b84862cc..5cd926344 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 484b02b6e..e046b289c 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 d7ea1206b..eedb59fa6 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 28533f6e6..fe7827fd0 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 dac84a523..bc0d49ca0 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 63fbd43bf..89f204685 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 3faa3d63f..50d08d9c6 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 15c731b00..870d1279a 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 f24716ea1..f4bf1aa3b 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 cba73bb9a..5fd66b9d9 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 b0533a7dc..1219cd7ae 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 5c82c9f9c..9f82d4c2a 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 7b6be6800..c1fccda9a 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 171ffea78..08be457d9 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 c9bd7c872..eee9c1c1f 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 339ee135b..b3e7bbbe9 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 84d08633a..9d8741f85 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 eba949a2f..4db2e8f8e 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 3571ab767..873794941 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 9f2a33ad7..5f1a963c9 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 cec0f2428..b9f008d28 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 2bc270412..b0f03ccc4 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 7df44b38e..1f8c6ddce 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 b906eb836..d683649e7 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 9d5547e67..f06ff3a39 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 2ba02abb7..e771ef3c1 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 51858a947..d6ca4eb44 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 1654e1566..9eafe36f2 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 0e0280ac0..2577807c6 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 e991ca27d..4ec509b97 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 ce35bfd2a..d784c8600 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 988991f4a..7a9ec7fdc 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 8a5262b98..8372b323b 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 3b0e726d1..510409297 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 e537cfd4d..e0682d24d 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 59c6efe0c..e234e7bc1 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 cf53eec5e..10cb26d03 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 1413fe02f..a4f182fa5 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 3d549253a..cc603b952 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 115d6f792..3a25742f6 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 2791253b5..1fb1d3883 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 fd4e86b5f..92f192174 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 15a1f6830..416c48c4e 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 0e5acbad9..0d6f31dc3 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 483e2e827..b5f4948f9 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 982d7c3ab..fde18c930 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 3f6e6fd18..71938ead5 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 e07143f88..68e27b456 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 e62da85f9..e99af0795 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 81b38a3d0..ccbdf9e75 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 ff2e64c60..15b999452 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 66fc6cc51..e868438cf 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 b00d485bd..fdd60fdca 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 f216d42e5..3b4eaa2e9 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 15b547be1..979692cc5 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 0bb539960..9920ea3f0 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 6ed08303c..c94e795f9 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 d1c8f0f03..63c9a1da6 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 131595f97..b4c948228 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 c9a94e849..d2344104c 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 9993e52dd..226b52ab9 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 3c3a20ab1..139b05798 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 43be390e2..d37a76495 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 54d4c9e14..dcf9ff6fa 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 605073f11..30d19c165 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 72b6fc9a0..e0771ec72 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 2c45f8756..357330421 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 78f3f0bb6..4cd114d8f 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 368a5d4fd..1f351c86b 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 039acc40b..d49d9ec72 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 307cca4f3..5b964ef72 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 058d865f3..3a1243180 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 70722e960..de854d6bf 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 f88e8e0bd..b017c933d 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 6408ffab4..845775db1 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 ec064ab2e..95ee1c19c 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 700dabd91..6e233a3a2 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 36a67cc69..bc20cd8dc 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 accf11c25..1c06bcfa2 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 differindex abceddd87..e70c95316 100644 --- a/ppd/hpijs/hp-color_laserjet_pro_mfp_m176n-hpijs.ppd.gz +++ 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 differindex 833e19c67..a1210a5dc 100644 --- a/ppd/hpijs/hp-color_laserjet_pro_mfp_m177fw-hpijs.ppd.gz +++ 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 08a685beb..98655fec7 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 c18dd7679..7d953590e 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 ec8de093f..0a1bc2eee 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 1c7cd7cda..f0074561a 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 0bf6c60e6..b2c1ab1a9 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 b8192070a..0e7b68eea 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 122730688..89152a6ee 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 85f03300c..edee58fc5 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 a9fc7d3c0..dd8a50f77 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 0e4ffb607..06ad2cf4c 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 e70aa832b..acbf01d5b 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 84893b30d..9a34b5491 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 02718a766..ab13eb22f 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 2bb093ae7..ffe1bee09 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 5ba77ea22..fd66cbc9c 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 02c0144e8..79aafbcb0 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 121ee5a93..72e794336 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 14462c600..cf9860d29 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 93a2568b5..6a2160e5b 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 8ec03d0f8..8d13e627c 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 differindex b816b3331..c7f581a27 100644 --- a/ppd/hpijs/hp-deskjet_2640_series-hpijs.ppd.gz +++ 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 9c0476147..444951a14 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 dd45d6a84..e6f926c2c 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 643324cec..80aa43cc7 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 18043fd87..b54e8b5fa 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 8a8c7c918..eb36afbda 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 033974b54..bc081fe92 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 9a446e28e..2f02f5927 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 2db41444d..6fe1d1020 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 5f0c4c6b5..189cdc774 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 466049cb2..fe06b4569 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 855bbc1b1..7451ba391 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 1e0dd8203..f8baf60e1 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 d5bf94c15..a85d472ff 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 1caf330de..45ca1fa04 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 0e1fbb2c0..1ef87cc00 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 bc4402ed0..9adf892dc 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 92663d4e6..8395681b3 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 00a04a860..70fc39e02 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 fe9bb0ff3..598fd9038 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 61ac64764..0e01ffd20 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 bf5cd27b2..1f795083f 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 1382da0ff..969aa0481 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 1ac0693ac..8a428d457 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 0902461f7..834ef60d2 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 bb8b6012b..f22e6927c 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 4e01b6a7f..e45b8d847 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 068dfb26e..6b28437e0 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 f95bd1d13..8b70d482a 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 1c3dc3691..47f7b4583 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 d895aaf6a..a5cbbb48b 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 667b59266..0de4a35c4 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 88e18c4a5..f2d20d8ba 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 3a232eb2d..a66087c9a 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 ccb1281cd..a1030ea9c 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_4640_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_4640_series-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..6cf9b1594 --- /dev/null +++ b/ppd/hpijs/hp-deskjet_4640_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 fda20c528..af5e73cae 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 cce6b0b9d..98d01b2ff 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 c53a6e2e1..60c7b4536 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 561ba6527..57e3e9743 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 824819d64..b00e5a154 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 843ca8cc6..4451446e7 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 eb440ae86..41ac37287 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 b56abc597..5eeefbcd5 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 63653365e..4a01ca10b 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 125bbcfbc..b8e8f34de 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 40618d45e..80203b6db 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 e26defb1d..63fab374b 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 e1234a2cf..c6d932f2b 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 546ade372..ac3b1aa99 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 c812292fd..45127a1f6 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 fdf53c1bf..40cb91663 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 d09b69d51..fc28ff34a 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 eee70c334..c0b0138e3 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 d09f3d24e..1b3914c8d 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 eb40db3e8..c1295766d 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 b89c79037..28264c88e 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 a5657bdda..9b4bc1a36 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 bcf222b6e..1c5d573da 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 b6b00a2d1..5c17ba1db 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 e5b346808..50fe20fe4 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 37c229118..2228abc78 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 8def97b06..a235cf063 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 762a2afbe..b118397e7 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 5d3aca959..4f601f070 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 111ddaf88..e4cd87144 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 c3532b6c6..f4506b2bb 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 14fd92387..2b72cb8ba 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 194bdd7ed..1052300bd 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 dcc7007b1..8ca2b144b 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 ca422fbdb..a6221435d 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 31a2b398a..d8a2ff7b4 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 ea0753093..30b90bce2 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 2fa53e3ea..a643f2898 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 1de8f4e6e..2d4b8e462 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 2410ebc74..bfb05252f 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 651516882..3b4e135ee 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 d9fd36ba0..a0a653269 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 96da445d2..1e9763978 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 67fff3a36..dbe69a7a8 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 d91298838..b7f1c8615 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 6780767a6..8229cb078 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 f68a5031c..0112e7e7f 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 6975a1426..9a310c705 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 b76fe308e..b8d05d9e0 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 c6934c28b..a2fd7755b 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 44d997af8..678fb15d5 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 f58fbe44c..e587166d4 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 23404f067..b0e2b155c 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 ad89d0316..ecbc4753e 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 609e97e3b..c36d940ae 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 11d81c34c..462e53568 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 652495cb5..65c966668 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 77cf40dbb..27f9a2b66 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 4ce7a0595..c51cf5497 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 56c397019..1c7afa997 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 3e31008a6..a81506c96 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 86fe3c65c..62069ceda 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 82066e2e0..4cebb53e6 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 cfabb27ec..8c665cce2 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 7811f4971..655f8616c 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 6cccdca92..74c86d957 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 0b1374fc5..ee594fae9 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 4285669a7..063fb76d6 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 fce4c78f1..cff1feb53 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 ffc03e0a5..d4cf2359e 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 61b828adb..552438765 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 417bcbfc8..1dce63683 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 7638b2e55..c2e0bc39e 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 5166b4011..423a3f4f1 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 06d4f1f8d..32101dbb5 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 17ecc435f..ef9f60d58 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 6328d93bb..d8157108b 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 af9ec2fa1..15241ea9d 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 2fba521e1..e8de5b1fc 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 2efd9033c..42276c532 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 8b01327ad..02bc16cd3 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 2b41d7c5c..21ea05292 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 981c321d4..ff380f04b 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 50116719f..d5957a73f 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 3e54e872c..1fdb4f9cb 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 2f49c5b70..663d64d21 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 e7f399a47..438bf2ef8 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 c07fcbd5f..845538ad1 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 39e15918f..7fcb0842e 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 75f86392d..5a596c080 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 9d9d271ce..63bd4e5f5 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 6b8b6d157..86755647c 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 9661a4848..e44aae5bf 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 6e8197c41..93f82ff67 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 3e3708dca..982b18bcb 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 c6af45046..630bbc250 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 67b016ed6..518cca659 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 8dac04bf2..169636b35 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 426d15b8b..789ab8580 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 8a830b08e..6e0bda30a 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 4aeb73b7c..90769966f 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 427f44b87..307bbb7d4 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 4fa5aabc4..973243002 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 207fd1b63..5c5bdd02e 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 9a3c2d2a1..b04a2e58e 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 001f71909..3995b054d 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 ea8007f90..9e5232712 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 27a9ca6f6..2cfa64bde 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 9a3acc05e..0808f4b7f 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 a2fb76d57..7938adca5 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 d1ea85b91..58bcc3ec1 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 e91da9261..ca1f24cc6 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 948158b4f..da55beb6f 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 97d55811b..0b652cc09 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 d506ed5a7..e84f484e0 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 2b9117d00..d10b95804 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 71c1953f7..fcd10cf82 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 62125a843..ffcb8395e 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 868491ebe..18a46c75d 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 9dffd8b17..ad77d38f9 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 4f1e67a88..23433e96a 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 79c869e0f..e13a8e746 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 176dbf72b..d9c430716 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 2cb430407..15b6f451a 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 7389e2f7f..0eef9c249 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 7436a977d..68c98c605 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 ccc98b11f..b2b7a97d5 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 90e1993d0..90d50a605 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 2c0770eef..9dd6e51e3 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 6a8815270..1004a9095 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 8bda39e87..b609c31db 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 98f4e2473..72b0c08bf 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 9308f4dbb..c9919e2f4 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 d7799b258..8d6f4d05c 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 45beb4941..c75398584 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 ef2d3ddc2..5908f29bc 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 5b8a33824..bd2f6f48f 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 5d1bbd408..a42dc429d 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 4bdf42657..b1c9c8593 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 d6271beac..4129d40ff 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 9e8dc6a87..d23490df1 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 afefcdafb..32b774bd2 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 f9caa3de4..c195ea52c 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 b91f0080d..5ff432283 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 fa30c514e..e005026f3 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 1727e47af..28a169a2f 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 ab37c5f03..590b084e0 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 4ec761f1f..7cb7fd13f 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 92efc0467..c965df7de 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 b7356698c..3d80f29b4 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 e283b58a1..450b5c4d0 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 414ffb273..0b68123f5 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 b9551cd7f..6446944d3 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 f89c89ddc..6e6cacfa8 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 74be985c7..8fde4ea40 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 e2e379d57..1bf82bb81 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 0d7420b5f..7f6f4929a 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 08e51cc0b..d67f2d53b 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 99cef9e04..017118199 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 5e6584573..f16878cff 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 916c67e35..50a7debd7 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 4aa5cccac..9d47ca42c 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 260d832d8..d0b9149ee 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 a6be58cda..0ee6d06ac 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 10ce08743..45713af07 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 04d7a678c..1a9ec9406 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 17617a694..b3b13ea89 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 d57356e7a..8451548a1 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 bebc9244a..1670dbb41 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 82626e290..6cbbdf7a4 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 9ffc5cfb6..04c01a7b2 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 6da3462bb..33911a7bc 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 a7965b0c8..9b706cfc5 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 dad406e65..4b2e2cb4b 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 c0e35d0f7..6a1489f4a 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 0ca4d721d..f41ded23d 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 53fc0745a..084113b43 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 2ccc1eeb7..e41622aab 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 b752adc08..62a160abf 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 5dfdc26d8..7ce6a58df 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 cef688f5f..73bf227a7 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 b61c870e9..dac1a7151 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 8d9f3467e..656d15921 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 48d31d56b..0d738c2e6 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 a66e9f1a1..a4ae826c4 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 45dfa0ea3..f43623a8b 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 23ef720e0..65da90430 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 64b27df51..3d7cf0781 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 a316b500b..2fc1437df 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 11deb654d..0e2a3c2f2 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 a652f4b65..d30d5ed03 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 aff605e63..a87e96a8f 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 65786cc88..f0ec0c4e8 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 526a5fd94..b52b2f86e 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 a75a81669..ea1f1f8ac 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 9d97527d3..bd14dc9a0 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 f3310b67d..95f48dd3f 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 02b1f6bc9..76b3413f9 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 7396efa26..36b85c5cf 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 5acca424e..31e51aeb0 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 ce35b3259..a9da70e04 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 3c16fb873..44824bd81 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 ebbb9b1b4..fa49308c3 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 a6c3e4fcd..0f00fb534 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 b96a14a02..7b11480c6 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 310c110c2..e5fea9d5d 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 cfc4f7db3..4199b2037 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 eb82358e8..8c3870e57 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 fa0185561..96dea2659 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 d4db123e1..78679af7c 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 c0add51e3..6b2920cc2 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 f52ef9346..f2edaf063 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 d72e3477e..42c940a79 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 36f198de5..e73364ba3 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 deaf89a1a..fc8143ce8 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 8be7a2a82..13ee544d8 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 48f7d6a44..dd0192c54 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 1feecc6d9..7ef4bfacd 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 a8584aa12..41714f575 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 4f7ccf698..a2dd31ab9 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 e5b4edcbf..9eb24a82c 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 387862cb2..e817c89f5 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 b25a43ad7..7e4881e99 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 6916ac83f..673c42fa1 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 909112cdd..ecc39e875 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 e24842ab7..cf7338898 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 6c6dc1fd2..782e04ab3 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 de77a0d59..cffc7f385 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 1b4008c97..644fb7e5f 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 9d2ab24b6..e1be95664 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 6975f3b59..fc4e84415 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 dd0f867f1..5bdc324bb 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 9c9547421..ef1f28fa8 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 8dac710fb..829afe7d7 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 891c00d8a..da5c7262d 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 02843754a..9f442107a 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 68792c68f..f6b75d49a 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 b41c6b334..2f06ac163 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 880983f1d..d8ab9621c 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 7ee6a2f1d..e542c1ac7 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 5f4e840e4..6b7c0c9ec 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 05300d503..db32594e9 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 a03b5b3cc..5da45452d 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 e75a033c3..9ff4485b6 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 2121e010a..da1d0eb32 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 81d394bc6..5c2384fbb 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 583b15bb6..7c3ee7f13 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 b260d59f5..1a1f83256 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 134b1c8a0..8eec7b8ff 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 1745584e6..bacca5916 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 38b978e02..8c2861792 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 27bb1da8f..db14b021a 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 570c4181f..de4fc5201 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 d29ad7317..ece5d8d68 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 472f14d90..7d359d556 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 e933e37df..aad3b5e06 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 2133fefd6..b2da87732 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 463938250..493568374 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 02dc7ca15..02c761a51 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 de1d74eb8..2d68eb07c 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 ecfe42e06..bf488efcb 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 5f616b9d6..54350ccc7 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 0843c541a..6e215dbb7 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 817c84d6b..f985d9e5a 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 9cdb18150..4ad979964 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 adecb94e0..506048357 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 521ad4e8f..af9dc4016 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 447d8f1d7..b679ffc16 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 1993ff506..2dc328b04 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 e3b0e10ab..a0ec49111 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 cbea85749..b071241e7 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 4498bbbc5..63b822ab2 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 00f80e40a..3d48f09eb 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 b397759b1..a742fa5fb 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 0696b40fd..3f800cdeb 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 5dd5e1147..b0301a1db 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 f0eca5f78..c698b9df7 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 67c029b7a..d67fc03b7 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 189a805ab..34990b277 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 4f8ee6d91..123ab842d 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 cc8da35bb..f5cfaed79 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 f289cd060..3f5813a5e 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 acbe2f655..ece87a3a3 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 cf72ffd0c..38544a319 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 809f11c15..7b9a3d5f9 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 17936ded9..d81478334 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 c1e960e95..7271289ed 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 29a4a8fcf..8198d0daa 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 f6e90432f..3af88203e 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 c48d9b2af..64ae718b5 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 f19cf4d49..160f516f9 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 b73426412..a34836c80 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 f16333bcd..7194208fc 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 af57e132a..ad1f7aa4d 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 f2cf392dc..3bc858b2c 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 673a761ce..06ca9c117 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 a60d15423..095250d51 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 675d7f6c8..de3a968bb 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 6f7c97275..47684af16 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 5a021efc3..b887313cd 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 e11679d5b..d50b5dda8 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 16a8e6ca4..9911461ec 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_m125a-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m125a-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..b42d178b9 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m125a-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m125nw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m125nw-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..5b7a8f42b --- /dev/null +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m125nw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m125rnw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m125rnw-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..969626f00 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m125rnw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m126a-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m126a-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..1a11f6193 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m126a-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m126nw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m126nw-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..b8d95cef4 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m126nw-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 differindex 440948ad8..001c2559a 100644 --- a/ppd/hpijs/hp-laserjet_pro_mfp_m127fn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m127fn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m127fp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m127fp-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..b20e6b148 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m127fp-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 differindex fe3af954b..4b09d4f64 100644 --- a/ppd/hpijs/hp-laserjet_pro_mfp_m127fw-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m127fw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m128fn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m128fn-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..6d2efc059 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m128fn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m128fp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m128fp-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..bb52a2cc8 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m128fp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m128fw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m128fw-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..43ec56e52 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m128fw-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 01b9035f3..84f3de9ea 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 86e16517c..99c314dfd 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 7c29c72aa..47fc02136 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 a7f6956d9..132baf2dd 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 9f6e2ef91..24b4b3ce0 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 5160de50f..c10442b55 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 e4c342cd5..bb8e6c85e 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 d9b0fe556..8c4b94220 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 3627a433e..9ff6efb5e 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 c06bfd588..83e6ed2ec 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 cc9c5a4cd..cf247fb49 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 367ea2120..158c5796e 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 5322f1f31..237dfaead 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 32f55a68f..cce100568 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 f4ede2f56..7abef0adc 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 8149052fd..83ee0956a 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 f9fb1c788..8ff704a20 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 6236ac097..ff01029e0 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 c77433865..0c130dddc 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 97244ce63..cafcd166b 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 91fccdb00..b5c134b90 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 177ff1a55..6a11641f4 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 076a6c9d3..ebe1041fc 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 f7148daa6..f5a5b8bf0 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 f44cb517f..8ad9acfe8 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 0a2d780f1..8d55d4006 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 349ff065d..1065c96e4 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 20ea3b205..26df1a20e 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 fe3943170..e597833f4 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 8800a7dd0..818174985 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 b54f6ba5c..73a4b6221 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 1f7b80a68..20a2b85f1 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 eb1b63e99..e1e97502a 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 2e76de8e1..dd53ea9ad 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 44f773e43..3049469a1 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 bdcf50aae..0e7a9ad67 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 717dc3392..11d47e9df 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 9f0e8e7b2..ba572daac 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 55649732e..9558a8ffe 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 differindex 6475b3dc6..2a528a1fe 100644 --- a/ppd/hpijs/hp-officejet_2620_series-hpijs.ppd.gz +++ 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 24dcd3a5d..af77752fc 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 209f944e2..102bd53ad 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 aceeacc12..525668931 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 34b60cff0..ed4445d77 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 7037e7d63..6e822e5e8 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 144ccc8b5..69cddb471 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 94b6847fa..b1eebdfe1 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 29d1b66c3..276079212 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 659fd03ea..c8bd9063c 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 3f3b535ab..8e7e2400e 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 ec0101374..76fb3f9ae 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 3c7ef1cae..7a230987d 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 6ad3038df..fafcd42f5 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 b23dd40fe..335f77f6e 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 2ce4a1a14..43d12e8c6 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 db819c335..932022f58 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 f7a05f044..25a12cd57 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 e265dd48e..ebc410aa1 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 6447d1cda..1643d9895 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 9b6607ba2..3a7822207 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 044eec276..d560ac15f 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 36d9951b5..0f5ebcb28 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 b4450e734..eafad73c3 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 66a099aad..dc31ecf5a 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 bc70510fa..f8262e6a5 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 231d22a7e..7cdfce8d7 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 5492c1d3d..6fc8f8e18 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 c3250cd9c..09b133043 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 57c906188..722aa8f76 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 c3199efb4..1de63f388 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 7625c6493..5d56a18ad 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 cf7047d89..4e6e43f62 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 13a31d228..38a8f706f 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 ba3ac4ecb..1aaa88644 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 4e05af933..d85e0babd 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 c1ed04524..0c2df9913 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 1177c08ba..556e3d8c7 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 b8e0f4af5..52b20d224 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 b9cebbbd5..b3e468be9 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 e176aa942..ee32e722c 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 269021996..df2708e5f 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 8770636b3..8a4fa34ca 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 022ddf603..b06e078cf 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 582ccf4f1..de1132b08 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 ad2d8183f..4a917f406 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 1aa360af9..694716d2f 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 fa0f7a58e..bb4e9c3c9 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 da3da5ffe..1a7fa49a3 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 dac6a5385..f758f86c7 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 f68491d2d..222dfe2fd 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 fedf3ecee..31d087cf2 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 5b29f9820..801b6d1a5 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 d62fbfff8..536fbbfba 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 bd39ed53a..8016d47e3 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 eb5bbb33e..29675f223 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 d00747274..0a6c3792a 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 ef6e28dbc..b50a63846 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 ad533d6ed..7e8f7cdf6 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 76214ddf3..dc3ac975d 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 2f663eb4c..310d3b470 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 132826cac..6a1b321a3 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 50dd0161b..9962afa57 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 913e2ff9b..15f241b87 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 6c110c188..bbf4383eb 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 10fe17fc4..6322c0e0d 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 3729de61e..f75447f1e 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 329a472eb..e11a578e1 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 b564ed617..ae4b164be 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 3910c878b..307bf4fe5 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 ea1b48e29..1dc366998 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 f32fcb619..7945e92b6 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 957c90094..10c8023a9 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 5f96619a8..10e3158f5 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 d6f6da829..15a0154e7 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 2fb222732..fc1403ced 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 e90019c4d..75b51a657 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_8610-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8610-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..5d6ec0418 --- /dev/null +++ b/ppd/hpijs/hp-officejet_pro_8610-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8620-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8620-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..b8ffdf76f --- /dev/null +++ b/ppd/hpijs/hp-officejet_pro_8620-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8630-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8630-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..0af2ab12e --- /dev/null +++ b/ppd/hpijs/hp-officejet_pro_8630-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8640-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8640-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..926e27a1f --- /dev/null +++ b/ppd/hpijs/hp-officejet_pro_8640-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8660-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8660-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..4700be7c5 --- /dev/null +++ b/ppd/hpijs/hp-officejet_pro_8660-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 2ab6ad530..537b1aa2d 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 1d6f6b21e..83e0ac54c 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 9795f0c98..4d74b71c8 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 f41d7a0b8..37257456e 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 7df0c75f7..d94ffda35 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 545c66d03..c3afc5b2c 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 c7803e74c..45ef08f66 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 69313ed2b..437f4bebb 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 726e48d68..2f8aac553 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 6fc58b742..a250b42f3 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 b46b918e5..671c498a5 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 d5252e046..ea240b828 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 a2bf0391f..c33e006d3 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 0e352b156..8606a4cba 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 c021400a5..0719918e4 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 d9a7686d0..f45b19740 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 8f1692d28..f1ffc4316 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 d2fb9ac24..4671d4b62 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 65f292d49..ebc7bf8d9 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 adae1a554..3f52c829f 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 cc05a8b8e..d07160876 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 83c09be42..739540d00 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 e0d0ad41d..6ec79f001 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 f0114f14b..cd957ed4a 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 cfc2368d8..995173ba7 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 1db587d80..6bf0c5e8b 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 6ba8311f6..56c760c96 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 87d4469e2..299ce8070 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 87e918a38..388d8589a 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 f46b43e58..424622a47 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 f3dc7fc4c..1c45cf62a 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 94af0e22f..78ab49df0 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 b73fd3950..86a5b7343 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 117bc2330..5c651f23e 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 9d5ff3bad..11ddf70f2 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 08c23b6c6..0dc840720 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 c0494230f..a38830991 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 dff54c973..6ecaae8a7 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 d94ff0ff9..5375200d2 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 c883f9b65..aba990edb 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 4a4c16388..c224413a0 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 bb41d65ea..a447dfa62 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 81195bffa..c77982c79 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 ac427f571..58d3b13da 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 ea7aad578..badb76b8e 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 c35186dbb..82b731b4e 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 bf48e56f6..3c1ec7c62 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 4856d0e0e..cca8dd860 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 c9c24f7e0..881010e20 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 1987ad396..03e25fb11 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 7beff9b68..05038d961 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 0389ca916..cb42b5e22 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 e67d188b7..be6d48338 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 8fefe3068..1d2ca4592 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 330a6c5d8..4cabd62c0 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 5acbe7a91..69b102192 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 63f85dc76..6a7ceb671 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 ec422c7ec..686aa89c5 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 96dfe5625..8b1f40b71 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 eaeb7a895..39978e7b9 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 26686d181..e1f1ab483 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 c5e01e5ff..f831e6085 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 9f761c185..599e7a5e6 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 fd7b26b7e..7ab2c9ddc 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 a650f412d..23761c4c0 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 25af2bfc0..e52683762 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 120775c5d..23ce15c6f 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 b80d2ecc3..551153145 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 eddefb405..ebd493143 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 6d7456a32..a8c6199f8 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 803a94e75..a27c5166a 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 db511b999..7148b39f8 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 4f59924ae..49a64d8a7 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 e30d10d82..7d39e9c2b 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 721fad4dd..218be1344 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 7f740b585..ed6a496b8 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 59917502f..4cef109d1 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 2721afa54..bb7f122c0 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 83b2ff54f..3d2a9eba3 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 6f9e93522..b61ceb57d 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 08e54df6f..c7c7e8772 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 d1498d798..7ab460081 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 fb0120d03..35ebdf89b 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 2aed96912..9a4e70c99 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 c6b614766..aa6dd26ae 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 592753425..f658aea5e 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 10aa925cb..d2f6393f3 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 450ed7544..7b7515fa2 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 b8770cc3d..a3812cd69 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 fc1480e39..fbc08b20b 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 a338af73b..e3e2078dd 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 03aaae583..d1e19d554 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 f89abb09c..dd2660eef 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 f2a1c70d6..66c2038f3 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 67bda6df8..1d42efd03 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 9c60b9316..4c98264c6 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 62d945a58..231a316b8 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 1b9bb5517..f3a696b52 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 d4cba60f9..bea1f183a 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 cc8147f21..1a62ddbde 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 82e171392..daaa2e67a 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 ee2efa5e2..37d1d01bf 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 1a37ad486..2b380c7dc 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 0385109f9..834e7492e 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 dc79afd11..cc2b0447e 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 d4c3fabfb..3123f6907 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 5a9bb6b53..b33ab3cf3 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 999b2f999..23ff24b0f 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 259bccf2e..78dfd88a1 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 088c93f8f..07d75b407 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 9637290e1..4848a5359 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 bca764487..5d2d4fb01 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 fd59b858a..10ebeeeea 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 271217699..2fbf5df14 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 d21d90404..af782c378 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 6690ec56a..2d545abc7 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 843d35faa..831db7d35 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 41847d1ca..f7180ca51 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 0d18ae65b..a3599f1f5 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 c75c9e890..c1b58a111 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 1c55e7ce9..e5c4cd5cd 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 d29223b54..3963dd8fa 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 3b12b60bd..a62295490 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 740c38df0..3c74d4ccd 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 4e2d7f5b6..7b2d0ce7e 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 29fa75d33..1b7b1017d 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 b8257b21e..8dc012cf0 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 f5d424034..ee75eac8a 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 f91e4c824..cd1c7f3eb 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 d7f97339a..12d3c181c 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 53bf9833f..86a26e004 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 d50808c41..dd9aa61cf 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 1e2db9ef3..3b3f6fd14 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 d81b4e1fd..be2b82cf7 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 254c055bf..55bc008c9 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 6b425c335..28f94d505 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 d6e2f8189..a62d38f0e 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 a9a634039..8ca3d5f65 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 27b2b9129..116b0f8cd 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 7f140ce23..02a8c12ea 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 64cdc4386..34ffe0151 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 979e9a863..6fb0f018e 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 9c3ef9d88..7ddebad49 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 b1f7b1ac2..861684404 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 1253ba9af..88139ea32 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 703967e0c..1044f22a7 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 8c446b315..4eba5251b 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 568218fdd..3f484ecd7 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 b417d066f..0ba8c9b75 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 1579f8241..a84fdaeeb 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 6ca67d3f8..78590cedc 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 a532f1ac4..3301ebdbf 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 dfb5a538e..4a847c7a4 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 119a03176..869ac0400 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 b34479285..02f5e0ca9 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 2043c5052..8de5e6ded 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 b928aec49..88ca33823 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 b73b5e5dc..c0add5b36 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 c84b90e48..07db2dc17 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 e26673cd3..ee62f5842 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 278603d54..d2593f9c2 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 e794d3113..27e5f1633 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 c13b0c3ad..a20c085f9 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 7c147d6ab..f7abe7343 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 6fbee8fff..1e74c9876 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 583f6668c..ed69806db 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 0a5600d10..00b8f9cac 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 fee218f3f..abcd6c694 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 f0ca8869b..44a418419 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 fed23e2cc..91842083e 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 7aa6e4429..ec8a3ede6 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 4af8bd62f..555a05a4a 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 ac36c9bc2..7b106e380 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 197870ab1..6acd90cec 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 357ac1236..7cfcceabf 100644 --- a/ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz diff --git a/prnt/backend/hp.c b/prnt/backend/hp.c index c8b686f80..cc407a092 100644 --- a/prnt/backend/hp.c +++ b/prnt/backend/hp.c @@ -45,6 +45,8 @@ #endif #include "hpmud.h" #include <signal.h> +#include<errno.h> +#include<utils.h> //#define HP_DEBUG @@ -108,9 +110,11 @@ struct pjl_attributes /* Definitions for hpLogLevel in cupsd.conf. */ #define BASIC_LOG 1 -#define SAVE_PCL_FILE 2 +#define SAVE_OUT_FILE 2 #define SAVE_INPUT_RASTERS 4 -#define SEND_TO_PRINTER_ALSO 8 +#define SAVE_OUT_FILE_IN_BACKEND 8 +#define DONT_SEND_TO_BACKEND 16 +#define DONT_SEND_TO_PRINTER 32 /* Actual vstatus codes are mapped to 1000+vstatus for DeviceError messages. */ typedef enum @@ -634,6 +638,44 @@ static int loop_test(HPMUD_DEVICE dd, HPMUD_CHANNEL cd, struct pjl_attributes *p return stat; } +static FILE* create_out_file(char* job_id, char* user_name) +{ + char fname[256] = {0,}; + FILE *temp_fp = NULL; + snprintf(fname, sizeof(fname), "%s/hp_%s_out_%s_XXXXXX",CUPS_TMP_DIR, user_name, job_id); + createTempFile(fname, &temp_fp); + if (temp_fp) + { + chmod(fname, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH); + } + else + { + BUG("ERROR: unable to create Temporary file %s: %m\n", fname); + } + return temp_fp; +} +static void save_out_file(int fd, int copies, FILE * temp_fp) +{ + int len = 0; + char buf[HPMUD_BUFFER_SIZE]; + if (NULL == temp_fp) + { + BUG("ERROR: save_out_file function recieved NULL temp_fp pointer\n"); + return; + } + while (copies > 0) + { + copies--; + if (fd != 0) + { + lseek(fd, 0, SEEK_SET); + } + while ((len = read(fd, buf, sizeof(buf))) > 0) + { + fwrite (buf, 1, len, temp_fp); + } + } +} int main(int argc, char *argv[]) { int fd; @@ -647,6 +689,9 @@ int main(int argc, char *argv[]) int n, total=0, retry=0, size, pages; enum HPMUD_RESULT stat; char *printer = getenv("PRINTER"); + int iLogLevel = 0; + FILE *temp_fp = NULL; + int saveoutfile = 0; // 0 1 2 3 4 5 // device_uri job-id user title copies options @@ -690,6 +735,22 @@ int main(int argc, char *argv[]) copies = atoi(argv[4]); } + iLogLevel = getHPLogLevel(); + if(SAVE_OUT_FILE_IN_BACKEND & iLogLevel) + { + temp_fp = create_out_file(argv[1], argv[2]); + if(temp_fp) + saveoutfile = 1; + } + if( DONT_SEND_TO_PRINTER & iLogLevel ) + { + if(temp_fp) + { + saveoutfile = 1; + save_out_file(fd, copies, temp_fp); + } + exit (BACKEND_OK); + } signal(SIGTERM, SIG_IGN); init_dbus(); @@ -722,6 +783,8 @@ int main(int argc, char *argv[]) while (size > 0) { + if (saveoutfile) + fwrite (buf, 1, len, temp_fp); /* Got some data now open the hp device. This will handle any HPIJS device contention. */ if (hd <= 0) { @@ -917,6 +980,8 @@ bugout: hpmud_close_device(hd); if (fd != 0) close(fd); + if (temp_fp) + fclose(temp_fp); exit (exit_stat); } diff --git a/prnt/cupsext/cupsext.c b/prnt/cupsext/cupsext.c index 6f021699c..573821431 100644 --- a/prnt/cupsext/cupsext.c +++ b/prnt/cupsext/cupsext.c @@ -79,6 +79,8 @@ Yashwant Kumar Sahu #include <cups/cups.h> #include <cups/language.h> #include <cups/ppd.h> +#include <sys/types.h> +#include <pwd.h> /* Ref: PEP 353 (Python 2.5) */ #if PY_VERSION_HEX < 0x02050000 @@ -170,6 +172,15 @@ static int auth_cancel_req = 0; // 0--> authentication cancel is not requeste const char * g_ppd_file = NULL; +static char *getUserName() +{ + struct passwd *pw = getpwuid(geteuid()); + if (pw) + { + return pw->pw_name; + } + return NULL; +} /* * 'validate_name()' - Make sure the printer name only contains valid chars. */ @@ -1806,11 +1817,17 @@ PyObject * printFileWithOptions( PyObject * self, PyObject * args ) cups_dest_t * dest = NULL; int num_dests = 0; int i = 0; + char *requesting_user_name = NULL; if ( !PyArg_ParseTuple( args, "zzz", &printer, &filename, &title ) ) { return Py_BuildValue( "" ); // None } + requesting_user_name = getUserName(); + if(requesting_user_name) + { + cupsSetUser(requesting_user_name); + } num_dests = cupsGetDests(&dests); dest = cupsGetDest( printer, NULL, num_dests, dests ); diff --git a/prnt/drv/hpcups.drv.in b/prnt/drv/hpcups.drv.in index 512d2e79d..c35766af4 100644 --- a/prnt/drv/hpcups.drv.in +++ b/prnt/drv/hpcups.drv.in @@ -710,14 +710,6 @@ Manufacturer "HP" Attribute "Product" "" "(HP Deskjet 948c Printer)" } { - ModelName "HP Deskjet 950c" - Attribute "NickName" "" "HP Deskjet 950c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 950c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 950c;DES:deskjet 950c;" - PCFileName "hp-deskjet_950c.ppd" - Attribute "Product" "" "(HP Deskjet 950c Printer)" - } - { ModelName "HP PSC 950xi" Attribute "NickName" "" "HP PSC 950xi, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 950xi" @@ -742,6 +734,14 @@ Manufacturer "HP" Attribute "Product" "" "(HP PSC 950 All-in-one Printer)" } { + ModelName "HP Deskjet 950c" + Attribute "NickName" "" "HP Deskjet 950c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 950c" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 950c;DES:deskjet 950c;" + PCFileName "hp-deskjet_950c.ppd" + Attribute "Product" "" "(HP Deskjet 950c Printer)" + } + { ModelName "HP Deskjet 952c" Attribute "NickName" "" "HP Deskjet 952c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 952c" @@ -5461,6 +5461,8 @@ Manufacturer "HP" "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" CustomMedia "A3+SM/A3+ 330x483mm SmallMargins" 935.424 1364.152 14.184 14.184 14.184 14.184 "<</cupsInteger0 16/PageSize[935.424 1364.152]/ImagingBBox null>>setpagedevice" "<</cupsInteger0 16/PageSize[935.424 1369.152]/ImagingBBox null>>setpagedevice" + CustomMedia "Env6/#6 Envelope 3.63x6.5in" 261.36 468 9.36 46.8 9.36 46.8 "<</cupsInteger0 83/PageSize[261.36 468]/ImagingBBox null>>setpagedevice" + "<</cupsInteger0 83/PageSize[261.36 468]/ImagingBBox null>>setpagedevice" // <%Saipan:Advanced%> { @@ -7152,6 +7154,48 @@ Manufacturer "HP" Attribute "Product" "" "(HP Officejet Pro 8600 Plus E-aio n911g)" Attribute "Product" "" "(HP Officejet Pro 8600 Premium E-aio n911n)" } + { + ModelName "HP Officejet Pro 8610" + Attribute "NickName" "" "HP Officejet Pro 8610, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 8610" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet pro 8610;DES:hp officejet pro 8610;" + PCFileName "hp-officejet_pro_8610.ppd" + Attribute "Product" "" "(HP Officejet Pro 8610 E-all-in-one Printer)" + Attribute "Product" "" "(HP Officejet Pro 8615 E-all-in-one Printer)" + } + { + ModelName "HP Officejet Pro 8620" + Attribute "NickName" "" "HP Officejet Pro 8620, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 8620" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet pro 8620;DES:hp officejet pro 8620;" + PCFileName "hp-officejet_pro_8620.ppd" + Attribute "Product" "" "(HP Officejet Pro 8620 E-all-in-one Printer)" + Attribute "Product" "" "(HP Officejet Pro 8625 E-all-in-one Printer)" + } + { + ModelName "HP Officejet Pro 8630" + Attribute "NickName" "" "HP Officejet Pro 8630, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 8630" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet pro 8630;DES:hp officejet pro 8630;" + PCFileName "hp-officejet_pro_8630.ppd" + Attribute "Product" "" "(HP Officejet Pro 8630 E-all-in-one Printer)" + } + { + ModelName "HP Officejet Pro 8640" + Attribute "NickName" "" "HP Officejet Pro 8640, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 8640" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet pro 8640;DES:hp officejet pro 8640;" + PCFileName "hp-officejet_pro_8640.ppd" + Attribute "Product" "" "(HP Officejet Pro 8640 E-all-in-one Printer)" + } + { + ModelName "HP Officejet Pro 8660" + Attribute "NickName" "" "HP Officejet Pro 8660, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 8660" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet pro 8660;DES:hp officejet pro 8660;" + PCFileName "hp-officejet_pro_8660.ppd" + Attribute "Product" "" "(HP Officejet Pro 8660 E-all-in-one Printer)" + } } // End Supported media sizes with full bleed. } // End Ampere @@ -8564,7 +8608,7 @@ Manufacturer "HP" } // End Python B-size -//Sanjay: changes Start + //////// Python10 { Attribute "cupsEvenDuplex" "" "True" @@ -9126,7 +9170,6 @@ Manufacturer "HP" } // End Mimas -//Sanjay: Changes End //////// MimasTDR { @@ -9409,9 +9452,23 @@ Manufacturer "HP" Attribute "ShortNickName" "" "HP Officejet 4630 Series" Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4630 series;DES:officejet 4630 series;" PCFileName "hp-officejet_4630_series.ppd" - Attribute "Product" "" "(HP Officejet 4630 E-all-in-one)" + Attribute "Product" "" "(HP Officejet 4630 E-all-in-one Printer)" + Attribute "Product" "" "(HP Officejet 4631 E-all-in-one Printer)" Attribute "Product" "" "(HP Officejet 4632 E-all-in-one Printer)" + Attribute "Product" "" "(HP Officejet 4634 E-all-in-one Printer)" Attribute "Product" "" "(HP Officejet 4635 E-all-in-one Printer)" + Attribute "Product" "" "(HP Officejet 4636 E-all-in-one Printer)" + } + { + ModelName "HP Deskjet 4640 Series" + Attribute "NickName" "" "HP Deskjet 4640 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 4640 Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 4640 series;DES:deskjet 4640 series;" + PCFileName "hp-deskjet_4640_series.ppd" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4640 E-all-in-one Printer Series)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4645 E-all-in-one Printer)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4646 E-all-in-one Printer)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4648 E-all-in-one Printer)" } { ModelName "HP Envy 5530 Series" @@ -9649,6 +9706,7 @@ Manufacturer "HP" Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 1010 series;DES:deskjet 1010 series;" PCFileName "hp-deskjet_1010_series.ppd" Attribute "Product" "" "(HP Deskjet 1010 Printer)" + Attribute "Product" "" "(HP Deskjet 1011 Printer)" Attribute "Product" "" "(HP Deskjet 1012 Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 1010 Printer Series)" Attribute "Product" "" "(HP Deskjet Ink Advantage 1015 Printer)" @@ -9661,13 +9719,14 @@ Manufacturer "HP" Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 1510 series;DES:deskjet 1510 series;" PCFileName "hp-deskjet_1510_series.ppd" Attribute "Product" "" "(HP Deskjet 1510 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet 1511 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet 1512 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet 1513 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet 1514 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 1510 All-in-one Printer Series)" 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,11 +9736,13 @@ Manufacturer "HP" PCFileName "hp-deskjet_2540_series.ppd" Attribute "Product" "" "(HP Deskjet 2540 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet 2542 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet 2543 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet 2544 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet 2549 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 2540 All-in-one Printer Series)" 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" @@ -11231,6 +11292,17 @@ Manufacturer "HP" Attribute "Product" "" "(HP Officejet j3508 All-in-one Printer)" } { + ModelName "HP Deskjet 3600" + Attribute "NickName" "" "HP Deskjet 3600, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 3600" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 3600;DES:deskjet 3600;" + PCFileName "hp-deskjet_3600.ppd" + Attribute "Product" "" "(HP Deskjet 3600 Color Inkjet Printer)" + Attribute "Product" "" "(HP Deskjet 3620 Color Inkjet Printer)" + Attribute "Product" "" "(HP Deskjet 3645 Color Inkjet Printer)" + Attribute "Product" "" "(HP Deskjet 3647 Color Inkjet Printer)" + } + { ModelName "HP Officejet j3600 Series" Attribute "NickName" "" "HP Officejet j3600 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet j3600 Series" @@ -11244,17 +11316,6 @@ Manufacturer "HP" Attribute "Product" "" "(HP Officejet j3680 All-in-one Printer)" } { - ModelName "HP Deskjet 3600" - Attribute "NickName" "" "HP Deskjet 3600, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 3600" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 3600;DES:deskjet 3600;" - PCFileName "hp-deskjet_3600.ppd" - Attribute "Product" "" "(HP Deskjet 3600 Color Inkjet Printer)" - Attribute "Product" "" "(HP Deskjet 3620 Color Inkjet Printer)" - Attribute "Product" "" "(HP Deskjet 3645 Color Inkjet Printer)" - Attribute "Product" "" "(HP Deskjet 3647 Color Inkjet Printer)" - } - { ModelName "HP Deskjet 3650" Attribute "NickName" "" "HP Deskjet 3650, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 3650" @@ -12942,14 +13003,6 @@ Group "RLT/HP Real Life Technologies" Attribute "Product" "" "(HP LaserJet p4014dn Printer)" } { - ModelName "HP LaserJet p4014n" - Attribute "NickName" "" "HP LaserJet p4014n, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet p4014n" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p4014n;DES:hp laserjet p4014n;" - PCFileName "hp-laserjet_p4014n.ppd" - Attribute "Product" "" "(HP LaserJet p4014n Printer)" - } - { ModelName "HP LaserJet p4014" Attribute "NickName" "" "HP LaserJet p4014, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet p4014" @@ -12958,6 +13011,14 @@ Group "RLT/HP Real Life Technologies" Attribute "Product" "" "(HP LaserJet p4014 Printer)" } { + ModelName "HP LaserJet p4014n" + Attribute "NickName" "" "HP LaserJet p4014n, hpcups $Version" + Attribute "ShortNickName" "" "HP LaserJet p4014n" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p4014n;DES:hp laserjet p4014n;" + PCFileName "hp-laserjet_p4014n.ppd" + Attribute "Product" "" "(HP LaserJet p4014n Printer)" + } + { ModelName "HP LaserJet p4015tn" Attribute "NickName" "" "HP LaserJet p4015tn, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet p4015tn" @@ -13238,14 +13299,6 @@ Group "RLT/HP Real Life Technologies" UIConstraints "*OutputMode Best *MediaType" // <%LJMono:300dpiOnly%> { - ModelName "HP LaserJet 4ml" - Attribute "NickName" "" "HP LaserJet 4ml, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 4ml" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4ml;DES:hp laserjet 4ml;" - PCFileName "hp-laserjet_4ml.ppd" - Attribute "Product" "" "(HP LaserJet 4ml Printer)" - } - { ModelName "HP LaserJet 4l" Attribute "NickName" "" "HP LaserJet 4l, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4l" @@ -13256,6 +13309,14 @@ Group "RLT/HP Real Life Technologies" Attribute "Product" "" "(HP LaserJet 4lc Printer)" Attribute "Product" "" "(HP LaserJet 4ml Printer)" } + { + ModelName "HP LaserJet 4ml" + Attribute "NickName" "" "HP LaserJet 4ml, hpcups $Version" + Attribute "ShortNickName" "" "HP LaserJet 4ml" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4ml;DES:hp laserjet 4ml;" + PCFileName "hp-laserjet_4ml.ppd" + Attribute "Product" "" "(HP LaserJet 4ml Printer)" + } } } // End Supported media sizes. @@ -17146,12 +17207,52 @@ Group "RLT/HP Real Life Technologies" // <%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 m125a" + Attribute "NickName" "" "HP LaserJet Pro MFP m125a, hpcups $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet Pro MFP m125a" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m125a;DES:hp laserjet pro mfp m125a;" + PCFileName "hp-laserjet_pro_mfp_m125a.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m125a)" + } + { + ModelName "HP LaserJet Pro MFP m125rnw" + Attribute "NickName" "" "HP LaserJet Pro MFP m125rnw, hpcups $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet Pro MFP m125rnw" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m125rnw;DES:hp laserjet pro mfp m125rnw;" + PCFileName "hp-laserjet_pro_mfp_m125rnw.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m125rnw)" + } + { + ModelName "HP LaserJet Pro MFP m125nw" + Attribute "NickName" "" "HP LaserJet Pro MFP m125nw, hpcups $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet Pro MFP m125nw" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m125nw;DES:hp laserjet pro mfp m125nw;" + PCFileName "hp-laserjet_pro_mfp_m125nw.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m125nw)" + } + { + ModelName "HP LaserJet Pro MFP m126a" + Attribute "NickName" "" "HP LaserJet Pro MFP m126a, hpcups $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet Pro MFP m126a" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m126a;DES:hp laserjet pro mfp m126a;" + PCFileName "hp-laserjet_pro_mfp_m126a.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m126a)" + } + { + ModelName "HP LaserJet Pro MFP m126nw" + Attribute "NickName" "" "HP LaserJet Pro MFP m126nw, hpcups $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet Pro MFP m126nw" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m126nw;DES:hp laserjet pro mfp m126nw;" + PCFileName "hp-laserjet_pro_mfp_m126nw.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m126nw)" + } + { + ModelName "HP LaserJet Pro MFP m127fp" + Attribute "NickName" "" "HP LaserJet Pro MFP m127fp, hpcups $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet Pro MFP m127fp" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m127fp;DES:hp laserjet pro mfp m127fp;" + PCFileName "hp-laserjet_pro_mfp_m127fp.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m127fp)" } { ModelName "HP LaserJet Pro MFP m127fn" @@ -17161,6 +17262,38 @@ Group "RLT/HP Real Life Technologies" PCFileName "hp-laserjet_pro_mfp_m127fn.ppd" Attribute "Product" "" "(HP LaserJet Pro MFP m127fn)" } + { + 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 m128fn" + Attribute "NickName" "" "HP LaserJet Pro MFP m128fn, hpcups $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet Pro MFP m128fn" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m128fn;DES:hp laserjet pro mfp m128fn;" + PCFileName "hp-laserjet_pro_mfp_m128fn.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m128fn)" + } + { + ModelName "HP LaserJet Pro MFP m128fp" + Attribute "NickName" "" "HP LaserJet Pro MFP m128fp, hpcups $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet Pro MFP m128fp" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m128fp;DES:hp laserjet pro mfp m128fp;" + PCFileName "hp-laserjet_pro_mfp_m128fp.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m128fp)" + } + { + ModelName "HP LaserJet Pro MFP m128fw" + Attribute "NickName" "" "HP LaserJet Pro MFP m128fw, hpcups $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet Pro MFP m128fw" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m128fw;DES:hp laserjet pro mfp m128fw;" + PCFileName "hp-laserjet_pro_mfp_m128fw.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m128fw)" + } } { diff --git a/prnt/drv/hpijs.drv.in b/prnt/drv/hpijs.drv.in index 47418694b..dfe5a72d7 100644 --- a/prnt/drv/hpijs.drv.in +++ b/prnt/drv/hpijs.drv.in @@ -771,14 +771,6 @@ et=2" Attribute "Product" "" "(HP Deskjet 948c Printer)" } { - ModelName "HP Deskjet 950c hpijs" - Attribute "NickName" "" "HP Deskjet 950c hpijs, $Version" - Attribute "ShortNickName" "" "HP Deskjet 950c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 950c;DES:deskjet 950c;" - PCFileName "hp-deskjet_950c-hpijs.ppd" - Attribute "Product" "" "(HP Deskjet 950c Printer)" - } - { ModelName "HP PSC 950xi hpijs" Attribute "NickName" "" "HP PSC 950xi hpijs, $Version" Attribute "ShortNickName" "" "HP PSC 950xi hpijs" @@ -803,6 +795,14 @@ et=2" Attribute "Product" "" "(HP PSC 950 All-in-one Printer)" } { + ModelName "HP Deskjet 950c hpijs" + Attribute "NickName" "" "HP Deskjet 950c hpijs, $Version" + Attribute "ShortNickName" "" "HP Deskjet 950c hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 950c;DES:deskjet 950c;" + PCFileName "hp-deskjet_950c-hpijs.ppd" + Attribute "Product" "" "(HP Deskjet 950c Printer)" + } + { ModelName "HP Deskjet 952c hpijs" Attribute "NickName" "" "HP Deskjet 952c hpijs, $Version" Attribute "ShortNickName" "" "HP Deskjet 952c hpijs" @@ -5155,6 +5155,17 @@ ty:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Officejet j3508 All-in-one Printer)" } { + ModelName "HP Deskjet 3600 hpijs" + Attribute "NickName" "" "HP Deskjet 3600 hpijs, $Version" + Attribute "ShortNickName" "" "HP Deskjet 3600 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 3600;DES:deskjet 3600;" + PCFileName "hp-deskjet_3600-hpijs.ppd" + Attribute "Product" "" "(HP Deskjet 3600 Color Inkjet Printer)" + Attribute "Product" "" "(HP Deskjet 3620 Color Inkjet Printer)" + Attribute "Product" "" "(HP Deskjet 3645 Color Inkjet Printer)" + Attribute "Product" "" "(HP Deskjet 3647 Color Inkjet Printer)" + } + { ModelName "HP Officejet j3600 Series hpijs" Attribute "NickName" "" "HP Officejet j3600 Series hpijs, $Version" Attribute "ShortNickName" "" "HP Officejet j3600 Series hpijs" @@ -5168,17 +5179,6 @@ ty:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Officejet j3680 All-in-one Printer)" } { - ModelName "HP Deskjet 3600 hpijs" - Attribute "NickName" "" "HP Deskjet 3600 hpijs, $Version" - Attribute "ShortNickName" "" "HP Deskjet 3600 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 3600;DES:deskjet 3600;" - PCFileName "hp-deskjet_3600-hpijs.ppd" - Attribute "Product" "" "(HP Deskjet 3600 Color Inkjet Printer)" - Attribute "Product" "" "(HP Deskjet 3620 Color Inkjet Printer)" - Attribute "Product" "" "(HP Deskjet 3645 Color Inkjet Printer)" - Attribute "Product" "" "(HP Deskjet 3647 Color Inkjet Printer)" - } - { ModelName "HP Deskjet 3650 hpijs" Attribute "NickName" "" "HP Deskjet 3650 hpijs, $Version" Attribute "ShortNickName" "" "HP Deskjet 3650 hpijs" @@ -7002,14 +7002,6 @@ t=0" Attribute "Product" "" "(HP LaserJet p4014dn Printer)" } { - ModelName "HP LaserJet p4014n hpijs" - Attribute "NickName" "" "HP LaserJet p4014n hpijs, $Version" - Attribute "ShortNickName" "" "HP LaserJet p4014n hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p4014n;DES:hp laserjet p4014n;" - PCFileName "hp-laserjet_p4014n-hpijs.ppd" - Attribute "Product" "" "(HP LaserJet p4014n Printer)" - } - { ModelName "HP LaserJet p4014 hpijs" Attribute "NickName" "" "HP LaserJet p4014 hpijs, $Version" Attribute "ShortNickName" "" "HP LaserJet p4014 hpijs" @@ -7018,6 +7010,14 @@ t=0" Attribute "Product" "" "(HP LaserJet p4014 Printer)" } { + ModelName "HP LaserJet p4014n hpijs" + Attribute "NickName" "" "HP LaserJet p4014n hpijs, $Version" + Attribute "ShortNickName" "" "HP LaserJet p4014n hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p4014n;DES:hp laserjet p4014n;" + PCFileName "hp-laserjet_p4014n-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet p4014n Printer)" + } + { ModelName "HP LaserJet p4015tn hpijs" Attribute "NickName" "" "HP LaserJet p4015tn hpijs, $Version" Attribute "ShortNickName" "" "HP LaserJet p4015tn hpijs" @@ -7657,14 +7657,6 @@ PenSet=0" CustomMedia "w612h935/Executive (JIS)" 612.00 935.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=w612h935" "%% FoomaticRIPOptionSetting: PageSize=w612h935" // <%LJMono:300dpiOnly%> { - ModelName "HP LaserJet 4ml hpijs" - Attribute "NickName" "" "HP LaserJet 4ml hpijs, $Version" - Attribute "ShortNickName" "" "HP LaserJet 4ml hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4ml;DES:hp laserjet 4ml;" - PCFileName "hp-laserjet_4ml-hpijs.ppd" - Attribute "Product" "" "(HP LaserJet 4ml Printer)" - } - { ModelName "HP LaserJet 4l hpijs" Attribute "NickName" "" "HP LaserJet 4l hpijs, $Version" Attribute "ShortNickName" "" "HP LaserJet 4l hpijs" @@ -7675,6 +7667,14 @@ PenSet=0" Attribute "Product" "" "(HP LaserJet 4lc Printer)" Attribute "Product" "" "(HP LaserJet 4ml Printer)" } + { + ModelName "HP LaserJet 4ml hpijs" + Attribute "NickName" "" "HP LaserJet 4ml hpijs, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4ml hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4ml;DES:hp laserjet 4ml;" + PCFileName "hp-laserjet_4ml-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet 4ml Printer)" + } } // end LJMono 300dpi only ////////////// LJColor @@ -12532,12 +12532,52 @@ Transparency" // <%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 m125a hpijs" + Attribute "NickName" "" "HP LaserJet Pro MFP m125a hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet Pro MFP m125a hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m125a;DES:hp laserjet pro mfp m125a;" + PCFileName "hp-laserjet_pro_mfp_m125a-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m125a)" + } + { + ModelName "HP LaserJet Pro MFP m125rnw hpijs" + Attribute "NickName" "" "HP LaserJet Pro MFP m125rnw hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LJ Pro MFP m125rnw hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m125rnw;DES:hp laserjet pro mfp m125rnw;" + PCFileName "hp-laserjet_pro_mfp_m125rnw-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m125rnw)" + } + { + ModelName "HP LaserJet Pro MFP m125nw hpijs" + Attribute "NickName" "" "HP LaserJet Pro MFP m125nw hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LJ Pro MFP m125nw hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m125nw;DES:hp laserjet pro mfp m125nw;" + PCFileName "hp-laserjet_pro_mfp_m125nw-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m125nw)" + } + { + ModelName "HP LaserJet Pro MFP m126a hpijs" + Attribute "NickName" "" "HP LaserJet Pro MFP m126a hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet Pro MFP m126a hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m126a;DES:hp laserjet pro mfp m126a;" + PCFileName "hp-laserjet_pro_mfp_m126a-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m126a)" + } + { + ModelName "HP LaserJet Pro MFP m126nw hpijs" + Attribute "NickName" "" "HP LaserJet Pro MFP m126nw hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LJ Pro MFP m126nw hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m126nw;DES:hp laserjet pro mfp m126nw;" + PCFileName "hp-laserjet_pro_mfp_m126nw-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m126nw)" + } + { + ModelName "HP LaserJet Pro MFP m127fp hpijs" + Attribute "NickName" "" "HP LaserJet Pro MFP m127fp hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LJ Pro MFP m127fp hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m127fp;DES:hp laserjet pro mfp m127fp;" + PCFileName "hp-laserjet_pro_mfp_m127fp-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m127fp)" } { ModelName "HP LaserJet Pro MFP m127fn hpijs" @@ -12547,6 +12587,38 @@ Transparency" PCFileName "hp-laserjet_pro_mfp_m127fn-hpijs.ppd" Attribute "Product" "" "(HP LaserJet Pro MFP m127fn)" } + { + 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 m128fn hpijs" + Attribute "NickName" "" "HP LaserJet Pro MFP m128fn hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LJ Pro MFP m128fn hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m128fn;DES:hp laserjet pro mfp m128fn;" + PCFileName "hp-laserjet_pro_mfp_m128fn-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m128fn)" + } + { + ModelName "HP LaserJet Pro MFP m128fp hpijs" + Attribute "NickName" "" "HP LaserJet Pro MFP m128fp hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LJ Pro MFP m128fp hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m128fp;DES:hp laserjet pro mfp m128fp;" + PCFileName "hp-laserjet_pro_mfp_m128fp-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m128fp)" + } + { + ModelName "HP LaserJet Pro MFP m128fw hpijs" + Attribute "NickName" "" "HP LaserJet Pro MFP m128fw hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LJ Pro MFP m128fw hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet pro mfp m128fw;DES:hp laserjet pro mfp m128fw;" + PCFileName "hp-laserjet_pro_mfp_m128fw-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet Pro MFP m128fw)" + } // <%Hbpl1:Color%> { ModelName "HP Color LaserJet Pro MFP m176n hpijs" @@ -14592,9 +14664,23 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "ShortNickName" "" "HP Officejet 4630 Series hpijs" Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4630 series;DES:officejet 4630 series;" PCFileName "hp-officejet_4630_series-hpijs.ppd" - Attribute "Product" "" "(HP Officejet 4630 E-all-in-one)" + Attribute "Product" "" "(HP Officejet 4630 E-all-in-one Printer)" + Attribute "Product" "" "(HP Officejet 4631 E-all-in-one Printer)" Attribute "Product" "" "(HP Officejet 4632 E-all-in-one Printer)" + Attribute "Product" "" "(HP Officejet 4634 E-all-in-one Printer)" Attribute "Product" "" "(HP Officejet 4635 E-all-in-one Printer)" + Attribute "Product" "" "(HP Officejet 4636 E-all-in-one Printer)" + } + { + ModelName "HP Deskjet 4640 Series hpijs" + Attribute "NickName" "" "HP Deskjet 4640 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Deskjet 4640 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 4640 series;DES:deskjet 4640 series;" + PCFileName "hp-deskjet_4640_series-hpijs.ppd" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4640 E-all-in-one Printer Series)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4645 E-all-in-one Printer)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4646 E-all-in-one Printer)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4648 E-all-in-one Printer)" } { ModelName "HP Envy 5530 Series hpijs" @@ -16517,6 +16603,48 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Officejet Pro 8600 Plus E-aio n911g)" Attribute "Product" "" "(HP Officejet Pro 8600 Premium E-aio n911n)" } + { + ModelName "HP Officejet Pro 8610 hpijs" + Attribute "NickName" "" "HP Officejet Pro 8610 hpijs, $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 8610 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet pro 8610;DES:hp officejet pro 8610;" + PCFileName "hp-officejet_pro_8610-hpijs.ppd" + Attribute "Product" "" "(HP Officejet Pro 8610 E-all-in-one Printer)" + Attribute "Product" "" "(HP Officejet Pro 8615 E-all-in-one Printer)" + } + { + ModelName "HP Officejet Pro 8620 hpijs" + Attribute "NickName" "" "HP Officejet Pro 8620 hpijs, $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 8620 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet pro 8620;DES:hp officejet pro 8620;" + PCFileName "hp-officejet_pro_8620-hpijs.ppd" + Attribute "Product" "" "(HP Officejet Pro 8620 E-all-in-one Printer)" + Attribute "Product" "" "(HP Officejet Pro 8625 E-all-in-one Printer)" + } + { + ModelName "HP Officejet Pro 8630 hpijs" + Attribute "NickName" "" "HP Officejet Pro 8630 hpijs, $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 8630 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet pro 8630;DES:hp officejet pro 8630;" + PCFileName "hp-officejet_pro_8630-hpijs.ppd" + Attribute "Product" "" "(HP Officejet Pro 8630 E-all-in-one Printer)" + } + { + ModelName "HP Officejet Pro 8640 hpijs" + Attribute "NickName" "" "HP Officejet Pro 8640 hpijs, $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 8640 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet pro 8640;DES:hp officejet pro 8640;" + PCFileName "hp-officejet_pro_8640-hpijs.ppd" + Attribute "Product" "" "(HP Officejet Pro 8640 E-all-in-one Printer)" + } + { + ModelName "HP Officejet Pro 8660 hpijs" + Attribute "NickName" "" "HP Officejet Pro 8660 hpijs, $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 8660 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet pro 8660;DES:hp officejet pro 8660;" + PCFileName "hp-officejet_pro_8660-hpijs.ppd" + Attribute "Product" "" "(HP Officejet Pro 8660 E-all-in-one Printer)" + } } // end Ampere @@ -17277,6 +17405,7 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 1010 series;DES:deskjet 1010 series;" PCFileName "hp-deskjet_1010_series-hpijs.ppd" Attribute "Product" "" "(HP Deskjet 1010 Printer)" + Attribute "Product" "" "(HP Deskjet 1011 Printer)" Attribute "Product" "" "(HP Deskjet 1012 Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 1010 Printer Series)" Attribute "Product" "" "(HP Deskjet Ink Advantage 1015 Printer)" @@ -17289,13 +17418,14 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 1510 series;DES:deskjet 1510 series;" PCFileName "hp-deskjet_1510_series-hpijs.ppd" Attribute "Product" "" "(HP Deskjet 1510 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet 1511 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet 1512 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet 1513 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet 1514 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 1510 All-in-one Printer Series)" 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" @@ -17305,11 +17435,13 @@ lity:PenSet=2,Quality:FullBleed=1" PCFileName "hp-deskjet_2540_series-hpijs.ppd" Attribute "Product" "" "(HP Deskjet 2540 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet 2542 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet 2543 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet 2544 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet 2549 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 2540 All-in-one Printer Series)" 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" diff --git a/prnt/filters/hpps b/prnt/filters/hpps index fcd900faa..258b25895 100644 --- a/prnt/filters/hpps +++ b/prnt/filters/hpps @@ -264,12 +264,12 @@ if 'HPPJLDryTime' in key_list: try: if opts['HPPJLDryTime'] == '0': os.write(output_fd, '@PJL SET DRYTIME=0\x0a') - elif opts['HPPJLDryTime'] == '1': + elif opts['HPPJLDryTime'] == 'Medium': os.write(output_fd, '@PJL SET DRYTIME=4\x0a') - if opts['HPPJLDryTime'] == '2': + if opts['HPPJLDryTime'] == 'Long': os.write(output_fd, '@PJL SET DRYTIME=7\x0a') except: - os.write(output_fd, '@PJL SET DRYTIME=4\x0a') + os.write(output_fd, '@PJL SET DRYTIME=0\x0a') if 'HPPJLSaturation' in key_list: try: @@ -288,14 +288,16 @@ if 'HPPJLSaturation' in key_list: if 'HPPJLInkBleed' in key_list: try: - if opts['HPPJLInkBleed'] == '-2': + if opts['HPPJLInkBleed'] == '-2' or opts['HPPJLInkBleed'] == 'Default': os.write(output_fd, '@PJL SET INKBLEED=0\x0a') elif opts['HPPJLInkBleed'] == '-1': os.write(output_fd, '@PJL SET INKBLEED=2\x0a') - elif opts['HPPJLInkBleed'] == '0': + elif opts['HPPJLInkBleed'] == '0' or opts['HPPJLInkBleed'] == 'Less': os.write(output_fd, '@PJL SET INKBLEED=4\x0a') elif opts['HPPJLInkBleed'] == '+1': os.write(output_fd, '@PJL SET INKBLEED=6\x0a') + elif opts['HPPJLInkBleed'] == 'Least': + os.write(output_fd, '@PJL SET INKBLEED=7\x0a') elif opts['HPPJLInkBleed'] == '+2': os.write(output_fd, '@PJL SET INKBLEED=8\x0a') except: diff --git a/prnt/hpcups/CommonDefinitions.h b/prnt/hpcups/CommonDefinitions.h index cd2a9572d..3635b65c5 100644 --- a/prnt/hpcups/CommonDefinitions.h +++ b/prnt/hpcups/CommonDefinitions.h @@ -56,9 +56,11 @@ #endif #define BASIC_LOG 1 -#define SAVE_PCL_FILE 2 +#define SAVE_OUT_FILE 2 #define SAVE_INPUT_RASTERS 4 -#define SEND_TO_PRINTER_ALSO 8 +#define SAVE_OUT_FILE_IN_BACKEND 8 +#define DONT_SEND_TO_BACKEND 16 +#define DONT_SEND_TO_PRINTER 32 #define MAX_COLORTYPE 2 #define NUMBER_PLANES 3 diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp index 2755e9226..374b815f2 100644 --- a/prnt/hpcups/HPCupsFilter.cpp +++ b/prnt/hpcups/HPCupsFilter.cpp @@ -484,7 +484,7 @@ int HPCupsFilter::StartPrintJob(int argc, char *argv[]) strncpy(m_JA.job_start_time, asctime(t), sizeof(m_JA.job_start_time)-1); // returns Fri Jun 5 08:12:16 2009 snprintf(m_JA.job_start_time+19, sizeof(m_JA.job_start_time) - 20, ":%ld %d", tv.tv_usec/1000, t->tm_year + 1900); // add milliseconds - getLogLevel(); + m_iLogLevel = getHPLogLevel(); m_JA.job_id = atoi(argv[1]); strncpy(m_JA.user_name,argv[2],sizeof(m_JA.user_name)-1); @@ -594,7 +594,7 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) DRIVER_ERROR err; int ret_status = 0; - char hpPreProcessedRasterFile[64]; //temp file needed to store raster data with swaped pages. + char hpPreProcessedRasterFile[MAX_FILE_PATH_LEN]; //temp file needed to store raster data with swaped pages. sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name); @@ -660,14 +660,14 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) // Save Raster file for Debugging if (m_iLogLevel & SAVE_INPUT_RASTERS) { - char szFileName[64]; + char szFileName[MAX_FILE_PATH_LEN]; memset(szFileName, 0, sizeof(szFileName)); if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW || cups_header.cupsColorSpace == CUPS_CSPACE_RGB) { - snprintf (szFileName, sizeof(szFileName), "%s/hp_%s_cups_filterc_bmp_%d_XXXXXX", CUPS_TMP_DIR, m_JA.user_name, current_page_number); + snprintf (szFileName, sizeof(szFileName), "%s/hpcups_%s_c_bmp_%d_XXXXXX", CUPS_TMP_DIR, m_JA.user_name, current_page_number); createTempFile(szFileName, &cfp); if (cfp) { @@ -678,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), "%s/hp_%s_cups_filterk_bmp_%d_XXXXXX", CUPS_TMP_DIR, m_JA.user_name, current_page_number); + snprintf (szFileName, sizeof(szFileName), "%s/hpcups_%s_k_bmp_%d_XXXXXX", CUPS_TMP_DIR, m_JA.user_name, current_page_number); createTempFile(szFileName, &kfp); if (kfp) { @@ -737,6 +737,8 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW) { delete [] kRaster; delete [] rgbRaster; + kRaster = NULL; + rgbRaster = NULL; } unlink(hpPreProcessedRasterFile); @@ -868,27 +870,4 @@ void HPCupsFilter::printCupsHeaderInfo(cups_page_header2_t *header) dbglog ("DEBUG: cupsReal1 = %f\n", header->cupsReal[1]); // Top overspray } -void HPCupsFilter::getLogLevel () -{ - FILE *fp; - char str[258]; - char *p; - fp = fopen ("/etc/cups/cupsd.conf", "r"); - if (fp == NULL) - return; - while (!feof (fp)) - { - if (!fgets (str, 256, fp)) - { - break; - } - if ((p = strstr (str, "hpLogLevel"))) - { - p += strlen ("hpLogLevel") + 1; - m_iLogLevel = atoi (p); - break; - } - } - fclose (fp); -} diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h index 73175316d..f41f009d7 100644 --- a/prnt/hpcups/HPCupsFilter.h +++ b/prnt/hpcups/HPCupsFilter.h @@ -99,7 +99,7 @@ private: void closeFilter(); void cleanup(); - void getLogLevel(); + //void getLogLevel(); DRIVER_ERROR startPage (cups_page_header2_t *header); int processRasterData(cups_raster_t *cups_raster); void extractBlackPixels(cups_page_header2_t *cups_header, diff --git a/prnt/hpcups/LJZjStream.cpp b/prnt/hpcups/LJZjStream.cpp index e20b50d38..2a3909b63 100644 --- a/prnt/hpcups/LJZjStream.cpp +++ b/prnt/hpcups/LJZjStream.cpp @@ -676,8 +676,8 @@ DRIVER_ERROR LJZjStream::preProcessRasterData(cups_raster_t **ppcups_raster, cup cups_raster_t *even_pages_raster=NULL; cups_raster_t *odd_pages_raster = NULL; BYTE* pPageDataBuffer = NULL; - char hpEvenPagesFile[64]={0,}; - char hpOddPagesFile[64]={0,}; + char hpEvenPagesFile[MAX_FILE_PATH_LEN]={0,}; + char hpOddPagesFile[MAX_FILE_PATH_LEN]={0,}; 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); diff --git a/prnt/hpcups/SystemServices.cpp b/prnt/hpcups/SystemServices.cpp index 6accd50ee..043c579da 100644 --- a/prnt/hpcups/SystemServices.cpp +++ b/prnt/hpcups/SystemServices.cpp @@ -35,14 +35,16 @@ SystemServices::SystemServices(int iLogLevel, int job_id, char* user_name) : m_iLogLevel(iLogLevel) { m_fp = NULL; - if (iLogLevel & SAVE_PCL_FILE) + if (iLogLevel & SAVE_OUT_FILE) { - char fname[64]; - sprintf(fname, "%s/hp_%s_cups_out_job%d_XXXXXX",CUPS_TMP_DIR, user_name, job_id); + char fname[MAX_FILE_PATH_LEN]; + sprintf(fname, "%s/hpcups_%s_out_job%d_XXXXXX",CUPS_TMP_DIR, user_name, job_id); createTempFile(fname, &m_fp); if (m_fp) + { chmod(fname, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH); + } } } @@ -59,12 +61,13 @@ DRIVER_ERROR SystemServices::Send(const BYTE *pData, int iLength) if (m_fp) { fwrite (pData, 1, iLength, m_fp); - if (!(m_iLogLevel & SEND_TO_PRINTER_ALSO)) - { - return NO_ERROR; - } } - write (STDOUT_FILENO, pData, iLength); + + if ( !(m_iLogLevel & DONT_SEND_TO_BACKEND) ) + { + write (STDOUT_FILENO, pData, iLength); + } + return NO_ERROR; } diff --git a/prnt/hpijs/header2.cpp b/prnt/hpijs/header2.cpp index 6e2a40976..ace354c39 100644 --- a/prnt/hpijs/header2.cpp +++ b/prnt/hpijs/header2.cpp @@ -171,7 +171,7 @@ void Header::SetQuality(Quality qual) default: DBG1("<out of range, using> Normal\n"); break; } #endif - ASSERT (qual >= qualityAuto || qual <= qualityFastNormal); + ASSERT (qual >= qualityAuto && qual <= qualityFastNormal); if (qual < qualityAuto || qual > qualityFastNormal) qual = qualityNormal; diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp index 8d0ec74af..66e4faa05 100644 --- a/prnt/hpijs/hpcupsfax.cpp +++ b/prnt/hpijs/hpcupsfax.cpp @@ -66,7 +66,7 @@ uint32_t (*convert_endian_l)(uint32_t); uint16_t (*convert_endian_s)(uint16_t); static int iLogLevel = 1; -char hpFileName[64] ; +char hpFileName[MAX_FILE_PATH_LEN] ; #define TIFF_HDR_SIZE 8 #define LITTLE_ENDIAN_MODE I @@ -441,7 +441,7 @@ int ProcessTiffData(int fromFD, int toFD, char* user_name) int bytes_written = 0; int ret_status = 0; int bytes_read = 0; - char hpTiffFileName[64]; + char hpTiffFileName[MAX_FILE_PATH_LEN]; long input_file_size = 0; FILE* pFilePtrFax; snprintf(hpTiffFileName,sizeof(hpTiffFileName), "%s/hp_%s_fax_tiffXXXXXX",CUPS_TMP_DIR,user_name); diff --git a/prnt/hpijs/hpijs.cpp b/prnt/hpijs/hpijs.cpp index 5162bc2af..4cd021429 100644 --- a/prnt/hpijs/hpijs.cpp +++ b/prnt/hpijs/hpijs.cpp @@ -97,7 +97,7 @@ void setLogLevel(UXServices *pSS, char*user_name) if (pSS->m_iLogLevel & SAVE_PCL_FILE) { - char szFileName[64]; + char szFileName[MAX_FILE_PATH_LEN]; snprintf (szFileName,sizeof(szFileName), "%s/hp_%s_ijs_%d_XXXXXX", CUPS_TMP_DIR, user_name, getpid()); createTempFile(szFileName, &pSS->outfp); @@ -632,7 +632,7 @@ int main (int argc, char *argv[], char *evenp[]) setLogLevel(pSS, user_name); #ifdef CAPTURE - char szCapOutFile[64]; + char szCapOutFile[MAX_FILE_PATH_LEN]; 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"); diff --git a/prnt/hpijs/hpijsfax.cpp b/prnt/hpijs/hpijsfax.cpp index aa0663797..3edb35d3b 100644 --- a/prnt/hpijs/hpijsfax.cpp +++ b/prnt/hpijs/hpijsfax.cpp @@ -273,7 +273,7 @@ int hpijsFaxServer (int argc, char **argv) IP_HANDLE hJob; FILE *pFilePtrFax; - char hpFileName[64]; + char hpFileName[MAX_FILE_PATH_LEN]; int fdFax = -1; BYTE szFileHeader[68]; BYTE szPageHeader[64]; 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 715b9224d..70ab54244 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 438e7fcba..0e2e17834 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 ce170d1ed..c804700d9 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 09457a57e..24f951e00 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 f6458a8e3..cb0f3857c 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 3f9b7255d..99c760c0d 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 150403264..47ad73d87 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 7ecbc21bc..e27cb1f2c 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 ebe0a2461..c6b35a90d 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 e83bee962..d37fba30b 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 d43c941ea..f091807ac 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 6e38ad05d..e652cceb3 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 45fdebf7f..dc54ecf89 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 ade64888b..467eec42b 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 2296f365a..0b1ab3b86 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 679498194..fda1a9688 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 25dd41fa2..bf9e3a004 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 8173d6299..bb0498019 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 12481815e..a769cdd3e 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 275ed1eb7..88495ac1a 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 187217b3f..e4642c410 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 2d8d9d9b7..9e64a54f1 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 df9035046..e2a01d3a6 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 ccbcbef72..4395527d5 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 5bf25861a..29981c76f 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 a9c159670..35d2cd1e4 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 4af585488..b91ee91e0 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 6732c1139..c46133697 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 45a66e488..923547bfb 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 d8e28064b..af0702ee0 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 1e396bc46..908a5b45b 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 5c5b66493..4f1203daa 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 cf11768e7..45222044c 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 bffefc522..f2526ae88 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 9ebe73d30..a43c17f61 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 3169d814c..a2df24290 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 db233f75a..2ebe03807 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 a6f1bcee5..9260b0036 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 474f1cf62..dddfeabe2 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 01efe3131..db729f958 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 e26362be5..42e4fb429 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 20df9b52f..7e2029f72 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 419f4d749..fb08d819c 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 03498aa75..2e33ed47f 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 3ef018266..320ccb4a6 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 605965405..4e22b4f76 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 c959122e5..d18c34687 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 bab11af0d..20c554d3e 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 599c5fae6..bd8142b2d 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 295838677..2bcaf3f91 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 8df56d6f8..e56403f03 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 2528a3df0..7f35840a2 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 4fdf63cfe..34f1eeb3e 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 c40fe0003..1a243aabc 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 c2e1d7646..d00284651 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 7aa717476..338b03cf8 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 cfa8303d9..6528cb3a3 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 7266bb468..f7c774af1 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 ca91e34ae..eee39f52b 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 3211cc4c5..20cbf3519 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 03eff3c24..5418fd3c1 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 888084537..b48fe369f 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 fede956b3..83797a481 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 f4ebbc584..a46344f7b 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 9c7049deb..34c43c185 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 6fdb651c5..575a3b639 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 1c6704b02..9f53b79d0 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 b44022e3b..4393de15d 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 be3540819..f757b6f13 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 263378c7e..e39d92267 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 5f91eaf20..099b3022e 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_m680-ps.ppd.gz b/prnt/ps/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..683de26be --- /dev/null +++ b/prnt/ps/hp-color_laserjet_flow_mfp_m680-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 differindex 67b672ea2..0847a3615 100644 --- a/prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m651-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m651-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..ed8e00fd9 --- /dev/null +++ b/prnt/ps/hp-color_laserjet_m651-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 differindex 53e4159d6..609b9372b 100644 --- a/prnt/ps/hp-color_laserjet_m750-ps.ppd.gz +++ 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 differindex 05f5dcef6..48c8a18a1 100644 --- a/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_m680-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m680-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..b12b25db6 --- /dev/null +++ b/prnt/ps/hp-color_laserjet_mfp_m680-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..0f73718cb --- /dev/null +++ b/prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_4000ps.ppd.gz b/prnt/ps/hp-designjet_4000ps.ppd.gz Binary files differindex 4a42575b6..1595616e0 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 606dc048f..195d45501 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 d4ac4af9b..f4f413660 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 6c77cf328..2866b94e9 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 2c7ecc923..ed90dfaf0 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 dbcc7098d..fe59c6a70 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_d5800-ps.ppd.gz b/prnt/ps/hp-designjet_d5800-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..aa78d8a78 --- /dev/null +++ b/prnt/ps/hp-designjet_d5800-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 220497e20..6ee712745 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 7ad6e7346..59f7269c6 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 753c155e2..229930c25 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 f155bb3db..036325120 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 d5bddde0f..ad61d0673 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 221975b83..dee2b5fb0 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 847903732..06b73a6d0 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 01854e533..c816125cd 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 differindex 72d847bf3..b08c1136c 100644 --- a/prnt/ps/hp-designjet_t2500-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_t2500-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_t3500-ps.ppd.gz b/prnt/ps/hp-designjet_t3500-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..6613c5cbe --- /dev/null +++ b/prnt/ps/hp-designjet_t3500-ps.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 c6108042b..593afad8a 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 b1a2ef322..6b6751fcb 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_t7200-ps.ppd.gz b/prnt/ps/hp-designjet_t7200-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..df251df31 --- /dev/null +++ b/prnt/ps/hp-designjet_t7200-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 f30ab70e6..faeb675d3 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 93ab71bcd..feeb14663 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 6768a082b..9d9baa1a4 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 632d7f1a2..8848800b1 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_t795ps_44in-ps.ppd.gz b/prnt/ps/hp-designjet_t795ps_44in-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..365326a14 --- /dev/null +++ b/prnt/ps/hp-designjet_t795ps_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 35b3c212c..025ca0b90 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 d91c12fed..b61b854ba 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 956187d33..330a8331b 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 f4e674a0c..9aa51978b 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 742219178..c2d1e67dc 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 5b04b704a..cca6ffa10 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 2b5c02d9e..113cefa87 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-designjet_z6600-postscript.ppd.gz b/prnt/ps/hp-designjet_z6600-postscript.ppd.gz Binary files differnew file mode 100644 index 000000000..03416c822 --- /dev/null +++ b/prnt/ps/hp-designjet_z6600-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz b/prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz Binary files differnew file mode 100644 index 000000000..4252beac7 --- /dev/null +++ b/prnt/ps/hp-designjet_z6800_photo-postscript.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 4d16fd2d4..67ecc87e9 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 da83fda40..0c267ce19 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 308d64f7b..0ad5b4290 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 0d5c7ea6a..8a267862a 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 4eb269449..3e7036735 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 2e8d3ca5b..407e4215e 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 0d4a20f7f..7c04bc381 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 e4ad607a1..fb95a88a0 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 9524767f1..df876957b 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 24b7e47ee..66d3f6f94 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 5bdd8a077..c3f7455ca 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 f41f28363..53824ca03 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 bb5409a45..3cd4a35d7 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 3792dbf66..a8a0ee933 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 2c8fd8ecc..423e488e4 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 23086b827..2ba614e76 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 dbb6c35c7..b1372714a 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 a640832aa..778ce419f 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 91064f73c..4d1745342 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 9906c72cb..3fc0a4989 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 c0ae4f57a..d7c4cdc26 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 7d6bd2010..dc660bc09 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 1abc1ff26..8448e7289 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 67fee3eab..9c0ba8fcf 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 d3f3680ed..d1cf3a5ae 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 da3fdafa1..144eb43df 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 6aa5f0e07..653906bdd 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 7d0afd55d..3587988d4 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 f0b840908..aba6d9d98 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 c92618751..df285a02b 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 e97356520..3c0ad9fba 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 cacca909e..c60475211 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 086a92c2f..1920a8572 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 c915a681e..129da0a28 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 4393c67d7..93e06d353 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 26192fdce..532e84ede 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 8fa63b119..dfdbad259 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 efe395010..0604d3828 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 69a5b92e8..0d7d44628 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 e6a364e50..c9eae906f 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 048dd3dde..6db920f29 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 83c6a47aa..f79f3b6aa 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 6c6795f35..a1cc0c9f5 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 bd20f16c7..54207dad8 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 b52bdfa50..12ce4e155 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 e809dcf4f..46541dc51 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 cb90bab35..42cef7403 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 021544d23..0e250cec7 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 dbf8e3233..8ce5b1987 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 e77b31500..b1e939322 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 f1f5f13c2..f718a96f0 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 b04e283d7..6c312c7e6 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 63d7493d8..8786f9152 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 b01107f47..383a4c555 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 37d97b847..9e7360ed7 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 db35de84d..c7abd8b14 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 6e8936658..ce38f8534 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 9fa89e7f9..263c12776 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 9e4d98a40..f6e0598c4 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 9128a71b2..4cbffe901 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 a77e410d0..f1ca77e83 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 2aba481ac..0019e5d02 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 63480c980..da5aea019 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 29b5fedd2..6b52173d2 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 a48ef4fa6..5699fdd4b 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 45be50ffe..aace97d6e 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 85f0ab70c..cb72c8053 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 7321a81e2..7eea783af 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 560bce8bd..1fe420c2f 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 73e0f4f04..8d9340d51 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 337b4b96b..28a2b7165 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 74ed42c70..6e7327f9b 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 e2a4104b2..806abf9f5 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 9b2187b9e..82cf9026a 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 eefc81086..e9e3ae289 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 829700829..74fb99589 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 6c899c742..9e56dcb4d 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 9561262a4..73a2b10c0 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 eeacc5db8..3f08e5be4 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 47e6003e8..b93505bdd 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 4108b1577..27f3466e8 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 800428eb1..6035a6803 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 480436141..0809b56f2 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 f09f44c48..520a03f2f 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 6f4d5528d..3865bcdde 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 73acf7365..84f3a6438 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 e2d61a3d8..58b028c28 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 6b28a11fa..405fddf59 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 fe0acec12..0f50aec87 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 differindex bb63f5713..9bec92f8f 100644 --- a/prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz +++ 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 3a2825bd1..b261db137 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 b35d04aa6..fe93c4cc0 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 db88c23b0..fbc14f85f 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 5ef87dc4b..6b017e04d 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 d4f5b8742..288f55b06 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 da08fe061..790cc5989 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 d5f8d6e7b..5024db000 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 3d636b2f5..f18d6e276 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 ecff7e2c1..1d558c3e8 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 5bf689878..0031ccf18 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 d79a1883f..9cfc7562d 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 0658a7e52..bc741d068 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 differindex d10e8eb19..9e8719497 100644 --- a/prnt/ps/hp-laserjet_m806-ps.ppd.gz +++ 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 ce1e9db35..6d401ee51 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 b8935f1db..d97f568f9 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 ff7d6a90a..933b65e03 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 2cf6e4260..29e2db886 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 13dd21508..4f4dd132e 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 f6c84fea4..c6ecfd02a 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 edaf06988..0bcd05b40 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 dab358251..296c0b3b7 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 64ca01ab2..b31d65d8b 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 bfb51f1f5..9d02563c5 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 d2fd02948..71570a2fb 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_m701-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..8eeae8db5 --- /dev/null +++ b/prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..62bbeb090 --- /dev/null +++ b/prnt/ps/hp-laserjet_pro_m706-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 845a9bb9c..3e2d76de0 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 570deb3be..32252f4dd 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 ef2034db7..2046f2b46 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 4d599bcf8..63313fd3f 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 a65bbae2e..02a37e471 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_color_mfp_x585.ppd.gz b/prnt/ps/hp-officejet_color_mfp_x585.ppd.gz Binary files differnew file mode 100644 index 000000000..6338e4f6e --- /dev/null +++ b/prnt/ps/hp-officejet_color_mfp_x585.ppd.gz diff --git a/prnt/ps/hp-officejet_color_x555-ps.ppd.gz b/prnt/ps/hp-officejet_color_x555-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..d63c167d2 --- /dev/null +++ b/prnt/ps/hp-officejet_color_x555-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 1adb072b3..0a71baf75 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 29c657f4e..1bd129cc0 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 3d7ea6a4f..78b713f82 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 5dbaa1f58..32af8bb9c 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 84e1fe484..6d77c1fb6 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 d396ef4f6..8e2afda83 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 @@ -645,7 +645,7 @@ try: log.error("Failed to get the source from device.") #check if device has only ADF - if 'Flatbed' not in source_option and 'ADF' in source_option: + if len(source_option) == 1 and 'ADF' in source_option: log.debug("Device has only ADF support") adf = True diff --git a/scan/sane.py b/scan/sane.py index bffec90ac..7c26979fb 100755 --- a/scan/sane.py +++ b/scan/sane.py @@ -79,7 +79,7 @@ UNIT_STR = { scanext.UNIT_NONE: "UNIT_NONE", scanext.UNIT_PERCENT: "UNIT_PERCENT", scanext.UNIT_MICROSECOND: "UNIT_MICROSECOND" } - +MAX_READSIZE = 65536 class Option: @@ -435,6 +435,7 @@ class ScanThread(threading.Thread): self.bytes_per_line = -1 self.pad_bytes = -1 self.total_read = 0 + self.total_write = 0 self.byte_format = byte_format @@ -446,7 +447,7 @@ class ScanThread(threading.Thread): status = -1 #scanext.SANE_STATUS_GOOD self.update_queue.put((status, bytes_read)) - time.sleep(0) + def run(self): @@ -464,6 +465,8 @@ class ScanThread(threading.Thread): log.debug("byte_format=%s" % self.byte_format) w = self.buffer.write + #To get the exact buffer to read + readbuffer = self.bytes_per_line if self.format == scanext.FRAME_RGB: # "Color" if self.depth == 8: # 8 bpp (32bit) @@ -476,7 +479,7 @@ class ScanThread(threading.Thread): dir = 1 try: - st, t = self.dev.readScan(self.bytes_per_line) + st, t = self.dev.readScan(readbuffer) except scanext.error, st: self.updateQueue(st, 0) @@ -484,21 +487,19 @@ class ScanThread(threading.Thread): while st == scanext.SANE_STATUS_GOOD: if t: - index = 0 - while index < len(t) - self.pad_bytes: - w(t[index:index+3:dir]) - w('\xff') - index += 3 + len_t = len(t) + w("".join([t[index:index+3:dir] + '\xff' for index in range(0,len_t - self.pad_bytes,3)])) - self.total_read += len(t) + self.total_read += len_t + self.total_write += len_t+(len_t - self.pad_bytes)/3 self.updateQueue(st, self.total_read) - log.debug("Read %d bytes" % self.total_read) + log.debug("Color Read %d bytes" % self.total_read) else: time.sleep(0.1) try: - st, t = self.dev.readScan(self.bytes_per_line) + st, t = self.dev.readScan(readbuffer) except scanext.error, st: self.updateQueue(st, self.total_read) break @@ -514,15 +515,16 @@ class ScanThread(threading.Thread): log.debug("pad_bytes=%d" % self.pad_bytes) try: - st, t = self.dev.readScan(self.bytes_per_line) + st, t = self.dev.readScan(readbuffer) except scanext.error, st: self.updateQueue(st, 0) while st == scanext.SANE_STATUS_GOOD: if t: + len_t = len(t) index = 0 - while index < len(t) - self.pad_bytes: + while index < len_t - self.pad_bytes: k = 0x80 j = ord(t[index]) @@ -536,14 +538,15 @@ class ScanThread(threading.Thread): index += 1 - self.total_read += len(t) + self.total_read += len_t + self.total_write += ((len_t - self.pad_bytes) * 32) self.updateQueue(st, self.total_read) - log.debug("Read %d bytes" % self.total_read) + log.debug("Lineart Read %d bytes" % self.total_read) else: time.sleep(0.1) try: - st, t = self.dev.readScan(self.bytes_per_line) + st, t = self.dev.readScan(readbuffer) except scanext.error, st: self.updateQueue(st, self.total_read) break @@ -557,31 +560,25 @@ class ScanThread(threading.Thread): log.debug("pad_bytes=%d" % self.pad_bytes) try: - st, t = self.dev.readScan(self.bytes_per_line) + st, t = self.dev.readScan(readbuffer) except scanext.error, st: self.updateQueue(st, 0) while st == scanext.SANE_STATUS_GOOD: if t: - index = 0 - while index < len(t) - self.pad_bytes: - j = t[index] - w(j) - w(j) - w(j) - w("\xff") - - index += 1 + len_t = len(t) + w("".join([3*t[index:index+1] + '\xff' for index in range(0, len_t - self.pad_bytes)])) - self.total_read += len(t) + self.total_read += len_t + self.total_write += ((len_t - self.pad_bytes) * 4) self.updateQueue(st, self.total_read) - log.debug("Read %d bytes" % self.total_read) + log.debug("Gray Read %d bytes" % self.total_read) else: time.sleep(0.1) try: - st, t = self.dev.readScan(self.bytes_per_line) + st, t = self.dev.readScan(readbuffer) except scanext.error, st: self.updateQueue(st, self.total_read) break diff --git a/scan/sane/hpaio.desc b/scan/sane/hpaio.desc index 080062b15..321fb6c7e 100644 --- a/scan/sane/hpaio.desc +++ b/scan/sane/hpaio.desc @@ -136,15 +136,42 @@ :model "HP Envy 121 E-all-in-one" :status :good +:model "HP LaserJet Pro MFP m125rnw" +:status :good + +:model "HP LaserJet Pro MFP m125nw" +:status :good + +:model "HP LaserJet Pro MFP m125a" +:status :good + :model "HP Officejet d125xi All-in-one Printer" :status :good +:model "HP LaserJet Pro MFP m126nw" +:status :good + +:model "HP LaserJet Pro MFP m126a" +:status :good + :model "HP LaserJet Pro MFP m127fn" :status :good +:model "HP LaserJet Pro MFP m127fp" +:status :good + :model "HP LaserJet Pro MFP m127fw" :status :good +:model "HP LaserJet Pro MFP m128fp" +:status :good + +:model "HP LaserJet Pro MFP m128fw" +:status :good + +:model "HP LaserJet Pro MFP m128fn" +:status :good + :model "HP Officejet d135 All-in-one Printer" :status :good @@ -217,13 +244,13 @@ :model "HP LaserJet 200 Colormfp m276v" :status :good -:model "HP Deskjet Ink Advantage k209a All-in-one Printer" +:model "HP Photosmart Plus All-in-one Printer - b209b" :status :good -:model "HP Photosmart Plus All-in-one Printer - b209a" +:model "HP Deskjet Ink Advantage k209a All-in-one Printer" :status :good -:model "HP Photosmart Plus All-in-one Printer - b209b" +:model "HP Photosmart Plus All-in-one Printer - b209a" :status :good :model "HP Photosmart Plus All-in-one Printer - b209c" @@ -322,12 +349,21 @@ :model "HP Officejet Pro x476dn Multifunction Printer" :status :good +:model "HP Color LaserJet Pro MFP m476nw" +:status :good + :model "HP Officejet Pro x476 Multifunction Printer Series" :status :good :model "HP Officejet Pro x476dw Multifunction Printer" :status :good +:model "HP Color LaserJet Pro MFP m476dn" +:status :good + +:model "HP Color LaserJet Pro MFP m476dw" +:status :good + :model "HP PSC 500xi All-in-one Printer" :status :good @@ -742,6 +778,9 @@ :model "HP Deskjet Ink Advantage 1510 All-in-one Printer Series" :status :good +:model "HP Deskjet 1511 All-in-one Printer" +:status :good + :model "HP Deskjet 1512 All-in-one Printer" :status :good @@ -1084,6 +1123,9 @@ :model "HP Deskjet 2542 All-in-one Printer" :status :good +:model "HP Deskjet 2543 All-in-one Printer" +:status :good + :model "HP Deskjet 2544 All-in-one Printer" :status :good @@ -1096,6 +1138,9 @@ :model "HP Deskjet Ink Advantage 2548 All-in-one Printer" :status :good +:model "HP Deskjet 2549 All-in-one Printer" +:status :good + :model "HP PSC 2550 Photosmart All-in-one Printer" :status :good @@ -1291,10 +1336,10 @@ :model "HP Photosmart c3140 All-in-one Printer" :status :good -:model "HP LaserJet 3150se All-in-one Printer" +:model "HP Photosmart c3150 All-in-one Printer" :status :good -:model "HP Photosmart c3150 All-in-one Printer" +:model "HP LaserJet 3150se All-in-one Printer" :status :good :model "HP LaserJet 3150 All-in-one Printer" @@ -2011,21 +2056,42 @@ :model "HP Deskjet Ink Advantage 4625 E-all-in-one Printer" :status :good -:model "HP Officejet 4630 E-all-in-one" +:model "HP Officejet 4630 E-all-in-one Printer" +:status :good + +:model "HP Officejet 4631 E-all-in-one Printer" :status :good :model "HP Officejet 4632 E-all-in-one Printer" :status :good -:model "HP Photosmart c4635 All-in-one Printer" +:model "HP Officejet 4634 E-all-in-one Printer" :status :good :model "HP Officejet 4635 E-all-in-one Printer" :status :good +:model "HP Photosmart c4635 All-in-one Printer" +:status :good + +:model "HP Officejet 4636 E-all-in-one Printer" +:status :good + +:model "HP Deskjet Ink Advantage 4640 E-all-in-one Printer Series" +:status :good + :model "HP Photosmart c4640 All-in-one Printer" :status :good +:model "HP Deskjet Ink Advantage 4645 E-all-in-one Printer" +:status :good + +:model "HP Deskjet Ink Advantage 4646 E-all-in-one Printer" +:status :good + +:model "HP Deskjet Ink Advantage 4648 E-all-in-one Printer" +:status :good + :model "HP Photosmart c4650 All-in-one Printer" :status :good @@ -2038,10 +2104,10 @@ :model "HP Photosmart c4673 All-in-one Printer" :status :good -:model "HP Officejet j4680 All-in-one Printer" +:model "HP Photosmart c4680 All-in-one Printer" :status :good -:model "HP Photosmart c4680 All-in-one Printer" +:model "HP Officejet j4680 All-in-one Printer" :status :good :model "HP Officejet j4680c All-in-one Printer" @@ -2809,6 +2875,27 @@ :model "HP Officejet Pro 8600 E-aio n911a" :status :good +:model "HP Officejet Pro 8610 E-all-in-one Printer" +:status :good + +:model "HP Officejet Pro 8615 E-all-in-one Printer" +:status :good + +:model "HP Officejet Pro 8620 E-all-in-one Printer" +:status :good + +:model "HP Officejet Pro 8625 E-all-in-one Printer" +:status :good + +:model "HP Officejet Pro 8630 E-all-in-one Printer" +:status :good + +:model "HP Officejet Pro 8640 E-all-in-one Printer" +:status :good + +:model "HP Officejet Pro 8660 E-all-in-one Printer" +:status :good + :model "HP LaserJet 9000 Multifunction Printer" :status :good diff --git a/scan/sane/sclpml.c b/scan/sane/sclpml.c index 0ce43bf53..7ee897120 100644 --- a/scan/sane/sclpml.c +++ b/scan/sane/sclpml.c @@ -41,6 +41,7 @@ #include "common.h" #include "scl.h" #include "hpaio.h" +#include "utils.h" #define DEBUG_DECLARE_ONLY #include "sanei_debug.h" @@ -2640,7 +2641,7 @@ SANE_Status sclpml_start(SANE_Handle handle) if( log_output ) { - char f[256]; + char f[MAX_FILE_PATH_LEN]; static int cnt=0; if (getenv("HOME")) diff --git a/scan/scanext/scanext.c b/scan/scanext/scanext.c index 34815d020..3b64bf4df 100755 --- a/scan/scanext/scanext.c +++ b/scan/scanext/scanext.c @@ -449,7 +449,7 @@ static PyObject *setAutoOption (_ScanDevice * self, PyObject * args) return Py_BuildValue ("i", i); } -#define MAX_READSIZE 32768 +#define MAX_READSIZE 65536 static PyObject *readScan (_ScanDevice * self, PyObject * args) { @@ -317,6 +317,7 @@ else: # INTERACTIVE_MODE if cups.IPP_OK == status: log.info("Successfully deleted %s Print/Fax queue"%selected_device_name) + utils.sendEvent(EVENT_CUPS_QUEUES_REMOVED,remove_device[1], remove_device[0]) clean_exit(0) else: log.error("Failed to delete %s Print/Fax queue. Error : %s"%(selected_device_name,status_str)) @@ -557,7 +558,7 @@ else: # INTERACTIVE_MODE clean_exit(1) if auto: - location, info = '', 'Automatically setup by HPLIP' + location, info = '', '%s Device (Automatically setup by HPLIP)'%(default_model.replace('_',' ')) else: while True: location = raw_input(log.bold("Enter a location description for this printer (q=quit) ?")) @@ -606,7 +607,7 @@ else: # INTERACTIVE_MODE clean_exit(1) else: # sending Event to add this device in hp-systray - utils.sendEvent(EVENT_CUPS_QUEUES_CHANGED,print_uri, printer_name) + utils.sendEvent(EVENT_CUPS_QUEUES_ADDED,print_uri, printer_name) # Updating firmware download for supported devices. if ignore_plugin_check is False and mq.get('fw-download', False): @@ -659,7 +660,7 @@ else: # INTERACTIVE_MODE i = 2 while True: t = fax_default_model + "_%d" % i - if (t in installed_fax_names) and (fax_uri not in installed_fax_devices or t not in installed_fax_devices[fax_uri]): + if (t not in installed_fax_names) and (fax_uri not in installed_fax_devices or t not in installed_fax_devices[fax_uri]): fax_default_model += "_%d" % i break i += 1 @@ -711,7 +712,7 @@ else: # INTERACTIVE_MODE clean_exit(1) if auto: - location, info = '', 'Automatically setup by HPLIP' + location, info = '', '%s Fax Device (Automatically setup by HPLIP)'%(default_model.replace('_',' ')) else: while True: location = raw_input(log.bold("Enter a location description for this printer (q=quit) ?")) @@ -756,7 +757,7 @@ else: # INTERACTIVE_MODE clean_exit(1) else: # sending Event to add this device in hp-systray - utils.sendEvent(EVENT_CUPS_QUEUES_CHANGED,fax_uri, fax_name) + utils.sendEvent(EVENT_CUPS_QUEUES_ADDED,fax_uri, fax_name) @@ -800,7 +801,7 @@ else: # INTERACTIVE_MODE try: current_phone_num = str(d.getPhoneNum()) - current_station_name = str(d.getStationName()) + current_station_name = d.getStationName() except Error: log.error("Could not communicate with device. Device may be busy. Please wait for retry...") time.sleep(5) @@ -844,15 +845,19 @@ else: # INTERACTIVE_MODE while True: if current_station_name: - station_name = raw_input(log.bold("\nEnter the name and/or company for this device (c=use current:'%s'*, q=quit) ?" % current_station_name)) + station_name = raw_input(log.bold("\nEnter the name and/or company for this device (c=use current:'%s'*, q=quit) ?" % current_station_name.encode('utf-8'))) else: 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.") clean_exit(0) if current_station_name and (not station_name or station_name.strip().lower() == 'c'): station_name = current_station_name + + if isinstance(station_name, str): + station_name = station_name.decode('utf-8') if len(station_name) > 50: diff --git a/ui/aboutdlg_base.py b/ui/aboutdlg_base.py index 16730db69..4e87d46c2 100644 --- a/ui/aboutdlg_base.py +++ b/ui/aboutdlg_base.py @@ -106,7 +106,7 @@ class AboutDlg_base(QDialog): self.VersionText.setText(self.__tr("0.0.0")) self.textLabel4_2.setText(self.__tr("<b>Device Manager Software Version:</b>")) self.ToolboxVersionText.setText(self.__tr("0.0.0")) - self.textLabel2.setText(self.__tr("<b>Authors and Contributors:</b>\nDavid Suffield, Don Welch, Shiyun Yie, Raghothama Cauligi, John Oleinik, Cory Meisch, Foster Nuffer, Pete Parks, Jacqueline Pitter, David Paschal,\nSteve DeRoos, Mark Overton, Aaron Albright, Smith Kennedy, John Hosszu, Chris Wiesner, Henrique M. Holschuh, Till Kamppeter, Linus Araque, Mark Crawford, Charlie Moore, Naga Samrat Choudary, Suma Byrappa, Parul Singh, Srikant Lokare, Sanjay Kumar, Sarbeswar Meher, Goutam Kodu, Gaurav Sood, Raghavendra Chitpadi")) + self.textLabel2.setText(self.__tr("<b>Authors and Contributors:</b>\nDavid Suffield, Don Welch, Shiyun Yie, Raghothama Cauligi, John Oleinik, Cory Meisch, Foster Nuffer, Pete Parks, Jacqueline Pitter, David Paschal,\nSteve DeRoos, Mark Overton, Aaron Albright, Smith Kennedy, John Hosszu, Chris Wiesner, Henrique M. Holschuh, Till Kamppeter, Linus Araque, Mark Crawford, Charlie Moore, Naga Samrat Choudary, Suma Byrappa, Parul Singh, Srikant Lokare, Sanjay Kumar, Sarbeswar Meher, Goutam Kodu, Gaurav Sood, Raghavendra Chitpadi, Amarnath Chitumalla")) self.textLabel3.setText(self.__tr("<b>License and Copyright:</b>\n(c) Copyright 2007 Hewlett-Packard Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.")) diff --git a/ui/devmgr4.py b/ui/devmgr4.py index 9de6fcfdb..f24a546ca 100644 --- a/ui/devmgr4.py +++ b/ui/devmgr4.py @@ -701,7 +701,7 @@ class DevMgr4(DevMgr4_base): self.UpdateHistory(dev) self.UpdateDevice(dev) - elif event.event_code == EVENT_CUPS_QUEUES_CHANGED: + elif event.event_code == EVENT_CUPS_QUEUES_REMOVED or event.event_code == EVENT_CUPS_QUEUES_ADDED: pass elif event.event_code == EVENT_RAISE_DEVICE_MANAGER: # 9001 @@ -944,7 +944,7 @@ class DevMgr4(DevMgr4_base): qApp.processEvents() # sending Event to remove this device from hp-systray if removed_device: - utils.sendEvent(EVENT_CUPS_QUEUES_CHANGED,removed_device, "") + utils.sendEvent(EVENT_CUPS_QUEUES_REMOVED,removed_device, "") if len(devices): for tab in self.TabIndex: @@ -2151,17 +2151,20 @@ class DevMgr4(DevMgr4_base): light_magenta = "#ffccff" black = "#000000" blue = "#0000ff" - dark_grey = "#808080" - light_grey = "#c0c0c0" + gray = "#808080" + dark_gray = "#a9a9a9" + light_gray = "#c0c0c0" + red = "#ff0000" self.TYPE_TO_PIX_MAP = { AGENT_TYPE_UNSPECIFIED : [black], AGENT_TYPE_BLACK: [black], AGENT_TYPE_MATTE_BLACK : [black], - AGENT_TYPE_PHOTO_BLACK : [dark_grey], + AGENT_TYPE_PHOTO_BLACK : [dark_gray], + AGENT_TYPE_BLACK_B8800: [black], AGENT_TYPE_CMY: [cyan, magenta, yellow], AGENT_TYPE_KCM: [light_cyan, light_magenta, light_yellow], - AGENT_TYPE_GGK: [dark_grey], + AGENT_TYPE_GGK: [dark_gray], AGENT_TYPE_YELLOW: [yellow], AGENT_TYPE_MAGENTA: [magenta], AGENT_TYPE_CYAN : [cyan], @@ -2173,12 +2176,15 @@ class DevMgr4(DevMgr4_base): AGENT_TYPE_LC_LM: [light_cyan, light_magenta], #AGENT_TYPE_Y_M: [yellow, magenta], #AGENT_TYPE_C_K: [black, cyan], - AGENT_TYPE_LG_PK: [light_grey, dark_grey], - AGENT_TYPE_LG: [light_grey], - AGENT_TYPE_G: [dark_grey], - AGENT_TYPE_PG: [light_grey], + AGENT_TYPE_LG_PK: [light_gray, dark_gray], + AGENT_TYPE_LG: [light_gray], + AGENT_TYPE_G: [gray], + AGENT_TYPE_DG: [dark_gray], + AGENT_TYPE_PG: [light_gray], AGENT_TYPE_C_M: [cyan, magenta], AGENT_TYPE_K_Y: [black, yellow], + AGENT_TYPE_LC: [light_cyan], + AGENT_TYPE_RED : [red], } self.suppliesList.setSorting(-1) diff --git a/ui/pluginform2.py b/ui/pluginform2.py index 81bcb882d..2e5c879cd 100644 --- a/ui/pluginform2.py +++ b/ui/pluginform2.py @@ -127,33 +127,12 @@ class PluginForm2(PluginForm2_base): log.info("Downloading plug-in from: %s" % self.path) - status, self.path = self.pluginObj.download(self.path, self.plugin_download_callback) + status, self.path, error_str = self.pluginObj.download(self.path, self.plugin_download_callback) - if status != pluginhandler.PLUGIN_INSTALL_ERROR_NONE: - - if status == pluginhandler.PLUGIN_INSTALL_ERROR_PLUGIN_FILE_NOT_FOUND: - desc = self.__tr("<b>ERROR: Plug-in file not found (server returned 404 or similar error).") - - elif status == pluginhandler.PLUGIN_INSTALL_ERROR_DIGITAL_SIGN_NOT_FOUND: - desc = self.__tr("<b>ERROR: Plug-in digital signature file not found (server returned 404 or similar error).") - - elif status == pluginhandler.PLUGIN_INSTALL_ERROR_DIGITAL_SIGN_BAD: - desc = self.__tr("<b>ERROR: Plug-in file does not match its digital signature.</b><p>File may have been corrupted or altered.") - - elif status == pluginhandler.PLUGIN_INSTALL_ERROR_PLUGIN_FILE_CHECKSUM_ERROR: - desc = self.__tr("<b>ERROR: Plug-in file does not match its checksum. File may have been corrupted or altered.") - - elif status == pluginhandler.PLUGIN_INSTALL_ERROR_NO_NETWORK: - desc = self.__tr("<b>ERROR: Unable to connect to network to download the plug-in.</b><p>Please check your network connection and try again.</p>") - - elif status == pluginhandler.PLUGIN_INSTALL_ERROR_DIRECTORY_ERROR: - desc = self.__tr("<b>ERROR: Unable to create the plug-in directory.</b><p>Please check your permissions and try again.</p>") - - elif status == pluginhandler.PLUGIN_INSTALL_ERROR_UNABLE_TO_RECV_KEYS: - desc = self.__tr("<b>ERROR: Unable to download the public HPLIP keys from the keyserver.") + if status != ERROR_SUCCESS: self.pluginObj.deleteInstallationFiles(self.path) - self.FailureUI(desc) + self.FailureUI(error_str) self.close() return diff --git a/ui/setupform.py b/ui/setupform.py index 2eb5f70bd..f4321775d 100644 --- a/ui/setupform.py +++ b/ui/setupform.py @@ -889,7 +889,7 @@ class SetupForm(SetupForm_base): 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) + utils.sendEvent(EVENT_CUPS_QUEUES_ADDED,self.device_uri, self.printer_name) QApplication.restoreOverrideCursor() return status @@ -948,7 +948,7 @@ class SetupForm(SetupForm_base): 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) + utils.sendEvent(EVENT_CUPS_QUEUES_ADDED,self.fax_uri, self.fax_name) QApplication.restoreOverrideCursor() return status diff --git a/ui4/devmgr5.py b/ui4/devmgr5.py index 514c2f59a..7d7bebf74 100644 --- a/ui4/devmgr5.py +++ b/ui4/devmgr5.py @@ -690,9 +690,6 @@ class DevMgr5(QMainWindow, Ui_MainWindow): self.DeviceList.updateGeometry() qApp.processEvents() - # sending Event to remove this device from hp-systray - if removed_device: - utils.sendEvent(EVENT_CUPS_QUEUES_CHANGED,removed_device, "") if len(device_list): for tab in self.TabIndex: @@ -1433,18 +1430,20 @@ class DevMgr5(QMainWindow, Ui_MainWindow): light_magenta = "#ffccff" black = "#000000" blue = "#0000ff" - dark_grey = "#808080" - light_grey = "#c0c0c0" + gray = "#808080" + dark_gray = "#a9a9a9" + light_gray = "#c0c0c0" + red = "#ff0000" self.TYPE_TO_PIX_MAP = { AGENT_TYPE_UNSPECIFIED : [black], AGENT_TYPE_BLACK: [black], AGENT_TYPE_MATTE_BLACK : [black], - AGENT_TYPE_PHOTO_BLACK : [dark_grey], + AGENT_TYPE_PHOTO_BLACK : [dark_gray], AGENT_TYPE_BLACK_B8800: [black], AGENT_TYPE_CMY: [cyan, magenta, yellow], AGENT_TYPE_KCM: [light_cyan, light_magenta, light_yellow], - AGENT_TYPE_GGK: [dark_grey], + AGENT_TYPE_GGK: [dark_gray], AGENT_TYPE_YELLOW: [yellow], AGENT_TYPE_MAGENTA: [magenta], AGENT_TYPE_CYAN : [cyan], @@ -1456,12 +1455,15 @@ class DevMgr5(QMainWindow, Ui_MainWindow): AGENT_TYPE_LC_LM: [light_cyan, light_magenta], #AGENT_TYPE_Y_M: [yellow, magenta], #AGENT_TYPE_C_K: [black, cyan], - AGENT_TYPE_LG_PK: [light_grey, dark_grey], - AGENT_TYPE_LG: [light_grey], - AGENT_TYPE_G: [dark_grey], - AGENT_TYPE_PG: [light_grey], + AGENT_TYPE_LG_PK: [light_gray, dark_gray], + AGENT_TYPE_LG: [light_gray], + AGENT_TYPE_G: [gray], + AGENT_TYPE_DG: [dark_gray], + AGENT_TYPE_PG: [light_gray], AGENT_TYPE_C_M: [cyan, magenta], AGENT_TYPE_K_Y: [black, yellow], + AGENT_TYPE_LC: [light_cyan], + AGENT_TYPE_RED : [red], } self.supplies_headers = [self.__tr(""), self.__tr("Description"), diff --git a/ui4/faxsetupdialog.py b/ui4/faxsetupdialog.py index e2be5f4be..e07d0a120 100644 --- a/ui4/faxsetupdialog.py +++ b/ui4/faxsetupdialog.py @@ -171,7 +171,7 @@ class FaxSetupDialog(QDialog, Ui_Dialog): log.debug("Saving station name %s to device" % s) self.dev.setStationName(s) except Error: - CheckDeviceUI() + CheckDeviceUI(self) finally: endWaitCursor() @@ -195,7 +195,7 @@ class FaxSetupDialog(QDialog, Ui_Dialog): log.debug("Saving fax number %s to device" % s) self.dev.setPhoneNum(s) except Error: - CheckDeviceUI() + CheckDeviceUI(self) finally: endWaitCursor() @@ -265,7 +265,7 @@ class FaxSetupDialog(QDialog, Ui_Dialog): log.debug("fax_number = '%s'" % fax_number) self.FaxNumberLineEdit.setText(fax_number) except Error: - CheckDeviceUI() + CheckDeviceUI(self) finally: endWaitCursor() diff --git a/ui4/plugindialog.py b/ui4/plugindialog.py index 7b0518df7..a017fa95d 100644 --- a/ui4/plugindialog.py +++ b/ui4/plugindialog.py @@ -238,38 +238,22 @@ class PluginDialog(QDialog, Ui_Dialog): log.info("Downloading plug-in from: %s" % self.plugin_path) - status, download_plugin_file = self.pluginObj.download(self.plugin_path,self.plugin_download_callback) + status, download_plugin_file, error_str = self.pluginObj.download(self.plugin_path,self.plugin_download_callback) - if status in (pluginhandler.PLUGIN_INSTALL_ERROR_UNABLE_TO_RECV_KEYS, pluginhandler.PLUGIN_INSTALL_ERROR_DIGITAL_SIGN_NOT_FOUND): + if status in (ERROR_UNABLE_TO_RECV_KEYS, ERROR_DIGITAL_SIGN_NOT_FOUND): endWaitCursor() - if QMessageBox.question(self, self.__tr("Digital signature download failed"), - self.__tr("<b>The download of the digital signature file failed.</b><p>Without this file, it is not possible to authenticate and validate the plug-in prior to installation.</p>Do you still want to install the plug-in?"), + if QMessageBox.question(self, " ", + self.__tr("<b>%s</b><p>Without this, it is not possible to authenticate and validate the plug-in prior to installation.</p>Do you still want to install the plug-in?" %error_str), QMessageBox.Yes | QMessageBox.No) != QMessageBox.Yes: self.pluginObj.deleteInstallationFiles(download_plugin_file) self.close() return - elif status != pluginhandler.PLUGIN_INSTALL_ERROR_NONE: - - if status == pluginhandler.PLUGIN_INSTALL_ERROR_PLUGIN_FILE_NOT_FOUND: - desc = self.__tr("<b>ERROR: Plug-in file not found (server returned 404 or similar error)") - - elif status == pluginhandler.PLUGIN_INSTALL_ERROR_DIGITAL_SIGN_BAD: - desc = self.__tr("<b>ERROR: Plug-in file does not match its digital signature.</b><p>File may have been corrupted or altered.") - - elif status == pluginhandler.PLUGIN_INSTALL_ERROR_PLUGIN_FILE_CHECKSUM_ERROR: - desc = self.__tr("<b>ERROR: Plug-in file does not match its checksum. File may have been corrupted or altered.") - - elif status == pluginhandler.PLUGIN_INSTALL_ERROR_NO_NETWORK: - desc = self.__tr("<b>ERROR: Unable to connect to network to download the plug-in.</b><p>Please check your network connection and try again.</p>") - - elif status == pluginhandler.PLUGIN_INSTALL_ERROR_DIRECTORY_ERROR: - desc = self.__tr("<b>ERROR: Unable to create the plug-in directory.</b><p>Please check your permissions and try again.</p>") - + elif status != ERROR_SUCCESS: self.pluginObj.deleteInstallationFiles(download_plugin_file) endWaitCursor() - FailureUI(self, desc) + FailureUI(self, error_str) self.close() return diff --git a/ui4/queuesconf.py b/ui4/queuesconf.py index 2347847f1..3bfc73c9e 100644 --- a/ui4/queuesconf.py +++ b/ui4/queuesconf.py @@ -30,7 +30,8 @@ from base.g import * from base import utils from prnt import cups from base.codes import * -from ui_utils import * +from base import validation +from .ui_utils import * # Qt @@ -222,41 +223,38 @@ class QueuesDiagnose(QDialog, Ui_Dialog): def disable_smart_install(self): if not utils.check_network_connection(): - FailureUI(self, self.__tr("Internet connection not found.")) + FailureUI(self, queryString(ERROR_NO_NETWORK)) else: sts, HPLIP_file = utils.download_from_network(HPLIP_INFO_SITE) if sts is True: hplip_si_conf = ConfigBase(HPLIP_file) source = hplip_si_conf.get("SMART_INSTALL","url","") if not source : - FailureUI(self, self.__tr("Failed to download %s"%HPLIP_INFO_SITE)) + FailureUI(self, queryString(ERROR_FAILED_TO_DOWNLOAD_FILE, 0, HPLIP_INFO_SITE)) return response_file, smart_install_run = utils.download_from_network(source) response_asc, smart_install_asc = utils.download_from_network(source+'.asc') if response_file and response_asc : - if self.passwordObj == None: - try: - from base.password import Password - except ImportError: - return SIH_FAILED_TO_VERIFY_DIG_SIGN, smart_install_run , "" - self.passwordObj = Password(GUI_MODE) - - if utils.ERROR_NONE == utils.validateDownloadFile(smart_install_run, smart_install_asc, "", self.passwordObj): + + gpg_obj = validation.GPG_Verification() + digsig_sts, error_str = gpg_obj.validate(smart_install_run, smart_install_asc) + + if ERROR_SUCCESS == digsig_sts: sts, out = utils.run("sh %s"%smart_install_run) else: - if QMessageBox.question(self, self.__tr("Digital signature download failed"), - self.__tr("<b>The download of the digital signature file failed.</b><p>Without this file, it is not possible to authenticate and validate this tool prior to installation.</p>Do you still want to run Smart Install disabler?"), + if QMessageBox.question(self, " ", + self.__tr("<b>%s</b><p>Without this, it is not possible to authenticate and validate this tool prior to installation.</p>Do you still want to run Smart Install disabler?" %error_str), QMessageBox.Yes | QMessageBox.No) == QMessageBox.Yes: # Disabling without verification. sts, out = utils.run("sh %s"%smart_install_run) - + else: - if not response_asc: - FailureUI(self, self.__tr("Failed to download %s file."%(source+'.asc'))) + if response_asc: + FailureUI(self, queryString(ERROR_FAILED_TO_DOWNLOAD_FILE, 0, source + ".asc")) else: - FailureUI(self, self.__tr("Failed to download %s file."%source)) + FailureUI(self, queryString(ERROR_FAILED_TO_DOWNLOAD_FILE, 0, source)) diff --git a/ui4/sendfaxdialog.py b/ui4/sendfaxdialog.py index 5aee2b153..59149a852 100644 --- a/ui4/sendfaxdialog.py +++ b/ui4/sendfaxdialog.py @@ -954,7 +954,7 @@ class SendFaxDialog(QDialog, Ui_Dialog): ok, num_pages, hort_dpi, vert_dpi, page_size, resolution, encoding = \ self.getFileInfo(fax_file) if ok: - self.FilesTable.addFile(fax_file, 'application/hplip-fax', 'HPLIP Fax', title, num_pages) + self.FilesTable.addFile(unicode(fax_file), 'application/hplip-fax', 'HPLIP Fax', title, num_pages) finally: self.busy = False diff --git a/ui4/setupdialog.py b/ui4/setupdialog.py index 38755a315..eb6fdf7f4 100644 --- a/ui4/setupdialog.py +++ b/ui4/setupdialog.py @@ -22,7 +22,6 @@ # StdLib import socket import operator -import commands import signal # Local @@ -696,8 +695,7 @@ class SetupDialog(QDialog, Ui_Dialog): self.setNextButton(BUTTON_ADD_PRINTER) - if not self.printer_name: - self.setDefaultPrinterName() + self.setDefaultPrinterName() self.findPrinterPPD() @@ -708,8 +706,7 @@ class SetupDialog(QDialog, Ui_Dialog): self.SetupFaxGroupBox.setChecked(True) self.SetupFaxGroupBox.setEnabled(True) - if not self.fax_name: - self.setDefaultFaxName() + self.setDefaultFaxName() self.findFaxPPD() @@ -997,7 +994,7 @@ class SetupDialog(QDialog, Ui_Dialog): 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) + utils.sendEvent(EVENT_CUPS_QUEUES_ADDED,self.device_uri, self.printer_name) finally: QApplication.restoreOverrideCursor() @@ -1022,7 +1019,7 @@ class SetupDialog(QDialog, Ui_Dialog): 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) + utils.sendEvent(EVENT_CUPS_QUEUES_ADDED,self.fax_uri, self.fax_name) finally: QApplication.restoreOverrideCursor() @@ -1256,6 +1253,7 @@ class SetupDialog(QDialog, Ui_Dialog): if widget.checkState() == Qt.Checked: item = self.RemoveDevicesTableWidget.item(row, 1) printer = unicode(item.data(Qt.UserRole).toString()).encode('utf-8') + uri = device.getDeviceURIByPrinterName(printer) log.debug("Removing printer: %s" % printer) status, status_str = cups.cups_operation(cups.delPrinter, GUI_MODE, 'qt4', self, printer) @@ -1263,6 +1261,10 @@ class SetupDialog(QDialog, Ui_Dialog): 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 + else: + # sending Event to add this device in hp-systray + utils.sendEvent(EVENT_CUPS_QUEUES_REMOVED, uri, printer) + self.close() else: diff --git a/ui4/setupdialog_base.py b/ui4/setupdialog_base.py index 8c3970a07..9cffeb034 100644 --- a/ui4/setupdialog_base.py +++ b/ui4/setupdialog_base.py @@ -138,7 +138,7 @@ class Ui_Dialog(object): self.gridlayout5.addWidget(self.JetDirectLabel, 0, 2, 1, 1) self.JetDirectSpinBox = QtGui.QSpinBox(self.ManualGroupBox) self.JetDirectSpinBox.setMinimum(1) - self.JetDirectSpinBox.setMaximum(3) + self.JetDirectSpinBox.setMaximum(4) self.JetDirectSpinBox.setObjectName("JetDirectSpinBox") self.gridlayout5.addWidget(self.JetDirectSpinBox, 0, 3, 1, 1) self.gridlayout3.addWidget(self.ManualGroupBox, 1, 0, 1, 1) diff --git a/ui4/systemtray.py b/ui4/systemtray.py index a3f32dad6..2b468c4ed 100644 --- a/ui4/systemtray.py +++ b/ui4/systemtray.py @@ -659,7 +659,7 @@ class SystemTrayApp(QApplication): m = m[self.fmt_size:] - if event.event_code == EVENT_CUPS_QUEUES_CHANGED: + if event.event_code == EVENT_CUPS_QUEUES_REMOVED or event.event_code == EVENT_CUPS_QUEUES_ADDED: self.resetDevice() for d in device.getSupportedCUPSDevices(back_end_filter=['hp', 'hpfax']): self.addDevice(d) @@ -704,9 +704,12 @@ class SystemTrayApp(QApplication): log.debug("Waiting to hide...") QTimer.singleShot(HIDE_INACTIVE_DELAY, self.timeoutHideWhenInactive) - if event.event_code <= EVENT_MAX_USER_EVENT: - self.addDevice(event.device_uri) - self.setMenu() + if event.event_code <= EVENT_MAX_USER_EVENT or \ + event.event_code == EVENT_CUPS_QUEUES_REMOVED or event.event_code == EVENT_CUPS_QUEUES_ADDED: + + if event.event_code != EVENT_CUPS_QUEUES_REMOVED: + self.addDevice(event.device_uri) + self.setMenu() if self.tray_icon.supportsMessages(): diff --git a/ui4/wifisetupdialog.py b/ui4/wifisetupdialog.py index d50ceeb19..7514f668e 100644 --- a/ui4/wifisetupdialog.py +++ b/ui4/wifisetupdialog.py @@ -592,7 +592,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog): elif self.success == SUCCESS_AUTO_IP: # self.pages.append((self.__tr("Your printer has been connected to the wireless network, but it has been assigned an address which may not be usable."), load_pixmap('warning', '16x16'))) - self.pages.append((self.__tr("Your printer has been connected to the wireless network and has been assinged a IP. Now run <pre>hp-setup %s</pre> If IP is not accessible, try again for another IP."%self.ip), load_pixmap('warning', '16x16'))) + self.pages.append((self.__tr("Your printer has been connected to the wireless network and has been assinged a IP. Now run <pre>hp-setup %1</pre> If IP is not accessible, try again for another IP.").arg(QString(self.ip)), load_pixmap('warning', '16x16'))) # self.RefreshTimer.start(REFRESH_INTERVAL * 1000) self.CancelButton.setEnabled(False) self.BackButton.setEnabled(False) diff --git a/upgrade.py b/upgrade.py index c00b98f7a..b66ce50d4 100755 --- a/upgrade.py +++ b/upgrade.py @@ -30,7 +30,8 @@ import getopt, os, sys, re, time # Local from base.g import * -from base import utils, tui, module, os_utils, password, services, validation +from base.strings import * +from base import utils, tui, module, os_utils, services, validation from installer.core_install import * @@ -39,18 +40,18 @@ USAGE = [(__doc__, "", "name", True), utils.USAGE_SPACE, utils.USAGE_MODE, ("Run in interactive mode:", "-i or --interactive (Default)", "option", False), - ("Run in graphical UI mode:", "-u or --gui (future use)", "option", False), +# ("Run in graphical UI mode:", "-u or --gui (future use)", "option", False), utils.USAGE_SPACE, utils.USAGE_OPTIONS, utils.USAGE_HELP, utils.USAGE_LOGGING1, utils.USAGE_LOGGING2, utils.USAGE_LOGGING3, ("Check for update and notify:","--notify","option",False), ("Check only available version:","--check","option",False), - ("Non-interactive mode:","-n(Without asking permissions)(future use)","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 ~/Downloads)","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) +# ("Take options from the file instead of command line:","-f<file> (future use)","option",False) ] mode = INTERACTIVE_MODE @@ -199,6 +200,10 @@ except getopt.GetoptError, e: log.error(e.msg) usage() +if os.geteuid() == 0: + log.error("hp-upgrade should not be run as root/superuser") + clean_exit(1) + if os.getenv("HPLIP_DEBUG"): log.set_level('debug') @@ -381,35 +386,19 @@ try: else: downloaded_file, digsig_file = download_hplip_installer(PATH_TO_DOWNLOAD_INSTALLER, HPLIP_latest_ver) - PasswordObj = password.Password(INTERACTIVE_MODE) - PasswordObj.clearPassword() - try: - gpg_obj = validation.GPG_Verification() - except Exception: - digsig_sts = validation.DIGSIG_ERROR_GPG_CMD_NOT_FOUND - else: - digsig_sts = gpg_obj.validate(downloaded_file, digsig_file, PasswordObj) - if digsig_sts != validation.DIGSIG_ERROR_NONE: - if digsig_sts in (validation.DIGSIG_ERROR_INCORRECT_PASSWORD, validation.DIGSIG_ERROR_FILE_NOT_FOUND): - clean_exit(1) + gpg_obj = validation.GPG_Verification() + digsig_sts, error_str = gpg_obj.validate(downloaded_file, digsig_file) - elif digsig_sts == validation.DIGSIG_ERROR_DIGITAL_SIGN_NOT_FOUND: - if not digital_signature_fail_confirmation("Digital signature file not found or failed to download. Unable to validate the installer file."): + if digsig_sts != ERROR_SUCCESS: + if digsig_sts in (ERROR_UNABLE_TO_RECV_KEYS, ERROR_DIGITAL_SIGN_NOT_FOUND, ERROR_DIGITAL_SIGN_BAD): + if not digital_signature_fail_confirmation(error_str): clean_exit(1) - - elif digsig_sts == validation.DIGSIG_ERROR_GPG_CMD_NOT_FOUND: - if not digital_signature_fail_confirmation("GPG command not found. Unable to validate the installer file."): - clean_exit(1) - - elif digsig_sts in (validation.DIGSIG_ERROR_DIGITAL_SIGN_BAD, validation.DIGSIG_ERROR_UNABLE_TO_RECV_KEYS): - if not digital_signature_fail_confirmation("File does not match its digital signature. File may have been corrupted or altered"): - clean_exit(1) - else: - log.error("Failed to validate digital signature. Unknow error: %s"%digsig_sts) + log.error(error_str) clean_exit(1) + CURRENT_WORKING_DIR = os.getcwd() os.chdir(PATH_TO_DOWNLOAD_INSTALLER) |