diff options
1465 files changed, 2753 insertions, 2696 deletions
diff --git a/Makefile.in b/Makefile.in index 8972d5cca..fefc02d61 100644 --- a/Makefile.in +++ b/Makefile.in @@ -695,7 +695,6 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ prnt/ps/hp-designjet_4520ps-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp1514n-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2500-ps.ppd.gz \ - prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_m9050_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_4200-ps.ppd.gz \ @@ -821,7 +820,6 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ prnt/ps/hp-designjet_4520mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp1518ni-ps.ppd.gz \ prnt/ps/hp-laserjet_2410-ps.ppd.gz \ - prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz \ prnt/ps/hp-mopier_240-ps.ppd.gz \ prnt/ps/hp-laserjet_6p-ps.ppd.gz \ prnt/ps/hp-laserjet_1200-ps.ppd.gz \ @@ -882,6 +880,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-deskjet_f4100_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_a630_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_690c-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_p1606dn-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_5600_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_4105-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz \ @@ -895,6 +894,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-deskjet_5551-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4v-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_935c-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3650-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_3500-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_r60-hpijs.ppd.gz \ @@ -976,9 +976,11 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-laserjet_9040-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_9800-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3810-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_150_mobile_l511-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_1200c-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3500-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c6200_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_p1566-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p4014n-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3870-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz \ @@ -1057,6 +1059,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-officejet_r80xi-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_995c-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_d4300_series-hpijs.ppd.gz \ + ppd/hpijs/hp-photosmart_d110_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_692-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_pro_k8600-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_1215-hpijs.ppd.gz \ @@ -1075,6 +1078,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-deskjet_5100-hpijs.ppd.gz \ ppd/hpijs/hp-psc_780xi-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_330-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1300n-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz \ @@ -1189,6 +1193,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-laserjet_p2014n-hpijs-zxs.ppd.gz \ ppd/hpijs/hp-officejet_5100_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_6980_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_p1102-hpijs.ppd.gz \ ppd/hpijs/hp-business_inkjet_2200-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p4515x-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_pro_k5400-hpijs.ppd.gz \ @@ -1229,12 +1234,15 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-laserjet_5200lx-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_7100_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_2600_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_5800-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1022-hpijs-zjs.ppd.gz \ + ppd/hpijs/hp-officejet_4400_k410-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_670c-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_670-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_4000_k210-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_6500_e709n-hpijs.ppd.gz \ ppd/hpijs/hp-psc_2100_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c6100_series-hpijs.ppd.gz \ @@ -1275,6 +1283,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1320n-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_5900_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_400-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_832c-hpijs.ppd.gz \ @@ -1783,6 +1792,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpcups/hp-laserjet_m4349_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m5025_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m5035_mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m9040_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m9050_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m9059_mfp-pcl3.ppd.gz \ @@ -1827,14 +1837,23 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpcups/hp-laserjet_p4515tn.ppd.gz \ ppd/hpcups/hp-laserjet_p4515xm.ppd.gz \ ppd/hpcups/hp-laserjet_p4515x.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz \ ppd/hpcups/hp-mopier_240-pcl3.ppd.gz \ ppd/hpcups/hp-mopier_320-pcl3.ppd.gz \ + ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz \ + ppd/hpcups/hp-officejet_4000_k210.ppd.gz \ ppd/hpcups/hp-officejet_4100_series.ppd.gz \ ppd/hpcups/hp-officejet_4105.ppd.gz \ ppd/hpcups/hp-officejet_4115_series.ppd.gz \ ppd/hpcups/hp-officejet_4200_series.ppd.gz \ ppd/hpcups/hp-officejet_4255.ppd.gz \ ppd/hpcups/hp-officejet_4300_series.ppd.gz \ + ppd/hpcups/hp-officejet_4400_k410.ppd.gz \ ppd/hpcups/hp-officejet_4500_g510a-f.ppd.gz \ ppd/hpcups/hp-officejet_4500_g510g-m.ppd.gz \ ppd/hpcups/hp-officejet_5100_series.ppd.gz \ @@ -1994,6 +2013,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpcups/hp-photosmart_c7100_series.ppd.gz \ ppd/hpcups/hp-photosmart_c7200_series.ppd.gz \ ppd/hpcups/hp-photosmart_c8100_series.ppd.gz \ + ppd/hpcups/hp-photosmart_d110_series.ppd.gz \ ppd/hpcups/hp-photosmart_d5060_series.ppd.gz \ ppd/hpcups/hp-photosmart_d5100_series.ppd.gz \ ppd/hpcups/hp-photosmart_d5300_series.ppd.gz \ @@ -2356,6 +2376,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_f4100_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_a630_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_690c-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_p1606dn-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_5600_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_4105-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz \ @@ -2369,6 +2390,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_5551-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4v-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_935c-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3650-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_3500-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_r60-hpijs.ppd.gz \ @@ -2450,9 +2472,11 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_9040-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_9800-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3810-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_150_mobile_l511-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_1200c-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3500-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c6200_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_p1566-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p4014n-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3870-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz \ @@ -2531,6 +2555,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_r80xi-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_995c-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_d4300_series-hpijs.ppd.gz \ + ppd/hpijs/hp-photosmart_d110_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_692-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_pro_k8600-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_1215-hpijs.ppd.gz \ @@ -2549,6 +2574,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_5100-hpijs.ppd.gz \ ppd/hpijs/hp-psc_780xi-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_330-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1300n-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz \ @@ -2663,6 +2689,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_p2014n-hpijs-zxs.ppd.gz \ ppd/hpijs/hp-officejet_5100_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_6980_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_p1102-hpijs.ppd.gz \ ppd/hpijs/hp-business_inkjet_2200-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p4515x-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_pro_k5400-hpijs.ppd.gz \ @@ -2703,12 +2730,15 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_5200lx-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_7100_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_2600_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_5800-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1022-hpijs-zjs.ppd.gz \ + ppd/hpijs/hp-officejet_4400_k410-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_670c-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_670-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_4000_k210-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_6500_e709n-hpijs.ppd.gz \ ppd/hpijs/hp-psc_2100_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c6100_series-hpijs.ppd.gz \ @@ -2749,6 +2779,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1320n-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_5900_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_400-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_832c-hpijs.ppd.gz \ @@ -2962,7 +2993,6 @@ foomatic_ps_printers = \ prnt/ps/hp-designjet_4520ps-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp1514n-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2500-ps.ppd.gz \ - prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_m9050_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_4200-ps.ppd.gz \ @@ -3088,7 +3118,6 @@ foomatic_ps_printers = \ prnt/ps/hp-designjet_4520mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp1518ni-ps.ppd.gz \ prnt/ps/hp-laserjet_2410-ps.ppd.gz \ - prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz \ prnt/ps/hp-mopier_240-ps.ppd.gz \ prnt/ps/hp-laserjet_6p-ps.ppd.gz \ prnt/ps/hp-laserjet_1200-ps.ppd.gz \ @@ -3460,6 +3489,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-laserjet_m4349_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m5025_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m5035_mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m9040_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m9050_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m9059_mfp-pcl3.ppd.gz \ @@ -3504,14 +3534,23 @@ cups_ppd_printers = \ ppd/hpcups/hp-laserjet_p4515tn.ppd.gz \ ppd/hpcups/hp-laserjet_p4515xm.ppd.gz \ ppd/hpcups/hp-laserjet_p4515x.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz \ ppd/hpcups/hp-mopier_240-pcl3.ppd.gz \ ppd/hpcups/hp-mopier_320-pcl3.ppd.gz \ + ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz \ + ppd/hpcups/hp-officejet_4000_k210.ppd.gz \ ppd/hpcups/hp-officejet_4100_series.ppd.gz \ ppd/hpcups/hp-officejet_4105.ppd.gz \ ppd/hpcups/hp-officejet_4115_series.ppd.gz \ ppd/hpcups/hp-officejet_4200_series.ppd.gz \ ppd/hpcups/hp-officejet_4255.ppd.gz \ ppd/hpcups/hp-officejet_4300_series.ppd.gz \ + ppd/hpcups/hp-officejet_4400_k410.ppd.gz \ ppd/hpcups/hp-officejet_4500_g510a-f.ppd.gz \ ppd/hpcups/hp-officejet_4500_g510g-m.ppd.gz \ ppd/hpcups/hp-officejet_5100_series.ppd.gz \ @@ -3671,6 +3710,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-photosmart_c7100_series.ppd.gz \ ppd/hpcups/hp-photosmart_c7200_series.ppd.gz \ ppd/hpcups/hp-photosmart_c8100_series.ppd.gz \ + ppd/hpcups/hp-photosmart_d110_series.ppd.gz \ ppd/hpcups/hp-photosmart_d5060_series.ppd.gz \ ppd/hpcups/hp-photosmart_d5100_series.ppd.gz \ ppd/hpcups/hp-photosmart_d5300_series.ppd.gz \ diff --git a/base/codes.py b/base/codes.py index 47f020ecd..e70754285 100644 --- a/base/codes.py +++ b/base/codes.py @@ -153,6 +153,9 @@ STATUS_PRINTER_MEDIA_TYPE_MISMATCH = 1042 STATUS_PRINTER_CUSTOM_MEDIA_MISMATCH = 1043 STATUS_PRINTER_PEN_CLEANING = 1044 STATUS_PRINTER_PEN_CHECKING = 1045 +STATUS_PRINTER_POWER_SAVE = 1046 +STATUS_PRINTER_CARTRIDGE_WRONG = 1047 +STATUS_PRINTER_CARTRIDGE_MISSING = 1048 # derived codes # set to AGENT_TYPE + base (base: 1500=ink, 1600=laser ) @@ -196,6 +199,11 @@ EVENT_START_SCAN_JOB = 2000 EVENT_END_SCAN_JOB = 2001 EVENT_SCANNER_FAIL = 2002 EVENT_SCAN_FAILED_MISSING_PLUGIN = 2003 +EVENT_SCAN_ADF_LOADED = 2004 +EVENT_SCAN_TO_DESTINATION_NOTSET = 2005 +EVENT_SCAN_WAITING_FOR_PC = 2006 +EVENT_SCAN_ADF_JAM = 2007 +EVENT_SCAN_ADF_DOOR_OPEN = 2008 #end # fax @@ -205,6 +213,12 @@ EVENT_FAX_JOB_FAIL = 3002 EVENT_FAX_JOB_CANCELED = 3003 STATUS_FAX_TX_ACTIVE = 3004 STATUS_FAX_RX_ACTIVE = 3005 +EVENT_FAX_DIALING = 3006 +EVENT_FAX_CONNECTING = 3007 +EVENT_FAX_SEND_ERROR = 3008 +EVENT_FAX_ERROR_STORAGE_FULL = 3009 +EVENT_FAX_RECV_ERROR = 3010 +EVENT_FAX_BLOCKING = 3011 #end # copy @@ -326,6 +340,7 @@ STATUS_TO_ERROR_STATE_MAP = { STATUS_PRINTER_IDLE : ERROR_STATE_CLEAR, STATUS_PRINTER_BUSY : ERROR_STATE_BUSY, + STATUS_PRINTER_POWER_SAVE : ERROR_STATE_CLEAR, STATUS_PRINTER_PRINTING : ERROR_STATE_PRINTING, STATUS_PRINTER_TURNING_OFF : ERROR_STATE_BUSY, STATUS_PRINTER_REPORT_PRINTING : ERROR_STATE_PRINTING, @@ -379,6 +394,8 @@ STATUS_TO_ERROR_STATE_MAP = { STATUS_PRINTER_SERVICE_REQUEST : ERROR_STATE_ERROR, STATUS_PRINTER_FUSER_ERROR : ERROR_STATE_ERROR, STATUS_DEVICE_UNSUPPORTED : ERROR_STATE_ERROR, + STATUS_PRINTER_CARTRIDGE_MISSING : ERROR_STATE_ERROR, + STATUS_PRINTER_CARTRIDGE_WRONG : ERROR_STATE_ERROR, # The following block are EVENTs because they are only # recieved as events from hpmud, hp backend, etc. # i.e., a device does not produce status codes in this range @@ -402,13 +419,24 @@ STATUS_TO_ERROR_STATE_MAP = { EVENT_START_SCAN_JOB : ERROR_STATE_SCANNING, EVENT_END_SCAN_JOB : ERROR_STATE_OK, EVENT_SCANNER_FAIL : ERROR_STATE_ERROR, + EVENT_SCAN_ADF_DOOR_OPEN : ERROR_STATE_ERROR, + EVENT_SCAN_ADF_JAM : ERROR_STATE_ERROR, + EVENT_SCAN_WAITING_FOR_PC : ERROR_STATE_SCANNING, + EVENT_SCAN_TO_DESTINATION_NOTSET : ERROR_STATE_ERROR, + EVENT_SCAN_ADF_LOADED : ERROR_STATE_OK, # Fax + EVENT_FAX_DIALING : ERROR_STATE_BUSY, + EVENT_FAX_CONNECTING : ERROR_STATE_BUSY, EVENT_START_FAX_JOB : ERROR_STATE_FAXING, + STATUS_FAX_TX_ACTIVE : ERROR_STATE_FAXING, + STATUS_FAX_RX_ACTIVE : ERROR_STATE_FAXING, EVENT_END_FAX_JOB : ERROR_STATE_OK, EVENT_FAX_JOB_FAIL : ERROR_STATE_ERROR, EVENT_FAX_JOB_CANCELED : ERROR_STATE_ERROR, - STATUS_FAX_TX_ACTIVE : ERROR_STATE_FAXING, - STATUS_FAX_RX_ACTIVE : ERROR_STATE_FAXING, + EVENT_FAX_SEND_ERROR : ERROR_STATE_ERROR, + EVENT_FAX_RECV_ERROR : ERROR_STATE_ERROR, + EVENT_FAX_ERROR_STORAGE_FULL : ERROR_STATE_WARNING, + EVENT_FAX_BLOCKING : ERROR_STATE_ERROR, # Copy EVENT_START_COPY_JOB : ERROR_STATE_COPYING, EVENT_END_COPY_JOB : ERROR_STATE_OK, @@ -631,6 +659,7 @@ FAX_TYPE_BLACK_SEND_LATE_OPEN = 2 # older models FAX_TYPE_BLACK_AND_COLOR_SEND = 3 # future/OZ FAX_TYPE_SOAP = 4 FAX_TYPE_MARVELL = 5 +FAX_TYPE_LEDM = 6 # pcard-types PCARD_TYPE_NONE = 0 @@ -647,12 +676,24 @@ SCAN_TYPE_SOAP = 3 SCAN_TYPE_MARVEL = 4 SCAN_TYPE_SOAP2 = 5 SCAN_TYPE_SCL_DUPLEX = 6 +SCAN_TYPE_LEDM = 7 # scan-styles SCAN_STYLE_NONE = 0 SCAN_STYLE_FLATBED = 1 SCAN_STYLE_SCROLLFED = 2 +# scan-src +SCAN_SRC_NA = 0 +SCAN_SRC_ADF = 1 +SCAN_SRC_FLATBED = 2 +SCAN_SRC_BOTH = 3 + +# scan-color +SCAN_COLOR_NA = 0 +SCAN_COLOR_MONO = 1 +SCAN_COLOR_COLOR = 2 + # copy-types COPY_TYPE_NOT_SUPPORTED = -1 COPY_TYPE_NONE = 0 diff --git a/base/device.py b/base/device.py index 24e97efcf..8192a8d1e 100644 --- a/base/device.py +++ b/base/device.py @@ -100,19 +100,19 @@ class Event(object): username=prop.username, job_id=0, title='', timedate=0): - self.device_uri = unicode(utils.xrstrip(device_uri, '\x00'))[:64].encode('utf-8') - self.printer_name = unicode(utils.xrstrip(printer_name, '\x00'))[:64].encode('utf-8') + self.device_uri = unicode(utils.xrstrip(device_uri, '\x00'))[:128].encode('utf-8') + self.printer_name = unicode(utils.xrstrip(printer_name, '\x00'))[:128].encode('utf-8') self.event_code = int(event_code) self.username = unicode(utils.xrstrip(username, '\x00'))[:32].encode('utf-8') self.job_id = int(job_id) - self.title = unicode(utils.xrstrip(title, '\x00'))[:64].encode('utf-8') + self.title = unicode(utils.xrstrip(title, '\x00'))[:128].encode('utf-8') if timedate: self.timedate = float(timedate) else: self.timedate = time.time() - self.pipe_fmt = "64s64sI32sI64sf" + self.pipe_fmt = "80s80sI32sI80sf" self.dbus_fmt = "ssisisd" @@ -168,7 +168,7 @@ class FaxEvent(Event): def __init__(self, temp_file, event): Event.__init__(self, *event.as_tuple()) self.temp_file = temp_file - self.pipe_fmt = "64s64sI32sI64sfs" + self.pipe_fmt = "80s80sI32sI80sfs" self.dbus_fmt = "ssisisfs" @@ -193,7 +193,7 @@ class DeviceIOEvent(Event): def __init__(self, bytes_written, event): Event.__init__(self, *event.as_tuple()) self.bytes_written = bytes_written - self.pipe_fmt = "64s64sI32sI64sfI" + self.pipe_fmt = "80s80sI32sI80sfI" self.dbus_fmt = "ssisisfi" diff --git a/base/models.py b/base/models.py index 1c5f987b8..5a83c26b2 100644 --- a/base/models.py +++ b/base/models.py @@ -290,6 +290,8 @@ class ModelData: 'r-type' : TYPE_INT, 'scan-style' : TYPE_INT, 'scan-type' : TYPE_INT, + 'scan-src' : TYPE_INT, + 'scan-color' : TYPE_INT, #'scan-duplex' : TYPE_BOOL, 'status-battery-check' : TYPE_INT, 'status-dynamic-counters' : TYPE_INT, diff --git a/base/pkit.py b/base/pkit.py index 7baac5b07..0015723d4 100644 --- a/base/pkit.py +++ b/base/pkit.py @@ -456,11 +456,15 @@ def run_plugin_command(required=True, plugin_reason=PLUGIN_REASON_NONE): su_sudo = "%s" need_sudo = False + password_f = None if need_sudo: su_sudo = utils.su_sudo() - if su_sudo is None: - log.error("Unable to find a suitable sudo command to run 'hp-plugin'") - return (False, False) + if su_sudo is "su": + su_sudo = 'su -c "%s"' + password_f = "get_password_ui" + if su_sudo is None: + log.error("Unable to find a suitable sudo command to run 'hp-plugin'") + return (False, False) req = '--required' if not required: @@ -472,8 +476,10 @@ def run_plugin_command(required=True, plugin_reason=PLUGIN_REASON_NONE): cmd = su_sudo % ("python ./plugin.py -u %s --reason %s" % (req, plugin_reason)) log.debug("%s" % cmd) - status, output = utils.run(cmd, log_output=True, password_func=None, timeout=1) - + if password_f is not None: + status, output = utils.run(cmd, log_output=True, password_func=password_f, timeout=1) + else: + status, output = utils.run(cmd, log_output=True, password_func=None, timeout=1) return (status == 0, True) diff --git a/base/status.py b/base/status.py index 5efe32229..dbbc56316 100644 --- a/base/status.py +++ b/base/status.py @@ -1456,6 +1456,7 @@ def StatusType8(dev): # LaserJet PJL (B&W only) element_type10_xlate = { 'ink' : AGENT_KIND_SUPPLY, 'printhead' : AGENT_KIND_HEAD, + 'toner' : AGENT_KIND_TONER_CARTRIDGE, } pen_type10_xlate = { 'pK' : AGENT_TYPE_PG, @@ -1477,155 +1478,3 @@ pen_health10_xlate = { 'ok' : AGENT_HEALTH_OK, 'missing' : AGENT_HEALTH_MISINSTALLED, } -def StatusType10FetchUrl(dev, url): - if dev.is_local: -# data_fp = cStringIO.StringIO() -# dev.getEWSUrl(url, data_fp) -# data = data_fp.getvalue() - data = parseStatus(dev.deviceID) - log.error("status %s" % data) - - else: - if dev.zc: - status, ip = hpmudext.get_zc_ip_address(dev.zc) - if status != hpmudext.HPMUD_R_OK: - log.error("unable to get IP address of mDNS configured device") - return None - else: - ip = dev.host - - # Get the agent status XML - addr = "http://%s:8080%s" % (ip, url) - feed = urllib.urlopen(addr) - data = feed.read() - feed.close() - - return data - - -def StatusType10(dev): # Low End Data Model - status_block = { 'revision' : STATUS_REV_UNKNOWN, - 'agents' : [], - 'top-door' : TOP_DOOR_NOT_PRESENT, - 'supply-door' : TOP_DOOR_NOT_PRESENT, - 'duplexer' : DUPLEXER_NOT_PRESENT, - 'photo-tray' : PHOTO_TRAY_NOT_PRESENT, - 'in-tray1' : IN_TRAY_NOT_PRESENT, - 'in-tray2' : IN_TRAY_NOT_PRESENT, - 'media-path' : MEDIA_PATH_NOT_PRESENT, - 'status-code' : STATUS_PRINTER_IDLE, - } - - if not etree_loaded: - log.error("cannot get status for printer...please load ElementTree module") - return status_block - - # Get the dynamic consumables configuration - data = StatusType10FetchUrl(dev, "/DevMgmt/ConsumableConfigDyn.xml") - if not data: - log.error("unable to fetch pen status") - return status_block - data = data.replace("ccdyn:", "").replace("dd:", "") - - # Parse the agent status XML - agents = [] - tree = ElementTree.XML(data) - elements = tree.findall("ConsumableInfo") - for e in elements: -# ElementTree.dump(e) - health = AGENT_HEALTH_OK - ink_level = 0 - type = e.find("ConsumableTypeEnum").text - state = e.find("ConsumableLifeState/ConsumableState").text - - # level - if type == "ink": - ink_type = e.find("ConsumableLabelCode").text - if state != "missing": - try: - ink_level = int(e.find("ConsumablePercentageLevelRemaining").text) - except: - ink_level = 0 - else: - ink_type = '' - if state == "ok": - ink_level = 100 - - log.debug("type '%s' state '%s' ink_type '%s' ink_level %d" % (type, state, ink_type, ink_level)) - - entry = { 'kind' : element_type10_xlate.get(type, AGENT_KIND_NONE), - 'type' : pen_type10_xlate.get(ink_type, AGENT_TYPE_NONE), - 'health' : pen_health10_xlate.get(state, AGENT_HEALTH_OK), - 'level' : int(ink_level), - 'level-trigger' : pen_level10_xlate.get(state, AGENT_LEVEL_TRIGGER_SUFFICIENT_0) - } - - log.debug("%s" % entry) - agents.append(entry) - - status_block['agents'] = agents - - # Get the media handling configuration - data = StatusType10FetchUrl(dev, "/DevMgmt/MediaHandlingDyn.xml") - if not data: - log.error("unable to fetch media handling status") - return status_block - data = data.replace("mhdyn:", "").replace("dd:", "") - - # Parse the media handling XML - tree = ElementTree.XML(data) - elements = tree.findall("InputTray") - for e in elements: -# ElementTree.dump(e) - bin_name = e.find("InputBin").text - if bin_name == "Tray1": - status_block['in-tray1'] = IN_TRAY_PRESENT - elif bin_name == "Tray2": - status_block['in-tray2'] = IN_TRAY_PRESENT - elif bin_name == "PhotoTray": - status_block['photo-tray'] = PHOTO_TRAY_ENGAGED - else: - log.error("found invalid bin name '%s'" % bin_name) - - elements = tree.findall("Accessories/MediaHandlingDeviceFunctionType") - for e in elements: -# ElementTree.dump(e) - if e.text == "autoDuplexor": - status_block['duplexer'] = DUPLEXER_DOOR_CLOSED - else: - log.error("found invalid media accessory '%s'" % e.text) - - # Get the product status - data = StatusType10FetchUrl(dev, "/DevMgmt/ProductStatusDyn.xml") - if not data: - log.error("unable to fetch product status") - return status_block - data = data.replace("psdyn:", "").replace("locid:", "") - data = data.replace("pscat:", "").replace("dd:", "").replace("ad:", "") - - # Parse the product status XML - tree = ElementTree.XML(data) - elements = tree.findall("Status/StatusCategory") - for e in elements: -# ElementTree.dump(e) - if e.text == "closeDoorOrCover": - status_block['top-door'] = TOP_DOOR_OPEN - status_block['supply-door'] = TOP_DOOR_OPEN - elif e.text == "shuttingDown": - status_block['status-code'] = STATUS_PRINTER_TURNING_OFF - elif e.text == "cancelJob": - status_block['status-code'] = STATUS_PRINTER_CANCELING - elif e.text == "trayEmptyOrOpen": - status_block['status-code'] = STATUS_PRINTER_OUT_OF_PAPER - elif e.text == "jamInPrinter": - status_block['status-code'] = STATUS_PRINTER_MEDIA_JAM - elif e.text == "hardError": - status_block['status-code'] = STATUS_PRINTER_HARD_ERROR - elif e.text == "outputBinFull": - status_block['status-code'] = STATUS_PRINTER_OUTPUT_BIN_FULL - elif e.text == "unexpectedSizeInTray": - status_block['status-code'] = STATUS_PRINTER_MEDIA_SIZE_MISMATCH - elif e.text == "insertOrCloseTray2": - status_block['status-code'] = STATUS_PRINTER_TRAY_2_MISSING - - return status_block diff --git a/base/strings.py b/base/strings.py index 4a6c6aa80..77b63344a 100644 --- a/base/strings.py +++ b/base/strings.py @@ -96,6 +96,9 @@ class StringTable: '1043' : (self.__tr('Custom media mismatch'), '%try_again%'), '1044' : (self.__tr('Pen cleaning in progress'), ''), '1045' : (self.__tr('Pen checking in progress'), ''), + '1046' : (self.__tr('In power save mode'), ''), + '1047' : (self.__tr('Incorrect cartridge'), ''), + '1048' : (self.__tr('Missing cartridge'), ''), '1501' : (self.__tr('Black cartridge is low on ink'), ''), '1502' : (self.__tr('Tri-color cartridge is low on ink'), ''), '1503' : (self.__tr('Photo cartridge is low on ink'), ''), @@ -124,12 +127,23 @@ class StringTable: '2001' : (self.__tr('Scan job completed'), ''), '2002' : (self.__tr('Scan job failed'), '%try_again%'), '2003' : (self.__tr("Scan job failed - Required plug-in not found"), '%502%'), + '2004' : (self.__tr('Scanner automatic document feeder is loaded'), ''), + '2005' : (self.__tr('Scan to a destination is not specified'), ''), + '2006' : (self.__tr('Scanner is waiting for PC'), ''), + '2007' : (self.__tr('Scanner automatic document feeder jam'), ''), + '2008' : (self.__tr('Scanner automatic document feeder door opened'), ''), '3000' : (self.__tr('Fax job started'), ''), '3001' : (self.__tr('Fax job complete'), ''), '3002' : (self.__tr('Fax job failed'), '%try_again%'), '3003' : (self.__tr('Fax job canceled'), ''), '3004' : (self.__tr('Fax send job continuing'), ''), '3005' : (self.__tr('Fax receive job continuing'), ''), + '3006' : (self.__tr('Fax dialing'), ''), + '3007' : (self.__tr('Fax connecting'), ''), + '3008' : (self.__tr('Fax send error'), ''), + '3009' : (self.__tr('Fax error storage full'), ''), + '3010' : (self.__tr('Fax receive error'), ''), + '3011' : (self.__tr('Fax blocking'), ''), '4000' : (self.__tr('Copy job started'), ''), '4001' : (self.__tr('Copy job complete'), ''), '4002' : (self.__tr('Copy job failed'), '%try_again%'), diff --git a/base/utils.py b/base/utils.py index e13893fce..9a0fa4636 100644 --- a/base/utils.py +++ b/base/utils.py @@ -1005,6 +1005,20 @@ def getEndian(): def get_password(): return getpass.getpass("Enter password: ") +def get_password_ui(): + fp = open("/etc/hp/hplip.conf", "r") + qt = "qt3" + for line in fp: + if string.find(line, "qt4") is not -1 and string.find(line, "yes") is not -1: + qt = "qt4" + fp.close() + if qt is "qt4": + from ui4.setupdialog import showPasswordUI + username, password = showPasswordUI("Your printer requires to install HP proprietary plugin\nPlease enter root/superuser password to continue") + if qt is "qt3": + from ui.setupform import showPasswordUI + username, password = showPasswordUI("Your priter requires to install HP proprietary plugin\nPlease enter root/superuser password to continue") + return password def run(cmd, log_output=True, password_func=get_password, timeout=1): output = cStringIO.StringIO() @@ -1026,7 +1040,10 @@ def run(cmd, log_output=True, password_func=get_password, timeout=1): if i == 0: # Password: if password_func is not None: - child.sendline(password_func()) + if password_func == "get_password_ui": + child.sendline(get_password_ui()) + else: + child.sendline(password_func()) else: child.sendline(get_password()) @@ -1578,6 +1595,9 @@ def su_sudo(): elif which('gksu'): su_sudo_str = 'gksu "%s"' + + elif which('su'): + su_sudo_str = 'su' return su_sudo_str @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for HP Linux Imaging and Printing 3.10.2. +# Generated by GNU Autoconf 2.63 for HP Linux Imaging and Printing 3.10.5. # -# Report bugs to <3.10.2rc1.9>. +# Report bugs to <3.10.4.16>. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -750,9 +750,9 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='HP Linux Imaging and Printing' PACKAGE_TARNAME='hplip' -PACKAGE_VERSION='3.10.2' -PACKAGE_STRING='HP Linux Imaging and Printing 3.10.2' -PACKAGE_BUGREPORT='3.10.2rc1.9' +PACKAGE_VERSION='3.10.5' +PACKAGE_STRING='HP Linux Imaging and Printing 3.10.5' +PACKAGE_BUGREPORT='3.10.4.16' # Factoring default headers for most tests. ac_includes_default="\ @@ -920,12 +920,6 @@ ac_ct_F77 FFLAGS F77 CXXCPP -am__fastdepCXX_FALSE -am__fastdepCXX_TRUE -CXXDEPMODE -ac_ct_CXX -CXXFLAGS -CXX CPP NMEDIT DSYMUTIL @@ -936,9 +930,23 @@ LN_S EGREP GREP SED +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +ac_ct_CC +CFLAGS +CC +am__fastdepCXX_FALSE +am__fastdepCXX_TRUE +CXXDEPMODE AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -947,19 +955,11 @@ am__include DEPDIR OBJEXT EXEEXT -ac_ct_CC +ac_ct_CXX CPPFLAGS LDFLAGS -CFLAGS -CC -host_os -host_vendor -host_cpu -host -build_os -build_vendor -build_cpu -build +CXXFLAGS +CXX am__untar am__tar AMTAR @@ -1024,9 +1024,9 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_static +enable_dependency_tracking enable_shared enable_fast_install -enable_dependency_tracking with_gnu_ld enable_libtool_lock with_pic @@ -1067,15 +1067,15 @@ enable_policykit ac_precious_vars='build_alias host_alias target_alias -CC -CFLAGS +CXX +CXXFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CXX -CXXFLAGS CCC +CC +CFLAGS +CPP CXXCPP F77 FFLAGS @@ -1636,7 +1636,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.10.2 to adapt to many kinds of systems. +\`configure' configures HP Linux Imaging and Printing 3.10.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1706,7 +1706,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.10.2:";; + short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.10.5:";; esac cat <<\_ACEOF @@ -1715,11 +1715,11 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-static[=PKGS] build static libraries [default=no] + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors --enable-shared[=PKGS] build shared libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors --disable-libtool-lock avoid locking (might break parallel builds) --enable-doc-build enable documentation build (default=yes) --enable-hpijs-only-build enable hpijs only build (default=yes) @@ -1772,16 +1772,16 @@ Optional Packages: default=datadir/cups/drv/hp Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags + CXX C++ compiler command + CXXFLAGS C++ compiler flags LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a nonstandard directory <lib dir> LIBS libraries to pass to the linker, e.g. -l<library> CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> + CC C compiler command + CFLAGS C compiler flags CPP C preprocessor - CXX C++ compiler command - CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor F77 Fortran 77 compiler command FFLAGS Fortran 77 compiler flags @@ -1795,7 +1795,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.10.2rc1.9>. +Report bugs to <3.10.4.16>. _ACEOF ac_status=$? fi @@ -1858,7 +1858,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HP Linux Imaging and Printing configure 3.10.2 +HP Linux Imaging and Printing configure 3.10.5 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1872,7 +1872,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.10.2, which was +It was created by HP Linux Imaging and Printing $as_me 3.10.5, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2722,7 +2722,7 @@ fi # Define the identity of the package. PACKAGE='hplip' - VERSION='3.10.2' + VERSION='3.10.5' cat >>confdefs.h <<_ACEOF @@ -2787,137 +2787,629 @@ fi -# Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then - enableval=$enable_shared; p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac + +# Checks for programs. +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CXX+set}" = set; then + $as_echo_n "(cached) " >&6 else - enable_shared=yes + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { $as_echo "$as_me:$LINENO: result: $CXX" >&5 +$as_echo "$CXX" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -# Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then - enableval=$enable_fast_install; p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes + test -n "$CXX" && break + done +fi +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CXX" && break +done + + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi +fi + + fi +fi +# Provide some information about the compiler. +$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +{ $as_echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5 +$as_echo_n "checking for C++ compiler default output file name... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { (ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi - done - IFS="$lt_save_ifs" - ;; - esac + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + else - enable_fast_install=yes + ac_file='' fi +{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +if test -z "$ac_file"; then + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: C++ compiler cannot create executables +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: C++ compiler cannot create executables +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } +fi -{ $as_echo "$as_me:$LINENO: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then +ac_exeext=$ac_cv_exeext + +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5 +$as_echo_n "checking whether the C++ compiler works... " >&6; } +# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +# If not cross compiling, check that we can run a simple program. +if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot run C++ compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot run C++ compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + fi + fi +fi +{ $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done +else + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } +fi + +rm -f conftest$ac_cv_exeext +{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if test "${ac_cv_objext+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -$as_echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } +fi -{ $as_echo "$as_me:$LINENO: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then $as_echo_n "(cached) " >&6 else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -$as_echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; +{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } +if test "${ac_cv_prog_cxx_g+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + CXXFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -2980,6 +3472,134 @@ else fi + +depcc="$CXX" am_compiler_list= + +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CXX_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CXX_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= + am__fastdepCXX_FALSE='#' +else + am__fastdepCXX_TRUE='#' + am__fastdepCXX_FALSE= +fi + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3324,256 +3944,6 @@ $as_echo "$ac_try_echo") >&5 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - -# The possible output files: -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" - -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles - -if { (ac_try="$ac_link_default" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; - * ) - break;; - esac -done -test "$ac_cv_exeext" = no && ac_cv_exeext= - -else - ac_file='' -fi - -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -if test -z "$ac_file"; then - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } -fi - -ac_exeext=$ac_cv_exeext - -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } - fi - fi -fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac -done -else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -fi - -rm -f conftest$ac_cv_exeext -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -fi - -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } if test "${ac_cv_c_compiler_gnu+set}" = set; then @@ -4040,6 +4410,230 @@ else fi +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if test "${ac_cv_path_install+set}" = set; then + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + +done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +# Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_shared=yes +fi + + +# Check whether --enable-fast-install was given. +if test "${enable_fast_install+set}" = set; then + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_fast_install=yes +fi + + +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} + { (exit 1); exit 1; }; } + +{ $as_echo "$as_me:$LINENO: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if test "${ac_cv_build+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +$as_echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:$LINENO: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if test "${ac_cv_host+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + { (exit 1); exit 1; }; } +fi + +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +$as_echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + { $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } if test "${lt_cv_path_SED+set}" = set; then @@ -4665,7 +5259,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4668 "configure"' > conftest.$ac_ext + echo '#line 5262 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5468,9 +6062,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## -------------------------- ## -## Report this to 3.10.2rc1.9 ## -## -------------------------- ## +## ------------------------ ## +## Report this to 3.10.4.16 ## +## ------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -5499,505 +6093,6 @@ fi done -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 -$as_echo "$CXX" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -depcc="$CXX" am_compiler_list= - -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - if test -n "$CXX" && ( test "X$CXX" != "Xno" && @@ -7770,11 +7865,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7773: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7868: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7777: \$? = $ac_status" >&5 + echo "$as_me:7872: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8060,11 +8155,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8063: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8158: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8067: \$? = $ac_status" >&5 + echo "$as_me:8162: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8164,11 +8259,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8167: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8262: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8171: \$? = $ac_status" >&5 + echo "$as_me:8266: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10566,7 +10661,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10569 "configure" +#line 10664 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10666,7 +10761,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10669 "configure" +#line 10764 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13075,11 +13170,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13078: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13173: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13082: \$? = $ac_status" >&5 + echo "$as_me:13177: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13179,11 +13274,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13182: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13277: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13186: \$? = $ac_status" >&5 + echo "$as_me:13281: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14764,11 +14859,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14767: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14862: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14771: \$? = $ac_status" >&5 + echo "$as_me:14866: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14868,11 +14963,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14871: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14966: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14875: \$? = $ac_status" >&5 + echo "$as_me:14970: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17085,11 +17180,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17088: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17183: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17092: \$? = $ac_status" >&5 + echo "$as_me:17187: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17375,11 +17470,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17378: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17473: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17382: \$? = $ac_status" >&5 + echo "$as_me:17477: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17479,11 +17574,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17482: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17577: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17486: \$? = $ac_status" >&5 + echo "$as_me:17581: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20167,1410 +20262,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' -# Checks for programs. -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 -$as_echo "$CXX" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -depcc="$CXX" am_compiler_list= - -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi - - -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } - -# Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <stdarg.h> -#include <stdio.h> -#include <sys/types.h> -#include <sys/stat.h> -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -depcc="$CC" am_compiler_list= - -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - -done -IFS=$as_save_IFS - -rm -rf conftest.one conftest.two conftest.dir - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - # Checks for required libraries, don't set global -lpthread, -lm, -ljpeg, ... here, set in Makefile. { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 $as_echo_n "checking for pthread_create in -lpthread... " >&6; } @@ -21989,9 +20680,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## -------------------------- ## -## Report this to 3.10.2rc1.9 ## -## -------------------------- ## +## ------------------------ ## +## Report this to 3.10.4.16 ## +## ------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -22144,9 +20835,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## -------------------------- ## -## Report this to 3.10.2rc1.9 ## -## -------------------------- ## +## ------------------------ ## +## Report this to 3.10.4.16 ## +## ------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -23874,9 +22565,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## -------------------------- ## -## Report this to 3.10.2rc1.9 ## -## -------------------------- ## +## ------------------------ ## +## Report this to 3.10.4.16 ## +## ------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -24030,9 +22721,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## -------------------------- ## -## Report this to 3.10.2rc1.9 ## -## -------------------------- ## +## ------------------------ ## +## Report this to 3.10.4.16 ## +## ------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -24189,9 +22880,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## -------------------------- ## -## Report this to 3.10.2rc1.9 ## -## -------------------------- ## +## ------------------------ ## +## Report this to 3.10.4.16 ## +## ------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -24420,9 +23111,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## -------------------------- ## -## Report this to 3.10.2rc1.9 ## -## -------------------------- ## +## ------------------------ ## +## Report this to 3.10.4.16 ## +## ------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -24648,9 +23339,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## -------------------------- ## -## Report this to 3.10.2rc1.9 ## -## -------------------------- ## +## ------------------------ ## +## Report this to 3.10.4.16 ## +## ------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -25029,9 +23720,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## -------------------------- ## -## Report this to 3.10.2rc1.9 ## -## -------------------------- ## +## ------------------------ ## +## Report this to 3.10.4.16 ## +## ------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -25695,20 +24386,6 @@ $as_echo "$as_me: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -26214,7 +24891,7 @@ exec 6>&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.10.2, which was +This file was extended by HP Linux Imaging and Printing $as_me 3.10.5, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26268,7 +24945,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -HP Linux Imaging and Printing config.status 3.10.2 +HP Linux Imaging and Printing config.status 3.10.5 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index b2bb24740..ca6888009 100755 --- a/configure.in +++ b/configure.in @@ -26,16 +26,16 @@ # 104 = no libdl #AC_PREREQ(2.59) -AC_INIT([HP Linux Imaging and Printing], [3.10.2], [3.10.2rc1.9], [hplip]) +AC_INIT([HP Linux Imaging and Printing], [3.10.5], [3.10.4.16], [hplip]) #AM_INIT_AUTOMAKE([1.9 foreign]) AM_INIT_AUTOMAKE AC_DISABLE_STATIC -AC_PROG_LIBTOOL # Checks for programs. AC_PROG_CXX AC_PROG_CC AC_PROG_INSTALL +AC_PROG_LIBTOOL # Checks for required libraries, don't set global -lpthread, -lm, -ljpeg, ... here, set in Makefile. AC_CHECK_LIB([pthread], [pthread_create], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libpthread support], 7)]) diff --git a/cups_drv.inc b/cups_drv.inc index 0038374cf..d235d87b7 100644 --- a/cups_drv.inc +++ b/cups_drv.inc @@ -348,6 +348,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-laserjet_m4349_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m5025_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m5035_mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m9040_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m9050_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m9059_mfp-pcl3.ppd.gz \ @@ -392,14 +393,23 @@ cups_ppd_printers = \ ppd/hpcups/hp-laserjet_p4515tn.ppd.gz \ ppd/hpcups/hp-laserjet_p4515xm.ppd.gz \ ppd/hpcups/hp-laserjet_p4515x.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz \ ppd/hpcups/hp-mopier_240-pcl3.ppd.gz \ ppd/hpcups/hp-mopier_320-pcl3.ppd.gz \ + ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz \ + ppd/hpcups/hp-officejet_4000_k210.ppd.gz \ ppd/hpcups/hp-officejet_4100_series.ppd.gz \ ppd/hpcups/hp-officejet_4105.ppd.gz \ ppd/hpcups/hp-officejet_4115_series.ppd.gz \ ppd/hpcups/hp-officejet_4200_series.ppd.gz \ ppd/hpcups/hp-officejet_4255.ppd.gz \ ppd/hpcups/hp-officejet_4300_series.ppd.gz \ + ppd/hpcups/hp-officejet_4400_k410.ppd.gz \ ppd/hpcups/hp-officejet_4500_g510a-f.ppd.gz \ ppd/hpcups/hp-officejet_4500_g510g-m.ppd.gz \ ppd/hpcups/hp-officejet_5100_series.ppd.gz \ @@ -559,6 +569,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-photosmart_c7100_series.ppd.gz \ ppd/hpcups/hp-photosmart_c7200_series.ppd.gz \ ppd/hpcups/hp-photosmart_c8100_series.ppd.gz \ + ppd/hpcups/hp-photosmart_d110_series.ppd.gz \ ppd/hpcups/hp-photosmart_d5060_series.ppd.gz \ ppd/hpcups/hp-photosmart_d5100_series.ppd.gz \ ppd/hpcups/hp-photosmart_d5300_series.ppd.gz \ diff --git a/dat2drv.py b/dat2drv.py index 27d5d9c8d..2e3e69d96 100755 --- a/dat2drv.py +++ b/dat2drv.py @@ -70,6 +70,7 @@ SHORTENING_REPLACEMENTS = { 'designjet' : 'DESIGNJ', 'printer scanner copier' : 'PSC', 'color lj' : 'CLJ', +'professional' : 'Pro', } diff --git a/data/models/models.dat b/data/models/models.dat index 329e92622..e6bb8d022 100644 --- a/data/models/models.dat +++ b/data/models/models.dat @@ -20,7 +20,7 @@ # This file automatically generated by the HPLIP model editor (model_editor.py). # Please do NOT hand edit this file. # -# Last written on Thu, 11 Feb 2010 16:49:34 by mubeen. +# Last written on Fri, 07 May 2010 16:15:50 by adhir. # Model editor version 10.2 (Qt4). @@ -2831,6 +2831,81 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[photosmart_d110_series] +align-type=13 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=Photosmart_C4100.png +io-mfp-mode=3 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP Photosmart D110 Series Printer +monitor-type=0 +panel-check-type=1 +pcard-type=2 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=1 +r0-agent1-kind=3 +r0-agent1-sku=60/60XL +r0-agent1-type=1 +r0-agent2-kind=3 +r0-agent2-sku=60/60XL +r0-agent2-type=2 +r10-agent1-kind=3 +r10-agent1-sku=818/818XL +r10-agent1-type=1 +r10-agent2-kind=3 +r10-agent2-sku=818/818XL +r10-agent2-type=2 +r18-agent2-kind=3 +r18-agent2-sku=93/95 +r18-agent2-type=2 +r18-agent3-kind=3 +r18-agent3-sku=99 +r18-agent3-type=3 +r2-agent1-kind=3 +r2-agent1-sku=60/60XL +r2-agent1-type=1 +r2-agent2-kind=3 +r2-agent2-sku=60/60XL +r2-agent2-type=2 +r4-agent1-kind=3 +r4-agent1-sku=300/300XL +r4-agent1-type=1 +r4-agent2-kind=3 +r4-agent2-sku=300/300XL +r4-agent2-type=2 +r8-agent1-kind=3 +r8-agent1-sku=121/121XL +r8-agent1-type=1 +r8-agent2-kind=3 +r8-agent2-sku=121/121XL +r8-agent2-type=2 +scan-style=1 +scan-type=1 +status-battery-check=0 +status-dynamic-counters=1 +status-type=2 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.10.4 +tech-class=ViperPlusVIP +tech-subclass=Normal +tech-type=2 +usb-pid=8d11 +usb-vid=3f0 +wifi-config=0 + [hp_designjet_120] align-type=0 clean-type=0 @@ -4761,6 +4836,48 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[officejet_series_350] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=2 +fw-download=False +icon=OfficeJet_Series_300.png +io-mfp-mode=7 +io-mode=0 +io-support=1 +job-storage=0 +linefeed-cal-type=0 +model1=HP Officejet 350 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 +r0-agent1-kind=3 +r0-agent1-sku=26 (51626A) +r0-agent1-type=1 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=0 +support-released=True +support-subtype=0 +support-type=2 +support-ver=0.9.5 +tech-class=DJ540 +tech-subclass=GrayscaleOnly +tech-type=1 +usb-pid=0 +usb-vid=3f0 +wifi-config=0 + [dj350] align-type=8 clean-type=1 @@ -4813,48 +4930,6 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 -[officejet_series_350] -align-type=0 -clean-type=0 -color-cal-type=0 -copy-type=0 -embedded-server-type=0 -fax-type=2 -fw-download=False -icon=OfficeJet_Series_300.png -io-mfp-mode=7 -io-mode=0 -io-support=1 -job-storage=0 -linefeed-cal-type=0 -model1=HP Officejet 350 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 -r0-agent1-kind=3 -r0-agent1-sku=26 (51626A) -r0-agent1-type=1 -scan-style=0 -scan-type=0 -status-battery-check=0 -status-dynamic-counters=0 -status-type=0 -support-released=True -support-subtype=0 -support-type=2 -support-ver=0.9.5 -tech-class=DJ540 -tech-subclass=GrayscaleOnly -tech-type=1 -usb-pid=0 -usb-vid=3f0 -wifi-config=0 - [hp_electrostatic_355] align-type=0 clean-type=0 @@ -13188,6 +13263,90 @@ usb-pid=3011 usb-vid=3f0 wifi-config=0 +[hp_laserjet_professional_p1102w] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=True +icon=HP_LaserJet_1012.png +io-mfp-mode=6 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional P1102w Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=1 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=35A +r0-agent1-type=1 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=8 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.10.4 +tech-class=LJZjsMono +tech-subclass=NoAutoDuplex +tech-type=3 +usb-pid=32a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_professional_p1102] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=True +icon=HP_LaserJet_1012.png +io-mfp-mode=6 +io-mode=1 +io-support=2 +job-storage=0 +linefeed-cal-type=0 +model1=HP Laserjet Professional P1102 Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=1 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=35A +r0-agent1-type=1 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=8 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.10.4 +tech-class=LJZjsMono +tech-subclass=NoAutoDuplex +tech-type=3 +usb-pid=2a +usb-vid=3f0 +wifi-config=0 + [photosmart_1115] align-type=1 clean-type=1 @@ -13453,6 +13612,50 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[hp_laserjet_professional_m1132_mfp] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=HP_LaserJet_m1005.png +io-mfp-mode=4 +io-mode=1 +io-support=2 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional M1132 Multifunction Printer +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=Q2612A +r0-agent1-type=1 +scan-color=1 +scan-src=2 +scan-style=1 +scan-type=4 +status-battery-check=0 +status-dynamic-counters=0 +status-type=8 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.10.4 +tech-class=LJZjsMono +tech-subclass=NoAutoDuplex +tech-type=3 +usb-pid=42a +usb-vid=3f0 +wifi-config=0 + [hp_laserjet_1150] align-type=0 clean-type=0 @@ -14032,6 +14235,50 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[hp_laserjet_professional_m1212nf_mfp] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=-1 +fw-download=False +icon=hp_laserjet_3050.png +io-mfp-mode=4 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional M1212nf Multifunction Printer +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=Q2612A +r0-agent1-type=1 +scan-color=1 +scan-src=3 +scan-style=1 +scan-type=4 +status-battery-check=0 +status-dynamic-counters=0 +status-type=8 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.10.4 +tech-class=LJZjsMono +tech-subclass=NoAutoDuplex +tech-type=3 +usb-pid=52a +usb-vid=3f0 +wifi-config=0 + [hp_color_laserjet_cp1215] align-type=0 clean-type=0 @@ -16113,6 +16360,48 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[hp_laserjet_professional_p1566] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=True +icon=HP_LaserJet_1012.png +io-mfp-mode=6 +io-mode=1 +io-support=2 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional P1566 +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=1 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=36A +r0-agent1-type=1 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=8 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.10.4 +tech-class=LJZjsMono +tech-subclass=NoAutoDuplex +tech-type=3 +usb-pid=92a +usb-vid=3f0 +wifi-config=0 + [deskjet_1600c] align-type=0 clean-type=0 @@ -16500,6 +16789,48 @@ usb-pid=3a17 usb-vid=3f0 wifi-config=0 +[hp_laserjet_professional_p1606dn] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=HP_LaserJet_1012.png +io-mfp-mode=6 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional P1606dn Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=2 +plugin-reason=4 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=36A +r0-agent1-type=1 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=8 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.10.4 +tech-class=LJZjsMono +tech-subclass=NoAutoDuplex +tech-type=3 +usb-pid=a2a +usb-vid=3f0 +wifi-config=0 + [color_inkjet_printer_cp1700] align-type=1 clean-type=1 @@ -17354,7 +17685,7 @@ usb-pid=5d17 usb-vid=3f0 wifi-config=0 -[hp_laserjet_p2055] +[hp_laserjet_p2055dn] align-type=0 clean-type=0 color-cal-type=0 @@ -17365,10 +17696,10 @@ fw-download=False icon=HP_LaserJet_1012.png io-mfp-mode=6 io-mode=1 -io-support=2 +io-support=6 job-storage=0 linefeed-cal-type=0 -model1=HP LaserJet P2055 Printer +model1=HP LaserJet P2055dn Printer monitor-type=0 panel-check-type=0 pcard-type=0 @@ -17386,7 +17717,7 @@ status-battery-check=0 status-dynamic-counters=0 status-type=8 support-released=True -support-subtype=45ac +support-subtype=219b2b support-type=2 support-ver=2.8.10 tech-class=LJMono,Postscript @@ -17396,7 +17727,7 @@ usb-pid=5c17 usb-vid=3f0 wifi-config=0 -[hp_laserjet_p2055dn] +[hp_laserjet_p2055] align-type=0 clean-type=0 color-cal-type=0 @@ -17407,10 +17738,10 @@ fw-download=False icon=HP_LaserJet_1012.png io-mfp-mode=6 io-mode=1 -io-support=6 +io-support=2 job-storage=0 linefeed-cal-type=0 -model1=HP LaserJet P2055dn Printer +model1=HP LaserJet P2055 Printer monitor-type=0 panel-check-type=0 pcard-type=0 @@ -17428,7 +17759,7 @@ status-battery-check=0 status-dynamic-counters=0 status-type=8 support-released=True -support-subtype=219b2b +support-subtype=45ac support-type=2 support-ver=2.8.10 tech-class=LJMono,Postscript @@ -25116,6 +25447,76 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[officejet_4000_k210] +align-type=14 +clean-type=2 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=deskjet_3600.png +io-mfp-mode=3 +io-mode=1 +io-support=2 +job-storage=0 +linefeed-cal-type=0 +model1=HP Officejet 4000 K210 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=1 +r0-agent1-kind=3 +r0-agent1-sku=703 +r0-agent1-type=1 +r0-agent2-kind=3 +r0-agent2-sku=703 +r0-agent2-type=2 +r10-agent1-kind=3 +r10-agent1-sku=703 +r10-agent1-type=1 +r10-agent2-kind=3 +r10-agent2-sku=703 +r10-agent2-type=2 +r2-agent1-kind=3 +r2-agent1-sku=703 +r2-agent1-type=1 +r2-agent2-kind=3 +r2-agent2-sku=703 +r2-agent2-type=2 +r4-agent1-kind=3 +r4-agent1-sku=703 +r4-agent1-type=1 +r4-agent2-kind=3 +r4-agent2-sku=703 +r4-agent2-type=2 +r7-agent1-sku=816 (C8816A/B/G) +r8-agent1-kind=3 +r8-agent1-sku=703 +r8-agent1-type=1 +r8-agent2-kind=3 +r8-agent2-sku=703 +r8-agent2-type=2 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=3 +status-type=2 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.10.4 +tech-class=ViperPlusTrim +tech-subclass=Normal +tech-type=2 +usb-pid=9c11 +usb-vid=3f0 +wifi-config=0 + [hp_designjet_4000] align-type=0 clean-type=0 @@ -27854,6 +28255,81 @@ usb-pid=6c11 usb-vid=3f0 wifi-config=0 +[officejet_4400_k410] +align-type=1 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=hp_deskjet_f4200.png +io-mfp-mode=3 +io-mode=1 +io-support=2 +job-storage=0 +linefeed-cal-type=0 +model1=HP Officejet 4400 K410 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 +r-type=1 +r0-agent1-kind=3 +r0-agent1-sku=703 +r0-agent1-type=1 +r0-agent2-kind=3 +r0-agent2-sku=703 +r0-agent2-type=2 +r10-agent1-kind=3 +r10-agent1-sku=703 +r10-agent1-type=1 +r10-agent2-kind=3 +r10-agent2-sku=703 +r10-agent2-type=2 +r18-agent2-kind=3 +r18-agent2-sku=93/95 +r18-agent2-type=2 +r18-agent3-kind=3 +r18-agent3-sku=99 +r18-agent3-type=3 +r2-agent1-kind=3 +r2-agent1-sku=703 +r2-agent1-type=1 +r2-agent2-kind=3 +r2-agent2-sku=703 +r2-agent2-type=2 +r4-agent1-kind=3 +r4-agent1-sku=703 +r4-agent1-type=1 +r4-agent2-kind=3 +r4-agent2-sku=703 +r4-agent2-type=2 +r8-agent1-kind=3 +r8-agent1-sku=703 +r8-agent1-type=1 +r8-agent2-kind=3 +r8-agent2-sku=703 +r8-agent2-type=2 +scan-style=1 +scan-type=1 +status-battery-check=0 +status-dynamic-counters=1 +status-type=2 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.10.4 +tech-class=ViperPlusVIP +tech-subclass=Normal +tech-type=2 +usb-pid=9d11 +usb-vid=3f0 +wifi-config=0 + [officejet_4500_g510a-f] align-type=13 clean-type=1 @@ -29752,6 +30228,48 @@ usb-pid=7217 usb-vid=3f0 wifi-config=0 +[hp_laserjet_m5039_mfp] +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_4345_mfp.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=1 +linefeed-cal-type=0 +model1=HP LaserJet M5039 Multifunction Printer +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=Q7570A +r0-agent1-type=1 +scan-style=0 +scan-type=-2 +status-battery-check=0 +status-dynamic-counters=0 +status-type=3 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.10.4 +tech-class=LJMono,Postscript +tech-subclass=LargeFormatA3 +tech-type=4 +usb-pid=a117 +usb-vid=3f0 +wifi-config=0 + [photosmart_d5060_series] align-type=10 clean-type=1 @@ -31789,56 +32307,6 @@ usb-pid=7211 usb-vid=3f0 wifi-config=0 -[deskjet_5550] -align-type=1 -clean-type=1 -color-cal-type=0 -copy-type=0 -embedded-server-type=0 -fax-type=0 -fw-download=False -icon=deskjet_5550.png -io-mfp-mode=6 -io-mode=1 -io-support=3 -job-storage=0 -linefeed-cal-type=0 -model1=HP Deskjet 5550 Color Inkjet Printer -model2=HP Deskjet 5550w Color Inkjet Printer -model3=HP Deskjet 5550v Color Inkjet 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 -r0-agent1-kind=3 -r0-agent1-sku=56 (C6656A) -r0-agent1-type=1 -r0-agent2-kind=3 -r0-agent2-sku=57 (C6657A) -r0-agent2-type=2 -r0-agent3-kind=3 -r0-agent3-sku=58 (C6658A) -r0-agent3-type=3 -scan-style=0 -scan-type=0 -status-battery-check=0 -status-dynamic-counters=0 -status-type=2 -support-released=True -support-subtype=219b2b -support-type=2 -support-ver=0.9.5 -tech-class=DJ55xx -tech-subclass=Normal -tech-type=2 -usb-pid=6004 -usb-vid=3f0 -wifi-config=0 - [hp_color_laserjet_5550] align-type=0 clean-type=0 @@ -31900,6 +32368,56 @@ usb-pid=1f17 usb-vid=3f0 wifi-config=0 +[deskjet_5550] +align-type=1 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=deskjet_5550.png +io-mfp-mode=6 +io-mode=1 +io-support=3 +job-storage=0 +linefeed-cal-type=0 +model1=HP Deskjet 5550 Color Inkjet Printer +model2=HP Deskjet 5550w Color Inkjet Printer +model3=HP Deskjet 5550v Color Inkjet 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 +r0-agent1-kind=3 +r0-agent1-sku=56 (C6656A) +r0-agent1-type=1 +r0-agent2-kind=3 +r0-agent2-sku=57 (C6657A) +r0-agent2-type=2 +r0-agent3-kind=3 +r0-agent3-sku=58 (C6658A) +r0-agent3-type=3 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=2 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=0.9.5 +tech-class=DJ55xx +tech-subclass=Normal +tech-type=2 +usb-pid=6004 +usb-vid=3f0 +wifi-config=0 + [deskjet_5551] align-type=1 clean-type=1 @@ -41167,6 +41685,7 @@ wifi-config=0 # 3 : OZ or Color Fax (Do not use) # 4 : B&W SOAP # 5 : B&W MARVELL +# 6 : B&W LEDM # # # fw-download @@ -41339,6 +41858,7 @@ wifi-config=0 # 4 : Marvell # 5 : SOAP2 # 6 : Duplex SCL +# 7 : LEDM # # # status-battery-check diff --git a/data/rules/20-hplip-devices.fdi b/data/rules/20-hplip-devices.fdi index a916de07b..6c41848d0 100644 --- a/data/rules/20-hplip-devices.fdi +++ b/data/rules/20-hplip-devices.fdi @@ -42,7 +42,16 @@ <!-- Check for LaserJet products (0x03f0xx17). --> <match key="info.subsystem" string="usb"> <match key="usb.vendor_id" int="0x03f0"> - <match key="usb.product_id" int_outof="0x0017;0x0117;0x0217;0x0317;0x0417;0x0517;0x0617;0x0717;0x0817;0x0917;0x0a17;0x0b17;0x0c17;0x0d17;0x0e17;0x0f17;0x1017;0x1117;0x1217;0x1317;0x1417;0x1517;0x1617;0x1717;0x1817;0x1917;0x1a17;0x1b17;0x1c17;0x1d17;0x1e17;0x1f17;0x2017;0x2117;0x2217;0x2317;0x2417;0x2517;0x2617;0x2717;0x2817;0x2917;0x2a17;0x2b17;0x2c17;0x2d17;0x2e17;0x2f17;0x3017;0x3117;0x3217;0x3317;0x3417;0x3517;0x3617;0x3717;0x3817;0x3917;0x3a17;0x3b17;0x3c17;0x3d17;0x3e17;0x3f17;0x4017;0x4117;0x4217;0x4317;0x4417;0x4517;0x4617;0x4717;0x4817;0x4917;0x4a17;0x4b17;0x4c17;0x4d17;0x4e17;0x4f17;0x5017;0x5117;0x5217;0x5317;0x5417;0x5517;0x5617;0x5717;0x5817;0x5917;0x5a17;0x5b17;0x5c17;0x5d17;0x5e17;0x5f17;0x6017;0x6117;0x6217;0x6317;0x6417;0x6517;0x6617;0x6717;0x6817;0x6917;0x6a17;0x6b17;0x6c17;0x6d17;0x6e17;0x6f17;0x7017;0x7117;0x7217;0x7317;0x7417;0x7517;0x7617;0x7717;0x7817;0x7917;0x7a17;0x7b17;0x7c17;0x7d17;0x7e17;0x7f17;0x8017;0x8117;0x8217;0x8317;0x8417;0x8517;0x8617;0x8717;0x8817;0x8917;0x8a17;0x8b17;0x8c17;0x8d17;0x8e17;0x8f17;0x9017;0x9117;0x9217;0x9317;0x9417;0x9517;0x9617;0x9717;0x9817;0x9917;0x9a17;0x9b17;0x9c17;0x9d17;0x9e17;0x9f17;0xa017;0xa117;0xa217;0xa317;0xa417;0xa517;0xa617;0xa717;0xa817;0xa917;0xaa17;0xab17;0xac17;0xad17;0xae17;0xaf17;0xb017;0xb117;0xb217;0xb317;0xb417;0xb517;0xb617;0xb717;0xb817;0xb917;0xba17;0xbb17;0xbc17;0xbd17;0xbe17;0xbf17;0xc017;0xc117;0xc217;0xc317;0xc417;0xc517;0xc617;0xc717;0xc817;0xc917;0xca17;0xcb17;0xcc17;0xcd17;0xce17;0xcf17;0xd017;0xd117;0xd217;0xd317;0xd417;0xd517;0xd617;0xd717;0xd817;0xd917;0xda17;0xdb17;0xdc17;0xdd17;0xde17;0xdf17;0xe017;0xe117;0xe217;0xe317;0xe417;0xe517;0xe617;0xe717;0xe817;0xe917;0xea17;0xeb17;0xec17;0xed17;0xee17;0xef17;0xf017;0xf117;0xf217;0xf317;0xf417;0xf517;0xf617;0xf717;0xf817;0xf917;0xfa17;0xfb17;0xfc17;0xfd17;0xfe17;0xff17"> + <match key="usb.product_id" int_outof="0x0017;0x0117;0x0217;0x0317;0x0417;0x0517;0x0617;0x0717;0x0817;0x0917;0x0a17;0x0b17;0x0c17;0x0d17;0x0e17;0x0f17;0x1017;0x1117;0x1217;0x1317;0x1417;0x1517;0x1617;0x1717;0x1817;0x1917;0x1a17;0x1b17;0x1c17;0x1d17;0x1e17;0x1f17;0x2017;0x2117;0x2217;0x2317;0x2417;0x2517;0x2617;0x2717;0x2817;0x2917;0x2a17;0x2b17;0x2c17;0x2d17;0x2e17;0x2f17;0x3017;0x3117;0x3217;0x3317;0x3417;0x3517;0x3617;0x3717;0x3817;0x3917;0x3a17;0x3b17;0x3c17;0x3d17;0x3e17;0x3f17;0x4017;0x4117;0x4217;0x4317;0x4417;0x4517;0x4617;0x4717;0x4817;0x4917;0x4a17;0x4b17;0x4c17;0x4d17;0x4e17;0x4f17;0x5017;0x5117;0x5217;0x5317;0x5417;0x5517;0x5617;0x5717;0x5817;0x5917;0x5a17;0x5b17;0x5c17;0x5d17;0x5e17;0x5f17;0x6017;0x6117;0x6217;0x6317;0x6417;0x6517;0x6617;0x6717;0x6817;0x6917;0x6a17;0x6b17;0x6c17;0x6d17;0x6e17;0x6f17;0x7017;0x7117;0x7217;0x7317;0x7417;0x7517;0x7617;0x7717;0x7817;0x7917;0x7a17;0x7b17;0x7c17;0x7d17;0x7e17;0x7f17;0x8017;0x8117;0x8217;0x8317;0x8417;0x8517;0x8617;0x8717;0x8817;0x8917;0x8a17;0x8b17;0x8c17;0x8d17;0x8e17;0x8f17;0x9017;0x9117;0x9217;0x9317;0x9417;0x9517;0x9617;0x9717;0x9817;0x9917;0x9a17;0x9b17;0x9c17;0x9d17;0x9e17;0x9f17;0xa017;0xa117;0xa217;0xa317;0xa417;0xa517;0xa617;0xa717;0xa817;0xa917;0xaa17;0xab17;0xac17;0xad17;0xae17;0xaf17;0xb017;0xb117;0xb217;0xb317;0xb417;0xb517;0xb617;0xb717;0xb817;0xb917;0xba17;0xbb17;0xbc17;0xbd17;0xbe17;0xbf17;0xc017;0xc117;0xc217;0xc317;0xc417;0xc517;0xc617;0xc717;0xc817;0xc917;0xca17;0xcb17;0xcc17;0xcd17;0xce17;0xcf17;0xd017;0xd117;0xd217;0xd317;0xd417;0xd517;0xd617;0xd717;0xd817;0xd917;0xda17;0xdb17;0xdc17;0xdd17;0xde17;0xdf17;0xe017;0xe117;0xe217;0xe317;0xe417;0xe517;0xe617;0xe717;0xe817;0xe917;0xea17;0xeb17;0xec17;0xed17;0xee17;0xef17;0xf017;0xf117;0xf217;0xf317;0xf417;0xf517;0xf617;0xf717;0xf817;0xf917;0xfa17;0xfb17;0xfc17;0xfd17;0xfe17;0xff17;0x042a;0x052a"> + <append key="info.capabilities" type="strlist">scanner</append> + </match> + </match> + </match> + +<!-- Check for LaserJet products (0x03f0xx2a). --> + <match key="info.subsystem" string="usb"> + <match key="usb.vendor_id" int="0x03f0"> + <match key="usb.product_id" int_outof="0x002a;0x012a;0x022a;0x032a;0x042a;0x052a;0x062a;0x072a;0x082a;0x092a;0x0a2a;0x0b2a;0x0c2a;0x0d2a;0x0e2a;0x0f2a;0x102a;0x112a;0x122a;0x132a;0x142a;0x152a;0x162a;0x172a;0x182a;0x192a;0x1a2a;0x1b2a;0x1c2a;0x1d2a;0x1e2a;0x1f2a;0x202a;0x212a;0x222a;0x232a;0x242a;0x252a;0x262a;0x272a;0x282a;0x292a;0x2a2a;0x2b2a;0x2c2a;0x2d2a;0x2e2a;0x2f2a;0x302a;0x312a;0x322a;0x332a;0x342a;0x352a;0x362a;0x372a;0x382a;0x392a;0x3a2a;0x3b2a;0x3c2a;0x3d2a;0x3e2a;0x3f2a;0x402a;0x412a;0x422a;0x432a;0x442a;0x452a;0x462a;0x472a;0x482a;0x492a;0x4a2a;0x4b2a;0x4c2a;0x4d2a;0x4e2a;0x4f2a;0x502a;0x512a;0x522a;0x532a;0x542a;0x552a;0x562a;0x572a;0x582a;0x592a;0x5a2a;0x5b2a;0x5c2a;0x5d2a;0x5e2a;0x5f2a;0x602a;0x612a;0x622a;0x632a;0x642a;0x652a;0x662a;0x672a;0x682a;0x692a;0x6a2a;0x6b2a;0x6c2a;0x6d2a;0x6e2a;0x6f2a;0x702a;0x712a;0x722a;0x732a;0x742a;0x752a;0x762a;0x772a;0x782a;0x792a;0x7a2a;0x7b2a;0x7c2a;0x7d2a;0x7e2a;0x7f2a;0x802a;0x812a;0x822a;0x832a;0x842a;0x852a;0x862a;0x872a;0x882a;0x892a;0x8a2a;0x8b2a;0x8c2a;0x8d2a;0x8e2a;0x8f2a;0x902a;0x912a;0x922a;0x932a;0x942a;0x952a;0x962a;0x972a;0x982a;0x992a;0x9a2a;0x9b2a;0x9c2a;0x9d2a;0x9e2a;0x9f2a;0xa02a;0xa12a;0xa22a;0xa32a;0xa42a;0xa52a;0xa62a;0xa72a;0xa82a;0xa92a;0xaa2a;0xab2a;0xac2a;0xad2a;0xae2a;0xaf2a;0xb02a;0xb12a;0xb22a;0xb32a;0xb42a;0xb52a;0xb62a;0xb72a;0xb82a;0xb92a;0xba2a;0xbb2a;0xbc2a;0xbd2a;0xbe2a;0xbf2a;0xc02a;0xc12a;0xc22a;0xc32a;0xc42a;0xc52a;0xc62a;0xc72a;0xc82a;0xc92a;0xca2a;0xcb2a;0xcc2a;0xcd2a;0xce2a;0xcf2a;0xd02a;0xd12a;0xd22a;0xd32a;0xd42a;0xd52a;0xd62a;0xd72a;0xd82a;0xd92a;0xda2a;0xdb2a;0xdc2a;0xdd2a;0xde2a;0xdf2a;0xe02a;0xe12a;0xe22a;0xe32a;0xe42a;0xe52a;0xe62a;0xe72a;0xe82a;0xe92a;0xea2a;0xeb2a;0xec2a;0xed2a;0xee2a;0xef2a;0xf02a;0xf12a;0xf22a;0xf32a;0xf42a;0xf52a;0xf62a;0xf72a;0xf82a;0xf92a;0xfa2a;0xfb2a;0xfc2a;0xfd2a;0xfe2a;0xff2a;0x042a;0x052a"> <append key="info.capabilities" type="strlist">scanner</append> </match> </match> diff --git a/data/rules/40-hplip.rules b/data/rules/40-hplip.rules index 8955c3f49..ca39de744 100644 --- a/data/rules/40-hplip.rules +++ b/data/rules/40-hplip.rules @@ -129,6 +129,8 @@ ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??12", GROUP="lp", ENV{ID_HPLIP}="1" ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??04", GROUP="lp", ENV{ID_HPLIP}="1" # Check for LaserJet products (0x03f0xx17). ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", GROUP="lp", ENV{ID_HPLIP}="1" +# Check for LaserJet products (0x03f0xx2a). +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", GROUP="lp", ENV{ID_HPLIP}="1" LABEL="hpmud_rules_end" diff --git a/data/rules/55-hpmud.rules b/data/rules/55-hpmud.rules index 4418d9d12..71f7951aa 100644 --- a/data/rules/55-hpmud.rules +++ b/data/rules/55-hpmud.rules @@ -139,6 +139,8 @@ SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="root", GROUP="lp", MOD SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="660" # Check for LaserJet products (0x03f0xx17). SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="660" +# Check for LaserJet products (0x03f0xx2a). +SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", OWNER="root", GROUP="lp", MODE="660" # Removed the following rule because FHS states that /etc should be reserved for static files only. This # functionality should be done in a deb/rpm post install script. 2/11/2009, D Suffield diff --git a/data/rules/56-hpmud_support.rules b/data/rules/56-hpmud_support.rules index 7a2ab332c..0f3eafe7b 100644 --- a/data/rules/56-hpmud_support.rules +++ b/data/rules/56-hpmud_support.rules @@ -8,7 +8,8 @@ LABEL="pid_test" # Check for LaserJet products (0x03f0xx17). SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" - +# Check for LaserJet products (0x03f0xx2a). +SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'" LABEL="hpmud_rules_end"
\ No newline at end of file diff --git a/fax/filters/pstotiff b/fax/filters/pstotiff index 69ec10974..5e375b4db 100755 --- a/fax/filters/pstotiff +++ b/fax/filters/pstotiff @@ -17,14 +17,11 @@ if (len(sys.argv) > 6): temp_out_handle, temp_out_fname = tempfile.mkstemp() font = "-I/usr/share/cups/fonts" -device = "-sDEVICE=tiffg4 -dDEBUG -dNOPAUSE -dBATCH -dSAFER -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT -sstdout=%stderr -sOutputFile=" + temp_out_fname + " " + temp_in_file +device = "-sDEVICE=tiffg4 -dNOPAUSE -dBATCH -dSAFER -dPARANOIDSAFER -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT -sstdout=%stderr -sOutputFile=" + temp_out_fname + " " + temp_in_file gs_command = "/usr/bin/gs" + " " + font + " " + device exit_code = os.system(gs_command) -#if exit_code != 0: -# print("Ghostscript returned error (error code %d)!" % exit_code) -# sys.exit(exit_code) file_len = os.stat(temp_out_fname).st_size if (file_len < READ_SIZE): diff --git a/fax/ppd/HP-Fax-hpcups.ppd.gz b/fax/ppd/HP-Fax-hpcups.ppd.gz Binary files differindex a40dd906a..f73eb67e4 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 bfba9a4af..bb5c13d43 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 9a654d182..01e541beb 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 db9372f8a..3dd71e4ee 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 0eef83fa1..da7df9166 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 32c42e8ef..8a5431d24 100644 --- a/fax/ppd/HP-Fax3-hpijs.ppd.gz +++ b/fax/ppd/HP-Fax3-hpijs.ppd.gz diff --git a/foomatic_drv.inc b/foomatic_drv.inc index b29f3c2bf..f1a759831 100644 --- a/foomatic_drv.inc +++ b/foomatic_drv.inc @@ -42,6 +42,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_f4100_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_a630_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_690c-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_p1606dn-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_5600_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_4105-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz \ @@ -55,6 +56,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_5551-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4v-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_935c-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3650-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_3500-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_r60-hpijs.ppd.gz \ @@ -136,9 +138,11 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_9040-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_9800-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3810-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_150_mobile_l511-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_1200c-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3500-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c6200_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_p1566-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p4014n-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3870-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz \ @@ -217,6 +221,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_r80xi-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_995c-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_d4300_series-hpijs.ppd.gz \ + ppd/hpijs/hp-photosmart_d110_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_692-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_pro_k8600-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_1215-hpijs.ppd.gz \ @@ -235,6 +240,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_5100-hpijs.ppd.gz \ ppd/hpijs/hp-psc_780xi-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_330-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1300n-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz \ @@ -349,6 +355,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_p2014n-hpijs-zxs.ppd.gz \ ppd/hpijs/hp-officejet_5100_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_6980_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_p1102-hpijs.ppd.gz \ ppd/hpijs/hp-business_inkjet_2200-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p4515x-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_pro_k5400-hpijs.ppd.gz \ @@ -389,12 +396,15 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_5200lx-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_7100_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_2600_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_5800-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1022-hpijs-zjs.ppd.gz \ + ppd/hpijs/hp-officejet_4400_k410-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_670c-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_670-hpijs.ppd.gz \ + ppd/hpijs/hp-officejet_4000_k210-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_6500_e709n-hpijs.ppd.gz \ ppd/hpijs/hp-psc_2100_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c6100_series-hpijs.ppd.gz \ @@ -435,6 +445,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1320n-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_5900_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_400-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_832c-hpijs.ppd.gz \ @@ -648,7 +659,6 @@ foomatic_ps_printers = \ prnt/ps/hp-designjet_4520ps-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp1514n-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2500-ps.ppd.gz \ - prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_m9050_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_4200-ps.ppd.gz \ @@ -774,7 +784,6 @@ foomatic_ps_printers = \ prnt/ps/hp-designjet_4520mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp1518ni-ps.ppd.gz \ prnt/ps/hp-laserjet_2410-ps.ppd.gz \ - prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz \ prnt/ps/hp-mopier_240-ps.ppd.gz \ prnt/ps/hp-laserjet_6p-ps.ppd.gz \ prnt/ps/hp-laserjet_1200-ps.ppd.gz \ @@ -74,7 +74,7 @@ def run(read_pipe2=None, # pipe from hpssd r2, w3 = read_pipe2, write_pipe3 - fmt = "64s64sI32sI64sf" # TODO: Move to Event class + fmt = "80s80sI32sI80sf" # TODO: Move to Event class fmt_size = struct.calcsize(fmt) response = {} diff --git a/installer/distros.dat b/installer/distros.dat index d188fa6ee..43ed5c9b6 100644 --- a/installer/distros.dat +++ b/installer/distros.dat @@ -2145,7 +2145,6 @@ ppd_dir=/usr/share/cups/model/HP fix_ppd_symlink=0 drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt4 -policykit=1 native_cups=1 add_user_to_group=-a -Gsys,lp open_mdns_port=/bin/bash ./init-iptables-firewall @@ -4903,7 +4902,7 @@ pcard_supported=1 network_supported=1 parallel_supported=1 usb_supported=1 -packaged_version=3.9.2 +packaged_version=3.9.8 release_date=2009 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. ppd_install=drv @@ -7828,7 +7827,7 @@ packages=policykit,policykit-gnome # **************************************** [linuxmint] index=22 -versions=5,6 +versions=5,6,7,8 display_name=Linux Mint alt_names=mint, mint linux display=1 @@ -8062,6 +8061,239 @@ packages=python-ctypes packages=libcupsys2-dev,cupsys-bsd # **************************************** + +[linuxmint:7] +code_name=Gloria +supported=0 +scan_supported=1 +fax_supported=1 +pcard_supported=1 +network_supported=1 +parallel_supported=1 +usb_supported=1 +packaged_version=3.9.2 +release_date=2009 +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 +policykit=1 +native_cups=1 + +[linuxmint:7:cups] +packages=libcups2 + +[linuxmint:7:cups-devel] +packages=libcups2-dev,cupsys-bsd + +[linuxmint:7:gcc] +packages=build-essential + +[linuxmint:7:gs] +packages=gs-esp + +[linuxmint:7:libcrypto] +packages=openssl + +[linuxmint:7:libjpeg] +packages=libjpeg62-dev + +[linuxmint:7:libnetsnmp-devel] +packages=libsnmp-dev + +[linuxmint:7:libpthread] +packages=build-essential + +[linuxmint:7:libtool] +packages=libtool + +[linuxmint:7:libusb] +packages=libusb-dev + +[linuxmint:7:make] +packages=build-essential + +[linuxmint:7:pil] +packages=python-imaging + +[linuxmint:7:ppdev] +packages= +commands=sudo modprobe ppdev,sudo cp -f /etc/modules /etc/modules.hplip,echo ppdev | sudo tee -a /etc/modules + +[linuxmint:7:pyqt] +packages=python + +[linuxmint:7:python-devel] +packages=python-dev + +[linuxmint:7:pyqt4] +packages=python-qt4 + +[linuxmint:7:pyqt4-dbus] +packages=python-qt4-dbus + +[linuxmint:7:python23] +packages=python + +[linuxmint:7:python2x] +packages=python + +[linuxmint:7:reportlab] +packages=python-reportlab + +[linuxmint:7:sane] +packages=libsane + +[linuxmint:7:sane-devel] +packages=libsane-dev + +[linuxmint:7:scanimage] +packages=sane-utils + +[linuxmint:7:xsane] +packages=xsane + +[linuxmint:7:cups-ddk] +packages=cupsddk,cupsddk-drivers + +[linuxmint:7:python-dbus] +packages=python-dbus,python-gobject + +[linuxmint:7:dbus] +packages=libdbus-1-dev + +[linuxmint:7:python-ctypes] +packages=python-ctypes + +[linuxmint:7:cups-image] +packages=libcupsimage2-dev + +[linuxmint:7:policykit] +packages=policykit,policykit-gnome + +[linuxmint:7:python-notify] +packages=python-notify + +# ******************** + +[linuxmint:8] +code_name=Helena +supported=0 +scan_supported=1 +fax_supported=1 +pcard_supported=1 +network_supported=1 +parallel_supported=1 +usb_supported=1 +packaged_version=3.10.4 +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. +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 +add_user_to_group=-a -Glp + +[linuxmint:8:cups] +packages=libcups2 + +[linuxmint:8:cups-devel] +packages=libcups2-dev,cups-bsd,cups-client + +[linuxmint:8:gcc] +packages=build-essential + +[linuxmint:8:gs] +packages=ghostscript + +[linuxmint:8:libcrypto] +packages=openssl + +[linuxmint:8:libjpeg] +packages=libjpeg62-dev + +[linuxmint:8:libnetsnmp-devel] +packages=libsnmp-dev + +[linuxmint:8:libpthread] +packages=build-essential + +[linuxmint:8:libtool] +packages=libtool + +[linuxmint:8:libusb] +packages=libusb-dev + +[linuxmint:8:make] +packages=build-essential + +[linuxmint:8:pil] +packages=python-imaging + +[linuxmint:8:ppdev] +packages= +commands=sudo modprobe ppdev,sudo cp -f /etc/modules /etc/modules.hplip,echo ppdev | sudo tee -a /etc/modules + +[linuxmint:8:pyqt] +packages=python-qt4 + +[linuxmint:8:python-devel] +packages=python-dev + +[linuxmint:8:pyqt4] +packages=python-qt4 + +[linuxmint:8:pyqt4-dbus] +packages=python-qt4-dbus + +#[linuxmint:8:python23] +#packages=python + +[linuxmint:8:python2x] +packages=python + +[linuxmint:8:reportlab] +packages=python-reportlab + +[linuxmint:8:sane] +packages=libsane + +[linuxmint:8:sane-devel] +packages=libsane-dev + +[linuxmint:8:scanimage] +packages=sane-utils + +[linuxmint:8:xsane] +packages=xsane + +[linuxmint:8:python-dbus] +packages=python-dbus,python-gobject + +[linuxmint:8:dbus] +packages=libdbus-1-dev + +[linuxmint:8:cups-image] +packages=libcupsimage2-dev + +[linuxmint:8:cups-ddk] +packages=cups + +[linuxmint:8:policykit] +packages=policykit-1,policykit-1-gnome + +[linuxmint:8:python-notify] +packages=python-notify + +# **************************************** + [linpus] index=25 versions=9.4,9.5 diff --git a/installer/text_install.py b/installer/text_install.py index a18c2915e..0ec92f024 100755 --- a/installer/text_install.py +++ b/installer/text_install.py @@ -42,6 +42,9 @@ def progress_callback(cmd="", desc="Working..."): def password_entry(): return getpass.getpass(log.bold("Please enter the root/superuser password: ")) +def password_user_entry(): + return getpass.getpass(log.bold("Please enter the user (%s)'s password: " % os.getenv('USER'))) + def option_question_callback(opt, desc, default='y'): ok, ans = tui.enter_yes_no("Do you wish to enable '%s'" % desc, default) @@ -342,9 +345,13 @@ def start(language, auto=True, test_depends=False, # COLLECT SUPERUSER PASSWORD # if not core.running_as_root(): - tui.title("ENTER ROOT/SUPERUSER PASSWORD") - - ok = core.check_password(password_entry, progress_callback) + su_sudo = core.get_distro_data('su_sudo') + if su_sudo == "sudo": + tui.title("ENTER USER PASSWORD") + ok = core.check_password(password_user_entry, progress_callback) + else: + tui.title("ENTER ROOT/SUPERUSER PASSWORD") + ok = core.check_password(password_entry, progress_callback) if not ok: log.error("3 incorrect attempts. Exiting.") diff --git a/io/hpmud/hpmud.h b/io/hpmud/hpmud.h index dc33a9ad5..2530f6eee 100644 --- a/io/hpmud/hpmud.h +++ b/io/hpmud/hpmud.h @@ -78,6 +78,21 @@ enum HPMUD_SCANTYPE HPMUD_SCANTYPE_SCL_DUPLEX = 6 }; +enum HPMUD_SCANSRC +{ + HPMUD_SCANSRC_NA = 0, + HPMUD_SCANSRC_ADF= 1, + HPMUD_SCANSRC_FLATBED = 2, + HPMUD_SCANSRC_BOTH = 3 +}; + +enum HPMUD_SCANCOLOR +{ + HPMUD_SCANCOLOR_NA = 0, + HPMUD_SCANCOLOR_MONO = 1, + HPMUD_SCANCOLOR_COLOR = 2 +}; + enum HPMUD_STATUSTYPE { HPMUD_STATUSTYPE_NA = 0, @@ -145,6 +160,8 @@ struct hpmud_model_attributes enum HPMUD_SUPPORT_TYPE support; enum HPMUD_PLUGIN_TYPE plugin; enum HPMUD_SUPPORT_TYPE reserved[5]; + enum HPMUD_SCANSRC scansrc; + enum HPMUD_SCANCOLOR scancolor; }; #ifdef __cplusplus diff --git a/io/hpmud/model.c b/io/hpmud/model.c index 9872ce7a1..8ed3b0bac 100644 --- a/io/hpmud/model.c +++ b/io/hpmud/model.c @@ -481,6 +481,14 @@ static int parse_key_value_pair(char *buf, int len, struct hpmud_model_attribute { ma->scantype = strtol(value, &tail2, 10); } + else if(strcasecmp(key, "scan-src") == 0) + { + ma->scansrc = strtol(value, &tail2, 10); + } + else if(strcasecmp(key, "scan-color") == 0) + { + ma->scancolor = strtol(value, &tail2, 10); + } else if(strcasecmp(key, "status-type") == 0) { ma->statustype = strtol(value, &tail2, 10); diff --git a/io/hpmud/musb.c b/io/hpmud/musb.c index 1bd45d694..0edeb3807 100644 --- a/io/hpmud/musb.c +++ b/io/hpmud/musb.c @@ -694,7 +694,8 @@ static struct usb_device *get_libusb_device(const char *uri) for (bus=usb_busses; bus; bus=bus->next) for (dev=bus->devices; dev; dev=dev->next) - if (is_uri(dev, uri)) + if (dev->descriptor.idVendor == 0x3f0 && is_interface(dev, 7)) + if (is_uri(dev, uri)) return dev; /* found usb device that matches uri */ return NULL; @@ -1133,6 +1134,23 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_open(mud_device * stat = HPMUD_R_DEVICE_BUSY; goto blackout; } + // For new Marvell device, USB interface was not getting released properly. And reading was failing + // this problem was observed with the SCAN, Print and also getting device communication error + // Adding hack: reset the USB + int productID = libusb_device->descriptor.idProduct; + // Only for the new marvell devices + // Product ID with 042a, 052a + if (productID == 1066 || productID == 1322){ + BUG("hpliphack temp msg need to remove: reset the device"); + usb_reset(fd_table[fd].hd); + fd_table[fd].hd = NULL; + if ((fd = claim_id_interface(libusb_device)) == MAX_FD) + { + stat = HPMUD_R_DEVICE_BUSY; + goto blackout; + } + } + len = device_id(fd, pd->id, sizeof(pd->id)); /* get new copy and cache it */ if (len > 0 && is_hp(pd->id)) @@ -2002,17 +2020,17 @@ int __attribute__ ((visibility ("hidden"))) musb_probe_devices(char *lst, int ls { for (dev=bus->devices; dev; dev=dev->next) { - if ((hd = usb_open(dev)) == NULL) - { - BUG("invalid usb_open: %m\n"); - continue; - } model[0] = serial[0] = rmodel[0] = rserial[0] = sz[0] = mfg[0] = 0; if (dev->descriptor.idVendor == 0x3f0 && is_interface(dev, 7)) { - /* Found hp device. */ + if((hd = usb_open(dev)) == NULL) + { + BUG("Invalid usb_open: %m\n"); + continue; + } + /* Found hp device. */ if ((r=get_string_descriptor(hd, dev->descriptor.iProduct, rmodel, sizeof(rmodel))) < 0) BUG("invalid product id string ret=%d\n", r); else @@ -2056,8 +2074,8 @@ int __attribute__ ((visibility ("hidden"))) musb_probe_devices(char *lst, int ls *cnt+=1; } + usb_close(hd); } - usb_close(hd); } } diff --git a/ppd/hpcups/apollo-2100.ppd.gz b/ppd/hpcups/apollo-2100.ppd.gz Binary files differindex 64b7166c7..cc49049c0 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 b28547e0c..f0ca94a8a 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 b52ac9ad6..34a3c0cd2 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 1e7684710..4190cedd0 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 06e2ba21f..d8313a804 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 5e1129133..3123900b1 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 56d891042..b3b12ec71 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 bf6ecc029..3ab8ffdd6 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 22f178978..d4b5c27e7 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 f5c453dd7..5f49bf19c 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 02d75ddde..0a57fee09 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 fd20ebec5..2cf1c166b 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 c2c211e2c..48994434b 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 47f491298..cf06904d1 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 954b1ab50..e1ceda5cb 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 79ea54087..99649f2c2 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 065c71bec..f141cd0f8 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 3229fbe8d..628204029 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 451c41b24..bdded87f2 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 586551f94..b6674abbe 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 43fad62ce..cd5c08eec 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 5f943041b..da0e3a59e 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 2bde5b33c..89fc72744 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 8b1153d3f..24ec79260 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 4f17f1dc6..ad4cdb591 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 06c26312e..c6f2eb4a2 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 f3bb94338..3b56b3b80 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 fe9473de3..b2ff7ff8f 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 2ec0dec13..40ad3f49d 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 2b80eccef..e4b1ca6ce 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 e8bdd33b6..95e939a6e 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 e4555fb60..c8134c40a 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 1f31b8010..d1da16b80 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 b9dd21d69..2e803199a 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 c7f72f002..da0f8c812 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 e41ef0dbe..6cf274ff7 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 d55689ac2..5d38c4fe2 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 d6e9688ee..e9a919086 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 ec694d5ae..e480278a3 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 8ef5c74ad..928676b08 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 ebc56743f..99105d847 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 cfb9a42fe..8679be007 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 d2ec61ce3..faa407482 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 71e451724..f236b1bc5 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 61c2e8113..5e86699e0 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 fb50e789b..8b969cae1 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 dd65b90c1..1e32c47cb 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 14a5149c8..7ee4d4482 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 8f0427f96..5f1dc9608 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 5623b799c..671a1a8e1 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 7c105e26d..22cf82bd8 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 90f0aeb8c..f0a197e90 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 99ca3b1f0..873c3c706 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 c663679c0..a80a4bafc 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 119112491..eefafc570 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 2a2fc821a..643963b67 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 2faf280a0..b708003c7 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 7d985810a..e480d74a8 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 8eed66d66..4b515c3c1 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 6a0c9b33a..0bbbf6c44 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 84a28752f..887f35bba 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_cm4730_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm4730_mfp-pcl3.ppd.gz Binary files differindex d21916f30..26b460da6 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 f036f0174..b60a17954 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 cacae912e..fc12dc2a4 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 2d84cbbc7..b404e3569 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 4c943b801..4e510adec 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_cp1514n-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp1514n-pcl3.ppd.gz Binary files differindex fecf003fe..c223ca5a3 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 8b13458e1..b8194a8e3 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 5afdc19e2..34d948bb3 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 6febc8a49..798af710b 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 e25ced43c..fe65c156e 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 bf9516e0a..900bbd1ea 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 6614e5417..675702285 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 6a1673136..96651f1b2 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 fd4ab047b..25571a060 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 9dbbeaae7..d1eddfeaa 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 b22cfced7..5f348c945 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 0c922695a..b2e4d3b24 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 d3f7525a0..3c295e85a 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 000a9e8dc..57fc8fa4e 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 960dadc6e..73d5cc148 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_cp6015-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz Binary files differindex f1c170962..34ff29e77 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-cp1160.ppd.gz b/ppd/hpcups/hp-cp1160.ppd.gz Binary files differindex 6d619d19d..498c10d23 100644 --- a/ppd/hpcups/hp-cp1160.ppd.gz +++ b/ppd/hpcups/hp-cp1160.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1100.ppd.gz b/ppd/hpcups/hp-deskjet_1100.ppd.gz Binary files differindex 9c6f2cbad..11095a616 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 9b050dae3..d1e102401 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 75e47b900..ec21de5cc 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 f700b47e7..9322facab 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 e536991ea..1d6e359b1 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 40f43e946..fa1f423bb 100644 --- a/ppd/hpcups/hp-deskjet_1280.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1280.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1600c.ppd.gz b/ppd/hpcups/hp-deskjet_1600c.ppd.gz Binary files differindex ad83fca4e..bb989b146 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 2c1a8d110..913819c04 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 ba11e945b..45b7f316c 100644 --- a/ppd/hpcups/hp-deskjet_1600cn.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1600cn.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3320.ppd.gz b/ppd/hpcups/hp-deskjet_3320.ppd.gz Binary files differindex ed6731aa9..66b7354c9 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 7f47eeee9..d85d3c358 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 287ae135f..18263f6ef 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 73a21cd6f..198bce9f9 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 7a99cf45d..34c71ec6a 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 53f831ac8..c9719ba66 100644 --- a/ppd/hpcups/hp-deskjet_3500.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3500.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3550.ppd.gz b/ppd/hpcups/hp-deskjet_3550.ppd.gz Binary files differindex bc48c58a8..dd07200ed 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 f698cce41..d38a47259 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 f6b0689b3..d79dffe7a 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 24da58e75..eb71a60b3 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 5dd464ab3..3cfaf595f 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 a21e8f65e..5f4d856e2 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 f4338dee4..8ee71889a 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 80946e3ba..ecc96fb2f 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 2087984a8..6652c1a9e 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 5f2e0fb2e..57ad78a25 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 cc5be4b64..7061f52bf 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 3216bc1a5..9ed8cc671 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 9cde9af44..4870a37d9 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 5849b69cc..e7c2cb70d 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 9eaaad465..a6421ca9d 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 16ac8e960..6f8f6bac8 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 94f8c4c60..7989108d2 100644 --- a/ppd/hpcups/hp-deskjet_400l.ppd.gz +++ b/ppd/hpcups/hp-deskjet_400l.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_460.ppd.gz b/ppd/hpcups/hp-deskjet_460.ppd.gz Binary files differindex b96f0182d..32f83ff99 100644 --- a/ppd/hpcups/hp-deskjet_460.ppd.gz +++ b/ppd/hpcups/hp-deskjet_460.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_500.ppd.gz b/ppd/hpcups/hp-deskjet_500.ppd.gz Binary files differindex 34024a3c7..b874ae3d8 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 74c38aa31..737c1d1e4 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 49121dc17..362712c1b 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 9491b53b7..9abd4817f 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 2ef2701fc..5a14f4eff 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 14941a018..5abd5b231 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 b9275a047..c1d96db3e 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 fc863a19f..160c9604d 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 bb228f7bc..f91fa91c0 100644 --- a/ppd/hpcups/hp-deskjet_550c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_550c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5550.ppd.gz b/ppd/hpcups/hp-deskjet_5550.ppd.gz Binary files differindex 513b3adda..5759a2808 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 7c577787c..c31bef628 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 1b508bbbf..be45a24e7 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 91f79ecef..439eb4100 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 6bf52ca39..8a5cfa56f 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 7930f4bf0..02b7154bb 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 40cc2ffe7..8b12f939c 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 b68dafe63..570d7ac9a 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 b95bc5a11..72ff888ef 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 4bbb7c936..23212ed7d 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 5b25c48b0..0600536f9 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 829fe1a54..b58e1f413 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 5ce30ddab..f60746afa 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 8e3fec1f6..3d629ca65 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 ad6171bf2..e8a5e5970 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 5190fa762..caf7caa45 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 c08365ba4..956e6c26e 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 865490aa5..58e297de9 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 a112b1970..c01da41fa 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 a142fc2c2..8a92252ad 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 aa944b5cb..82a02b70b 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 058c7d2fc..da9700aa5 100644 --- a/ppd/hpcups/hp-deskjet_6500.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6500.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_656c.ppd.gz b/ppd/hpcups/hp-deskjet_656c.ppd.gz Binary files differindex 8b7113be8..145b4bc40 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 7ae790a89..638e30417 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 bce803fce..02d8c539e 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 9170e32f2..ee46bb020 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 85e33a89c..cd56a31f3 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 f301569f1..1f2c324f9 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 044697450..cc20d8b64 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 33415f562..3db408547 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 a5dc69388..3b4e075be 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 113edd72f..6fa46d4cc 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 b51da3540..fd4a1ba26 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 ecf1342c6..292e29d19 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 10c31e3a7..d2907b428 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 d38b9b9a2..bb7cbc74c 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 61ce72e14..96ee1136d 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 b4706452c..9cf76d2b8 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 5ff10c017..916922ec0 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 02e5ac6ec..e63e8df2d 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 ddaefe12e..ebdbc4c47 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 2ae5233a2..8a62f4f91 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 6882670bb..97fe3ed9b 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 456c180c3..be54b7816 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 947607cd8..43d62e9f0 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 c65baa962..528cad8a3 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 10cd2d2ee..849658ac6 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 a47811bfb..affa0e7ee 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 c3b25256d..aecad582b 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 b08b853e9..68fb6271f 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 d32d87e8f..23712e4e2 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 8538d8f64..227ec1aa6 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 40993ef61..e2509a095 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 92ced9af6..922568472 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 3a524d40a..c786c9684 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 c878f179b..00f2cbe11 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 896369620..d45c93e2d 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 41bd37ecd..010967ea0 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 c4df737b5..29d450328 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 5b06bccd1..01f74a13a 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 0c5f931f1..f5003cff4 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 bc6aff7ff..54283c718 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 9b008c377..876eb70dd 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 e9a19b241..b1cd1c950 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 eea6a1202..56c779c82 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 7b381a832..8c04dc8ff 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 12a9f9a26..1dd133cdc 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 d07ba9b92..26306a875 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 c03b26f4a..8ad81f97a 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 b9e9dd0a2..229740e8b 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 241c97630..a24610621 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 cdb25b192..7590d4b48 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 65b97bed0..3ada9eed6 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 6d4978ffa..fb205c32a 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 0dd1a32e9..3375a985c 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 be66d7b9f..248194ddd 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 ddb9e0f0d..46b609632 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 6a286b1da..52c7dff89 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 df422eefb..5693777fb 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 cc46ff5fb..2ca591dde 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 35e0f4096..18620e776 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 2c7a6ce2f..33b00b298 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 b5208825f..c0c0dea8d 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 797a57b5c..478037313 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 e8e4dfdb9..ae6e06ae5 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 735ad6cb5..dad92d14b 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 8d6ab6283..e5bd2f06e 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 0137532c2..c57fb31ef 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 69a884a67..1f9bfebb2 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 a075b09c3..efdfafca3 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 e64972374..a445653d3 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 55216d37e..41de630b6 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 8bf9d2867..7dc7d12df 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 491f48b8d..96d8ec707 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 15c62899b..5cca5a3c6 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 2106525c5..6a13bf8ff 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 8ca08e774..9bba20bb8 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 927d75a3c..0b3f72e67 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 871a4f42d..5b029f553 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 c96f725e6..2e323b9a6 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 390f67ff6..17e7c3997 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 35474136b..ec01bc826 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 3da71f3c8..8898c7d3e 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 20e2b5dd0..c0f504046 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 fc7589b50..c142b93e6 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 b7e39c686..b293a558e 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 93eb6f147..38f3aa099 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_advant_k109a-z.ppd.gz b/ppd/hpcups/hp-deskjet_ink_advant_k109a-z.ppd.gz Binary files differindex 9e3f2f162..4b36da384 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 65bf82fa8..9fdcf3688 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 4fa654044..8c085180a 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 3582ebe78..22bd948bf 100644 --- a/ppd/hpcups/hp-dj450.ppd.gz +++ b/ppd/hpcups/hp-dj450.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1000.ppd.gz b/ppd/hpcups/hp-laserjet_1000.ppd.gz Binary files differindex ace1f6b48..34b341b5f 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 94f80b9a3..1194a76f4 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 c7fd838aa..af8552fc8 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 19b5b1a9f..bae47a461 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 5e34907a9..5c110b796 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 7e78609b8..3c1ab078e 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 8a8ebe85b..f0b926a1d 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 b106ac300..96cfe3fb0 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 b0a51155e..35f2e310d 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 f6080483a..5d2ccb811 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 e8de19534..9a4c95239 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 0c00cd9cc..8871ea200 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 cb60e4b23..8c0037b60 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 f6b4662a0..b5008f7a0 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 95fa5457e..96d44101c 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 b52485a14..aeb40501b 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 3bd2ca524..405f23016 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 527401f9a..49efd07db 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 6cf0598c5..d24a15dad 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 6a9ebb9ac..d8809bea5 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 dc5c204e6..c81d94c5b 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 20343d2f3..32ccbdd64 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 6d8a14d0d..6d9b24bca 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 f7e2fd002..5cd419bad 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 217ff43a9..d79118447 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 8244667fc..13ab1bb54 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 b13b2babf..a6dae7f62 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 91362640f..ac3280993 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 402d82f81..4b08135d0 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 1c3b59e15..33db94285 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 aa6ac1d6f..e335a1eca 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 27b8ddcb4..01f29526d 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 b6cfebc80..174ab0aac 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 735c8137e..f0f788855 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 fd2505b1b..5ef7120fd 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 9897f4a32..44e61b920 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 e8711bc37..d99bfcc8d 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 68d1f07ec..5ece32a1f 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 214065267..925353abe 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 de2b91a68..c6c266a70 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 9db4aa8c7..01220c9b3 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 cb6400c2e..dbdb6b229 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 d01eb4e8d..f51db9111 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 106700fbc..0eff0d797 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 acce00c7a..6cc7f793f 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 66756170d..a169b4798 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 4909fa043..d3734322c 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 224898d52..62ac80ca6 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 ea1a0352a..6bf18ff71 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 56087362a..1529748eb 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 d81f3ed17..1cd4122f1 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 0cdba16b3..7ba9ff13e 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 03f90d4cc..f843f3fe7 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 2aa53a74c..87f8679ac 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 ef1e85145..c2b733566 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 75e0fea05..0b0f7b056 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 77df188fc..df9ee3a81 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 8b5ffae04..e68dcb247 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 e41a908d7..4193b1cd4 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 d4410ef4b..0886a593c 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 736a49f58..6e88b424f 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 0a3d99800..35e29ad58 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 54da6a38e..8e70faf0d 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 222e22888..2bc35c092 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 1488538a2..b7c9a24f1 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 d5934a37d..be1ffa47d 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 c4627b156..848a11ca1 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 64bf81672..6b6932a40 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 5364be795..59669209f 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 92ba20a36..5620e6a5e 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 996b3ca11..fee2b419d 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 d061b214a..c70f0c0dc 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 b9ea16200..42c08821f 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 279275f2b..bcc8b5c3a 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 8de2fb1c8..b4c93a4a0 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 28c07ce98..649e6d72d 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 21187041b..6fffbb66a 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 3b0f7b22b..0532e82b7 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 4e416fa77..4bcef717f 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 4810e4151..8b23f1463 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 914e9b5e2..ea13aacd0 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 a93dbc399..f009682fb 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 3a975ecf3..3416a03c4 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 13375bd0b..dc25d2d54 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 2082417d5..f9951e016 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 4a5601906..7d6fe5108 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 f03e8dc1b..bdf62cb50 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 704fd0594..58f4db795 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 4a41c40c5..31d6babf5 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 6fc46b118..520f1b3c8 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 fe463ab8f..0445ea969 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 31d47f767..01bf80c8a 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 433a3d85c..b7ecf5f12 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 a719a3d93..6e7670f72 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 c8517c5c0..01f4b672c 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 279e3de2b..99557ad82 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 65186ee13..651b19f20 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 8c3a1bff9..297c107f5 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 78e719a03..ce4707c9f 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 4f1827c16..93ab94627 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 52bf56b36..f7a8ed9ba 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_m1005.ppd.gz b/ppd/hpcups/hp-laserjet_m1005.ppd.gz Binary files differindex 6a3bedd76..3be661692 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 37b55c996..673e51546 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 fada3070f..a72abc250 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 19dba14b8..3d8f5bcef 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 5f3f0212f..5f57b897b 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_m2727_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m2727_mfp-pcl3.ppd.gz Binary files differindex c30bf1b6b..e5ee611d7 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 55d12ade6..f010e1e55 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 ffc7391ad..e81fab7ca 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 8ab917804..f8321d450 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 27dfad754..9f5b92633 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 ed562a5f6..a925d84ae 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 fe60d4691..41a9d3de7 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 differnew file mode 100644 index 000000000..a3b7b67e1 --- /dev/null +++ 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 6d2b2cb99..f3154723b 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 b2f85e8c3..64595271a 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 4a8669aba..655600594 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 f0f8626d7..1d58c78c1 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 a65f658c6..ec58c8976 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 9c4720530..7c3993d03 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 55b6dc95a..cc743f66f 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 347b6d875..6d21d459d 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 f5fe2d3af..0f62d1c2b 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 29ac33dd9..04794b5f4 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 4ea56cf6a..28b684647 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 9d5ed16b3..8a1adf3f7 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 58a2284f7..ec4601d2f 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 f3d4606b5..69a9353d8 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 6f2bdd026..9cf7ae7e3 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 0cdadd4d4..db6634060 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 f717d7184..96f57cd81 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 3d6dd3d9d..fddd22187 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 3c4d3d55c..ce183a9f2 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 38a8e456f..01a1d5e4c 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 d54194223..f3a294a2c 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 89bfbc452..41d219b0e 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 500732b2c..f380470d5 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 917157dce..e4e0d457c 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 99335691b..5fc0dc3ee 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 746749e29..5be9b450d 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 161251eeb..e1a5bba64 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 35c56f5d5..11b9bbe87 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 bcd359bc6..e51c10156 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 c66c0397e..6a0ee05ea 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 356d7f857..ef4d0b936 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 da5073a9f..1ae2f0a32 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 032892f3e..4b939bcec 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 499d1e70c..1e6736e68 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 4534f7270..7095e0ee8 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 1b6d672a8..3144c60fc 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 6969b24ed..75173523c 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 ea14b0965..5058e312e 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 1e6b7b871..485da97c4 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 a25bc5df7..b5405dfb7 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 3b2d221e7..88d2ae5f5 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 55d832080..ee5eb4070 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 5497a1783..fae3b9b6e 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 557bd0961..a7c4c4aa1 100644 --- a/ppd/hpcups/hp-laserjet_p4515xm.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4515xm.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 differnew file mode 100644 index 000000000..713f71cba --- /dev/null +++ b/ppd/hpcups/hp-laserjet_professional_m1132_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 differnew file mode 100644 index 000000000..de110bffb --- /dev/null +++ b/ppd/hpcups/hp-laserjet_professional_m1212nf_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 differnew file mode 100644 index 000000000..12f021a55 --- /dev/null +++ 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 differnew file mode 100644 index 000000000..32a701e05 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz Binary files differnew file mode 100644 index 000000000..1abfecead --- /dev/null +++ b/ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz Binary files differnew file mode 100644 index 000000000..c331ff72c --- /dev/null +++ b/ppd/hpcups/hp-laserjet_professional_p1606dn.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 0ac8cda11..6135d52eb 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 482bbb2d5..57f2e7fb1 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 baf402fee..0f8cef031 100644 --- a/ppd/hpcups/hp-officejet.ppd.gz +++ b/ppd/hpcups/hp-officejet.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 differnew file mode 100644 index 000000000..d22c99b8a --- /dev/null +++ b/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4000_k210.ppd.gz b/ppd/hpcups/hp-officejet_4000_k210.ppd.gz Binary files differnew file mode 100644 index 000000000..74afdd782 --- /dev/null +++ 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 d5e963038..53483338e 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 e441e9fcd..6063f4d1e 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 5682ababf..18a9f4fef 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 7046132f1..d7e407fe1 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 07f0ec92b..74bfbf877 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 ae886f87a..c587f71c6 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 differnew file mode 100644 index 000000000..817cc2065 --- /dev/null +++ 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 4fc7fc86a..103bd416c 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 5e6a987f1..6f6616fbd 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_5100_series.ppd.gz b/ppd/hpcups/hp-officejet_5100_series.ppd.gz Binary files differindex 9750be900..f5db1a867 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 524c9531a..40ffc9b3d 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 9c8761ef2..e0b9db2e9 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 4f335d290..287990e92 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 580476302..e00943a13 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 5b266ae0e..0dc900b20 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 cffcee536..c5c5821e4 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 a1c1d7b0b..cd179d7f1 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_series.ppd.gz b/ppd/hpcups/hp-officejet_6100_series.ppd.gz Binary files differindex e077adb23..39a0a81b1 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 9b4111e86..42e4a5864 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 040a550fb..1ed9cfec0 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 a48ddd426..1b14d35d4 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 9ed33a15e..05931849a 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 803fab017..14a85fce8 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_7000_e809a.ppd.gz b/ppd/hpcups/hp-officejet_7000_e809a.ppd.gz Binary files differindex 321bae7f2..36b4c338f 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_7100_series.ppd.gz b/ppd/hpcups/hp-officejet_7100_series.ppd.gz Binary files differindex 8ed6ca15e..5f45af7a0 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_7200_series.ppd.gz b/ppd/hpcups/hp-officejet_7200_series.ppd.gz Binary files differindex 46b53f694..ff051ec4c 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 33769707f..c38b04341 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 6cb7511b7..c0fb0aa03 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_9100_series-pcl3.ppd.gz b/ppd/hpcups/hp-officejet_9100_series-pcl3.ppd.gz Binary files differindex 8f1c4e071..d973a4185 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 a4bca251e..3977e0957 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 c24104319..ac76438a2 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 4aebfa789..4ff4c9005 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 0211d7d89..539de62ac 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 c71d94e59..7de567421 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 5684d526c..b566adba0 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 a3df3cec8..cba014f29 100644 --- a/ppd/hpcups/hp-officejet_h470.ppd.gz +++ b/ppd/hpcups/hp-officejet_h470.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 ce260779b..95518860a 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 538ef6a4b..3d3aead4c 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 6a388313e..19558c82a 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 bfecb209f..eda5b4491 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 3d56a8598..b5db7965c 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 f5d9256ba..777a181f5 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 54a7d7d94..d330899f9 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 25c4d8a26..64f5009bb 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 19105add6..0298b9933 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 359b1ecf3..06cfc131a 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 e76d8b28b..5becdb1e6 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 9caf9fadc..a9f7d90f1 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 2531e626a..a19bf3f21 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 b1c1983d4..b0232165d 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 743ff27a4..eda1673c0 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_8000_a809.ppd.gz b/ppd/hpcups/hp-officejet_pro_8000_a809.ppd.gz Binary files differindex d02e9ffd4..7b0042bb6 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_8500_a909a.ppd.gz b/ppd/hpcups/hp-officejet_pro_8500_a909a.ppd.gz Binary files differindex a7501115c..84eb7149d 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 0ac31b9ad..51ea9e34c 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 a177fe377..98499314c 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_k5300.ppd.gz b/ppd/hpcups/hp-officejet_pro_k5300.ppd.gz Binary files differindex 0b5469a2f..925e93f54 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 b4b32ea1b..76ae2bfc9 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 4b0e65a75..698db71d1 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 294b78999..c35c456ba 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 023bd4529..bf36fcdce 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 640d81c9e..09bf1ee31 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 34251da7d..84d466596 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 9f26e3021..6e5e66ce5 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 63c7f3eaa..6d3bdf2e4 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 2c093e9d7..efbd96a4b 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 9cf577273..588baf430 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 39150d44a..b3e571e68 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 406a7632e..3c9df105c 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 3b7db9728..f549333fd 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 c61156ff3..23e1797dc 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 ae6bcb219..a22e3a745 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 00b0455b5..b22d5bb3a 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 4aa977569..11d5dc0e9 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 5b177f3b9..731facffa 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 76532babb..b35014069 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 3e2d8685c..3c060f854 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 b90999daa..72741d8b6 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_500.ppd.gz b/ppd/hpcups/hp-officejet_series_500.ppd.gz Binary files differindex 1e81b4375..bab4843b3 100644 --- a/ppd/hpcups/hp-officejet_series_500.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_500.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 3c7006e77..612a16a34 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 1f55aa8bf..18c2fc49d 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 930c92ca4..5d54c296c 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 32b085c2e..188fe1d55 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 0ed8bb28d..c4042d11a 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 70c92d87f..45d028072 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 bfcd0b44d..cb1d11281 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 e92f59ee5..b05f1d336 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 161762756..a735f2e1e 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 2bf03ddf5..920cdc379 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 d4aa87ad6..a80d8515b 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 f6ff73760..94f2ff30d 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 aae1d9f1e..7fd6281ae 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 1acad5166..c20d8192c 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 adacff03c..ae2277477 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 98acc9942..4f2055da9 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 41ace44e7..f91e474e6 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 723730bcb..766ccd1e4 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 cd4a0d8ad..7d747eafe 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 17701a715..1aec58707 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 9c0ec9e6c..1ef6c32b3 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 16a3de41c..50b396f04 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 0a274e0f6..6441233ac 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 ee73e6ac1..17c1b7975 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 53957493c..2a188bac3 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 4482ac77f..c846a7dc7 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 49bf9b830..364ff4f83 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 3338289b6..47702e4f4 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 b76a1b0be..c1b63a34e 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 015c75fa2..44418a11d 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 0d1a949cf..e663eeb05 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 a5699c150..980b60691 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 4391772eb..fc55ee303 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 01d791d4b..9a2afc84a 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 d57900037..ae9cb947c 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 1a0cb1ada..f9e994b36 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 d499bb808..24fd89f14 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_7150.ppd.gz b/ppd/hpcups/hp-photosmart_7150.ppd.gz Binary files differindex 4988f079a..36964991c 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 df774b3f7..da963b426 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 835926434..f0b374836 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 507dbe49c..b18a760b1 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 de3ec7108..c79d65dee 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_7550.ppd.gz b/ppd/hpcups/hp-photosmart_7550.ppd.gz Binary files differindex ded0993e6..cc521d2c8 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 36621367f..d93b41e5f 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 eede7f3c7..e537e0c6a 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 036ac1c25..f6266b7ec 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 d1030daf1..4630b80c4 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 91b2ac83f..b91edb053 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 1d8784810..984944a78 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 e2288d5b3..7d5c6a36d 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 88b40e6ff..4b7ff0607 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 f66a2bd63..d8d07e253 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 d241c86a2..58095b2fa 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 12787ca92..f55d0cada 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 8d8d4e23b..180c6582f 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 4458fa168..311f71253 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 38e44ad3d..038664d38 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 cf7851e21..9487d3acb 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 3b21d80fc..d9e2e7e2e 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 4bcdc5b02..566c3905d 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 74821da9c..c43952e0c 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 2deeb0fbf..344e044f4 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 95fa0d893..03cb8d321 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 8f42cc55d..74db0e378 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 714be503d..f17a8f145 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_b109a_series.ppd.gz b/ppd/hpcups/hp-photosmart_b109a_series.ppd.gz Binary files differindex 277dca751..b9d874ba8 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_b8500_series.ppd.gz b/ppd/hpcups/hp-photosmart_b8500_series.ppd.gz Binary files differindex af827affc..5647a649a 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 4d5b1ea26..213e398c0 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 01ad26368..d1ac02080 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 0fbabfc6e..f038085e8 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 004e4ea07..fbe36453e 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 9ad9e8142..fb2815c10 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 49a629c86..f5607c187 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 9fc4b55d7..cf6542237 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 63f5f2944..1c49eaabb 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 60da0c1c8..7202207c3 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 53e23cac3..99dba4758 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 f5d4c91c7..791af0039 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 11532154a..ade34d40c 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 1a5050479..25f68fdc8 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 1a3c98555..54a6eef22 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 dec76064a..86271f0d2 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 0109ab8b8..c796f713e 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 412c2d4d2..bf7f38a4d 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 36ec24b9c..565a6dc36 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 45fc0b742..f095b8265 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 ee9ceb1ee..cb444cfaf 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 differnew file mode 100644 index 000000000..30d96405e --- /dev/null +++ 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 15d3ec7e0..d588ea285 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 5e7c801b7..fb3acbc2f 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 839a32eef..3ec3c2691 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 61248f840..b44f591df 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 8e03a7325..fefebee0e 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 25a0645dc..45597c805 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 0643b6828..78beabdaf 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 580a06e39..e47dc47c5 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 3f958afa5..f2da29cc8 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 2f0b8eb1d..139de5070 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_p1000.ppd.gz b/ppd/hpcups/hp-photosmart_p1000.ppd.gz Binary files differindex f250a272e..7b122b337 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 66c68ce38..0cf3223f8 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 4f9d0c120..db0499ee0 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_prem-web_c309n-s.ppd.gz b/ppd/hpcups/hp-photosmart_prem-web_c309n-s.ppd.gz Binary files differindex 59da1531d..cce02c9ca 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_premium_c309g-m.ppd.gz b/ppd/hpcups/hp-photosmart_premium_c309g-m.ppd.gz Binary files differindex 1b854dd96..4673cf986 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 70d643803..9c1827e95 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 694cbe9cc..66acda375 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 c5f26ed49..11c96cf9b 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 89897bb3f..f851ae17a 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 1bfe7c021..2e6db4ed6 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 9d0fc8742..d1aa41e90 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 9d87ba692..55e10b391 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 ecf9a9ebc..d48deadf1 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 f31394809..437cf0cfe 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 0a595e0b1..372e5b669 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 463e22dfe..576d8de72 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 e71542b15..641d59747 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 2f74f0c4e..c88f86736 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 41d98b5b2..9340d280f 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 ae3cde8b5..d3b7a1a4c 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 fc6554b4c..63507ffff 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 e52605647..6125fb646 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 e37c9376a..420c03ca7 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 7b121f9da..5c689b8ce 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 7324c295b..db8327420 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 869979f44..6236a900c 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 c68cf9bfe..91d46bfd0 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 c5360d491..35146b6f3 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 d6e541c47..b1092171e 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 7e555d186..83e1bcc6c 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 27bbe6f71..03500e59c 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 128aaca1a..5bf97d3f1 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 6150d4ed0..78dfe00de 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 475f29184..1bccc6142 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 6293e60e3..82359a214 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 744bc03e5..f34df2dfd 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 261173c89..9d31ed491 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 d2c7e6979..13265883c 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 41186849f..19293a56b 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 1a606b02b..3bded1433 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 327da0609..3a646180b 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 d06639dd2..ba2d44582 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 d35b672ba..733f95a18 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 5498e17df..2bb8545e7 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 0d77e0ba9..6774d8037 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 ae9def0f9..626c66154 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 9c1482fca..6c101bdeb 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 52d7f9098..5905ce57e 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 25ced4cfd..6dfe91d06 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 ecaf4f882..3421b09ee 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 574a7a856..a95cd6b70 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 a51ac98a2..e9a477295 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 3f2673a72..f5046a173 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 14703cf05..1536348cf 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 ffeeae90a..6d6cee648 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 9f8a24486..bf022f575 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 4c949071b..50b722042 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 390bf1608..ed01fb1ab 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 9d3bd0252..e91d67a91 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 c6dabd07b..0b436cda7 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 3698bc5c2..d7e95efdf 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 75f01014a..24fea5e94 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 fb8ac6838..65c4e5f91 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 0ca2137a5..2b162b4e0 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 133cfa317..97c2e166a 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 d935d8e8a..b31c4f127 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 12a85639e..91b953a48 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 a922ba26f..727b37e94 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 0542e5eed..a3dbd2b08 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 d817f19e5..19338dacf 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 ae8ee8fca..b8b074887 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 1b9d71053..0f2eea2d3 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 03c219ff0..1ee59ee6f 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 65d45136e..56e2dec98 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 3293989ea..0aec459f8 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 7977bb5e5..db7dc9e82 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 2e19d21f1..206076f0e 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 9554c1c41..28934a8e4 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 0d134debb..9e9ffe28b 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 6b5a5747d..412f8d99f 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 cfacd40f6..5f80da8aa 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 002b5ecc7..96a94e46c 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 e8bd08712..c40eeeef2 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 ffa597fb7..06663fb82 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 c9e68ea46..e93992c94 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 978bf9703..794b9f242 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 68e286f4e..ec5a5a88e 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 20080b7e9..d853e2969 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 bbf58afd0..eb175de5d 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 72b5ac622..fd76511b3 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 aa56de86b..1157966af 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 1af0ce2d5..5b7a07f30 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 9af2f53db..cedf15847 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_cm4730_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm4730_mfp-hpijs-pcl3.ppd.gz Binary files differindex 5d0125eac..d5d478381 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 c7bdc3f60..218363bbc 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 a73c4a265..d4bc59adc 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 207c5f46f..831eb95dd 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 70f900654..3bff95321 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_cp1514n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp1514n-hpijs-pcl3.ppd.gz Binary files differindex 33cc65c76..7c5e8c9ff 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 b687a98b3..e28b1811a 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 4e3aea588..10ea11d26 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 6050dba1b..1ed5f4e96 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 3793c5a2d..8b078d1a3 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 22e9c4004..f4d1666e4 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 a08c8c810..59ae1eddf 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 eab15edfd..4764c8ded 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 c547795d6..341bc208f 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 3e5ab3083..4f4e01e5e 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 666d3ddac..1cd0c4729 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 f55745dbd..5edf48959 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 5940898f8..f2b31a314 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 94cb06e7f..6ccc693ac 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 e7724c1ad..dc0b73cff 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_cp6015-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz Binary files differindex 2431a3ee9..c9d170d2f 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-cp1160-hpijs.ppd.gz b/ppd/hpijs/hp-cp1160-hpijs.ppd.gz Binary files differindex 458410d02..3c00f3ac6 100644 --- a/ppd/hpijs/hp-cp1160-hpijs.ppd.gz +++ b/ppd/hpijs/hp-cp1160-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 0efb168fe..59b58c5e7 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 3ef838346..074fac028 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 953699c8a..c07ea76de 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 016df1f4c..3142dbf0c 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 3fdb6812b..cbe765bfc 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 3dd565fcd..da8f6f150 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_1600c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1600c-hpijs.ppd.gz Binary files differindex d65608d9d..059eb4408 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 09038aadf..05028bf17 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 2467f538d..5200d9823 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_3320-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3320-hpijs.ppd.gz Binary files differindex 331504c74..0e105bf82 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 5c2f77d4a..0a4534789 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 cd52accde..44918fb00 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 ffa854dd8..29158b4e2 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 16e591e00..7b931cf77 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 4d27b6166..a810499d9 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_3550-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3550-hpijs.ppd.gz Binary files differindex 8324f0e77..41ac5a47a 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 d98e05554..75d9231a9 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 fd89d28c9..140e9225f 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 f19bf4b67..6c626c29b 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 6a6cd54c4..d689ed670 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 2f03fa8c7..55b124020 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 cde43d009..37971bc37 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 6ee8bd0a7..fc7b28d04 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 85c036c0d..4f766f874 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 0cb9b91f8..2e6a52a16 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 5684397d7..ec04f7335 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 20b6020ee..2e088ac72 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 7391ee2b0..2f7de9280 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 83b1ff050..1117c7208 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 81cfe9b86..b6087a2c5 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 69174c371..06032e2e1 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 363cf8825..b4f4a28e5 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_460-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_460-hpijs.ppd.gz Binary files differindex 4e1d2acf1..452c1e7b7 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_500-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_500-hpijs.ppd.gz Binary files differindex 15beb0b2f..5be7551f5 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 5dd37e415..3610bc171 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 d76028167..f4493dee6 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 99e696063..a27559cfc 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 a2ebdc202..27425ef3e 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 b59a1f3c0..c917bd05d 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 f0040d6eb..ae23bd6f2 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 f1d3cea6a..59e9b00a2 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 93beaa669..30bdf33ca 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_5550-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5550-hpijs.ppd.gz Binary files differindex 31314dde0..438ff7b51 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 05873fa8d..2edcb4cdb 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 dd640866b..6bf7f992b 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 875867ae7..e495445f0 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 5d84b930d..bb75e2169 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 7a9202592..71d4a0708 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 3b3b04b4b..f102df211 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 a1d85eea7..112064814 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 3288a5873..d32eb3ea7 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 d64fba4fa..aa64c474b 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 4cd05a729..a082a2f3c 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 6663a1fa0..402cad567 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 77a802aca..665c7c745 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 897ef44ff..7181604cf 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 a16a427ac..12750e53d 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 879e54b7f..c6b335eb6 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 01d040a08..75f10ef0c 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 06ebc3a06..043860974 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 fd9e46d81..e5ceaa62b 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 0814a1f38..16b5109a2 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 8fa9b0dff..24107838a 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 6cb722c1d..4012deab5 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_656c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_656c-hpijs.ppd.gz Binary files differindex bf0170e40..5b36e4f93 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 79168b2f9..95aeeb7b1 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 5fc0d39d3..896580163 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 d3aa365ed..6f870ba2a 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 ad3842623..aacbe9527 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 0052006ac..2b832de49 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 fc4dcde5a..b294bc822 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 2046df030..4a0f0c9da 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 36a099a1c..4b7fb2bbd 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 a8a15d729..ca69eb8b9 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 8b477d779..2d5b1891a 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 7b565e1f8..af8df0b77 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 a852aa576..c09451f36 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 3babbabdc..749582a6d 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 6bf57fb68..a59695cdd 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 69dc883ad..99c3229f4 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 13e9fb1ae..ba4fa2a9b 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 9ebb67c25..6d91d2597 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 0ec56e35a..98550664e 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 5addff4b4..6b6a0fc2e 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 f1b48e62b..ddf8b3888 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 d1c9303cb..c0f482410 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 0893467a2..8056aa1bb 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 09f1a0fc2..f778097bf 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 5c0dfd4c1..0b3e1e013 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 f7a25a97f..9faca71bd 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 82f927cb1..8bd850fb9 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 eaf6ac5e6..2c8c6368c 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 64ac1054f..22350d8d1 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 4810d0feb..1447a38b2 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 e481188aa..d71283111 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 63c405dfb..cbd1718f1 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 9bb16883b..8dddbb051 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 4b1f65192..c5966e68d 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 c7593033e..65b387bed 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 a78d8e5ca..5d517e247 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 27953fb1d..b15d5dfa5 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 c405b422b..42a5d8ac2 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 280b39ef7..566256cf7 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 434dd0b2d..b9f5303b4 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 380d77fd7..b9b4ac00a 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 f470a9fae..46772c140 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 f24356b48..5f9123e71 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 bbab1988b..e21e06bae 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 9e58c4baa..72a033238 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 c8d3a177b..0206e7af5 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 14acc64c7..bd46f2021 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 06e29323f..70c728509 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 bb9df1fb7..b09e0cc32 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 ffddaba3e..eaf9ee487 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 cf4a9a067..07a044c3d 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 786d7aa7e..b2aff933d 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 7931669a9..4ecf3bd6c 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 8bdf40f29..e79003a2c 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 e20fb8419..cb927ec1f 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 c67a307a3..da0267189 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 b34bab2ab..1fad13e48 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 af261f109..becf10e1c 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 89c8eee5f..7a4027fa7 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 bf36bea26..cca70df39 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 c964eabc0..110e6d4d1 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 9dcf04e38..b3d921de2 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 024c13b37..23abd2c95 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 66d203af1..b586664e9 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 beaf92735..3902bb647 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 fd277a911..b97035e86 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 528ead26b..53f588854 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 34f9da5e2..f542bdcb8 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 13ffcb95a..234cdf23e 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 c072e1af6..d3122653d 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 2cd682356..040c32a75 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 0bdde342b..4e9a80652 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 c7d15994c..55b355f4d 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 d847f9ddd..26f03212b 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 70cf0804a..3ee712d06 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 e2c1846e6..eeab65cf2 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 1dc0dae1e..d8f3c5bb2 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 164180292..b331e293c 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 b77d979b5..23d54670c 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 20f471df5..9e0be9c73 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 6bf3b91ba..211a56bff 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 4f7c301ca..8d2eec976 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 218513c47..0942e40ca 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 7db196a85..d38386ef2 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 b02e7f790..985d8ca63 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_advant_k109a-z-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz Binary files differindex 11f3adbdd..d91594256 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 8a676678d..165032dd9 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 34d64344f..6db95ce8c 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 657cec3c2..15c0d1c17 100644 --- a/ppd/hpijs/hp-dj450-hpijs.ppd.gz +++ b/ppd/hpijs/hp-dj450-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 37939851b..ad6b056f0 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 94a7313a8..907cf2d29 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 bce854d57..d13fe1e4b 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 217ae22dd..85c631a2b 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 d9f349ce1..95f043069 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 db9ba0616..69e74e41e 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 a3b2d32ad..69437df16 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 934e59d81..4db47ef43 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 acb006afa..7ca3b9375 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 f2e047415..2cc77ca56 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 81c4e46a1..1da8476c5 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 1ac168fc4..b5540adf4 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 db1c49c57..77da76477 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 517aa30ac..53c2d8e38 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 800f3c7c3..a7ed17401 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 5b2d75085..ee4b91a80 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 b855e4ff7..28dd96e1c 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 bf0748e61..b62c38edf 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 f5f2e099c..c7904ccad 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 6916a3a25..1dc66fadb 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 84b7c856e..ccc7fd2fe 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 b12f99875..5293add50 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 891619573..e2704a717 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 e9b9f4bc9..93c36dada 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 3562a4717..c685fdbff 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 4b5b6aa4b..6144a3552 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 c44f41210..2177ecaf1 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 b841dd851..4b824e6a0 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 6803fbd99..7ac71c212 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 870e428ef..ccfba96c8 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 9d9dbf215..880c6360f 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 721f83f79..681853a80 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 75c520aa7..2d8f057e3 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 5f7067d3e..273c0edbf 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 f5f8122cb..65568ed1a 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 a547258b1..d613431b1 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 057fa3bd7..db3853f63 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 0467dd58f..9d5f78ffa 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 a38ec343d..31ca55bc9 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 2dfd56914..195114801 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 180d9be54..aa1e037cb 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 4861f860e..246c97969 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 9e2d50b1c..b4e5470e4 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 c92d5a964..8a2fc92b1 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 f30241fa2..0171ed49d 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 ee6a23ebd..600a3c9c6 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 771699c08..77e8fa723 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 d75093a27..c88524f66 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 4f4d3b3a8..e070d84d5 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 63b976da2..d1442875c 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 4611c95a2..b2f0e9e68 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 fc01d6b18..84ffd0224 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 557e4e816..f82d663d2 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 cedefa3c4..61c16d10d 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 3823489d9..e70b1e24f 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 71e93b30b..4c4e0b3d6 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 b0d878f9b..d19a170f0 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 3e25e1ddf..e68fd092b 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 85983cd83..226615b64 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 8f3bcd5ad..2d70c0728 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 a0df77289..4aaf8d7f7 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 f5ce7e9f7..ddbed2df0 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 7c7e3d4ce..9d81e0b75 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 088ee6a54..1619e5f7f 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 63e5065c5..2978719a6 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 4f0f0fd57..b7a417ee9 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 8fd147e2a..42fc9fb39 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 4e8183ab3..d3ea73ddc 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 8c1945c60..0f78dd38e 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 0d7e71340..d3f7674fb 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 40ef85466..a90d67141 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 d4cef32c8..7f3766fbc 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 f7640f6ad..101c4cf2a 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 310444ad8..70aaf722d 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 1af1775ba..6e47c9628 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 56531758f..74e689336 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 53e82747d..94eb2ea12 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 39caf70dd..4f52f0668 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 610c6205a..b82def36a 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 1b28171c0..06e0ba00d 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 6cc3580ce..42ee83672 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 cf3574b10..3e8b3efe3 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 debb5c8eb..33bdee444 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 0389aea13..156ecccdc 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 d4d627682..a4d0a1b24 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 d2937a8cb..a15200827 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 e6201fe3f..3798f6d77 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 98aae5133..d99e806dd 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 76f61f052..1de064716 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 27ded8c24..516f0f813 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 05a470224..63228daf0 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 2fee85b33..85cafa6a7 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 e8fc4e275..1fba3ecf5 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 ccc065bdd..4f4c79768 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 1b77596c2..770cb81d7 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 109af3a99..466379c02 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 603ba4208..43723ddbc 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 d8c2c0230..09d04565a 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 137b497d9..41acad54a 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 ff32ad101..2ad15bf67 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 bbbb48daa..a5af86014 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_m1005-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_m1005-hpijs.ppd.gz Binary files differindex 34a4e5cef..16daa3bd6 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 8eccde09b..f1012f901 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 130ce9e6f..78cf7a7b3 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 e1f5c2305..02166ac3d 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 8678980b0..687401bef 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_m2727_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m2727_mfp-hpijs-pcl3.ppd.gz Binary files differindex fb7c9c1d1..25ebf6b37 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 4a014ad88..bf53a290a 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 bcca51627..77be40ed6 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 f495d0913..5cf3cf215 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 070417afb..af97261e2 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 751210aea..7cff95f18 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 72487f1cf..6e474c326 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 differnew file mode 100644 index 000000000..14204ee09 --- /dev/null +++ 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 d65201861..794a64e9b 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 b0da6fc49..9defd4712 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 02a6a679d..6af5ab50b 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 3a8ea3de8..1cd56408e 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 d22bb5793..dd6e7e24a 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 8cdbd9d99..b720b9a0a 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 64e6a4eda..e272908ee 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 cacc52fca..187a762c4 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 cb084a6ab..caac21aaf 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 fb3e0d2a0..5cdfe051b 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 f83f2ea00..5a0835aef 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 d607ce8f2..7b51fd83d 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 281f5ef8a..110b1102f 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 764ce5f8e..0b8e3e32b 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 3692658b3..bf0a1810c 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 e18bc68dd..c1275335f 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 36525e70b..f3f1880ae 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 6556ca83c..39c9b4539 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 aed73e01f..9c92c36c9 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 097354910..52d70c411 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 2c0ee9017..f1fd4b8b5 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 87ecd2eda..26490800f 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 f709890a9..31184aa0a 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 36eb965b9..c548e534b 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 33df2a1b1..be0d6c455 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 795e67a1f..440abb3c3 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 42a4cd8a2..3bf21f52c 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 1ee201a1f..31e709fd2 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 85df0e940..643a0fdcf 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 ed02950aa..aade1a3ee 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 e603d1db1..0fccf7b5f 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 8812e2f70..f82851691 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 e8cd75074..649813c20 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 5dc89599e..a8c65c2ac 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 d8e32d52f..79a836858 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 76c5e6bc9..8f6834bd0 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 04b6b6973..d4b410cec 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 212313e41..46efc0dd6 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 b0d512b83..f36a2ea12 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 8bb31bde3..874cbe8b2 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 e0b736069..d5a4e8358 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 01b558cef..afef15b84 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 7c32e2d0f..4432eec04 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 e6127137c..b9d1101d9 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_professional_m1132_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..c531afdef --- /dev/null +++ b/ppd/hpijs/hp-laserjet_professional_m1132_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 differnew file mode 100644 index 000000000..50fb107a3 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_professional_m1212nf_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 differnew file mode 100644 index 000000000..fa9e7da2b --- /dev/null +++ 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 differnew file mode 100644 index 000000000..f4741f63a --- /dev/null +++ b/ppd/hpijs/hp-laserjet_professional_p1102w-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 differnew file mode 100644 index 000000000..a65a9f3ed --- /dev/null +++ b/ppd/hpijs/hp-laserjet_professional_p1566-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 differnew file mode 100644 index 000000000..6f81b8a89 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_professional_p1606dn-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 61142b281..5f65e2a0b 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 faa6a3f7b..30f35e496 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 84d2ef4e1..79e77be2b 100644 --- a/ppd/hpijs/hp-officejet-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet-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 differnew file mode 100644 index 000000000..c70dfce28 --- /dev/null +++ b/ppd/hpijs/hp-officejet_150_mobile_l511-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 differnew file mode 100644 index 000000000..f2adcba61 --- /dev/null +++ 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 5c4dc5ac5..6a8fa39fd 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 fc7b000d7..2ada33a09 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 5985ef99c..2f8b677e1 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 6cf7b8825..544497297 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 97485dde1..484d69446 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 2d7b3dbbd..ce0cacf40 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 differnew file mode 100644 index 000000000..65803c1d9 --- /dev/null +++ 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 975f8dd49..21c71f0dd 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 f6da1691a..5b79a717e 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_5100_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_5100_series-hpijs.ppd.gz Binary files differindex 159feb65f..d0978031b 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 022fea358..5ac9eadc8 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 f0f474eff..92e8636a3 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 ff010a053..233626045 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 e730af1a9..bea099c8b 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 9c3d18d5d..fb279604a 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 a2ce09339..b9a295353 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 dc924195f..f2a82321b 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_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6100_series-hpijs.ppd.gz Binary files differindex 77f0a3c1d..5af107e51 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 038a6b393..41bdee2ea 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 27f8e8656..3a9f48723 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 03fdf91c4..97b666456 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 9b612feba..4b9c27ac4 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 5b443f90a..73f17ff4a 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_7000_e809a-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7000_e809a-hpijs.ppd.gz Binary files differindex cc2fc1e15..5106f27c8 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_7100_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7100_series-hpijs.ppd.gz Binary files differindex 5a8fcb794..ce92fbf2f 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_7200_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7200_series-hpijs.ppd.gz Binary files differindex ecee502f1..5d690e16a 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 c8e896a40..432c3e6c2 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 9ac3759b5..2deb4d22b 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_9100_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-officejet_9100_series-hpijs-pcl3.ppd.gz Binary files differindex b6fe3b975..f309c7d86 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 771f06fd4..a2851041a 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 788e52958..120e6bc5a 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 d0431825a..b6d52c741 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 279ea31af..4d9d7ee90 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 9188e770c..5e8540a59 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 a125cbf5c..f2f99a0fe 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 319ab86ec..ba34577f3 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_j3600_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j3600_series-hpijs.ppd.gz Binary files differindex 8ca05ebe6..50c2b5b96 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 ede0f1ab7..d02f2d32b 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 25128ff09..37d295fc2 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 0196c4cce..470425b35 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 b8316915a..2f3a3fba0 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 8ef9c534c..4f0b0a017 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 2ae717b3a..20855c820 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 19901ad73..520947cfe 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 4056bf5d6..75429483b 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 2cff8f816..fc4128ec2 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 a7e356fa5..bc0c047be 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 17f615efd..1983806c4 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 3eeebd1a6..7cb10ea92 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 7c12fa188..f15ccc0a3 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 c1b571386..9d748ef42 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_8000_a809-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8000_a809-hpijs.ppd.gz Binary files differindex 39cd28be5..1d5a7a87c 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_8500_a909a-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8500_a909a-hpijs.ppd.gz Binary files differindex b1f6a5b2f..ac7d226ad 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 99341dc71..22ce54b0f 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 c41947a86..e9821ced1 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_k5300-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_k5300-hpijs.ppd.gz Binary files differindex 13bfaa5ad..271ea90c4 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 ded10432b..809ec0b61 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 b49a25c50..23e682aa1 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 0d29253e4..845bf587b 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 52ebf4e1b..bf0970b9d 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 3dd222b5d..6163f135d 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 12350e4ba..e0a603507 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 f4856dbd5..be8ab0d3e 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 d8b02468a..5f761c3ef 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 79f29dfc2..0aa3d61ac 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 155f20851..a75dfa691 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 2bafaaa4c..2b2ee4215 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 40f6f4ff8..7f279eb01 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 e5b10b460..17af68220 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 f518c4293..c3c270eaf 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 55067f39a..37cbfecf0 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 8c3811bcf..8c7bc0165 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 f8c4be73e..f8cb4989e 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 ca7817f70..197567851 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 57a7fa5c5..aed871d64 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 a281b23ce..32ba5446d 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 73917bd88..1442b3df2 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_500-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_500-hpijs.ppd.gz Binary files differindex 8733f8920..7494a66cb 100644 --- a/ppd/hpijs/hp-officejet_series_500-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_500-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 39fd7f9ac..4242b61b8 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 270a6ebfe..d3dfdb6db 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 c291bdaba..a3c482b83 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 fdcbe92ac..c08e87f3b 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 2e85bad6d..646cf4b1a 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 d09cc2aa8..4b1784630 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 12adc5591..99fffae84 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 bb56f0475..eb0b056b8 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 529fa1b35..c30883a18 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 6671aaaf2..fe48fbccb 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 ae8e450f2..69918ddd0 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 64a266c2b..884f55d7d 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 239e97fd7..9c8c1718a 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 1a1220f15..020bc8882 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 a16a7bb97..b87be9c18 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 a728d331b..e8d3de043 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 ebc81b687..4ec3d77b7 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 e6e5eaf35..deec62295 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 c819de23e..d99a224c6 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 a1007ab13..7ecd54441 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 724e681f5..04cebae67 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 9680ebfaa..e3897f615 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 52b86269c..c6999af11 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 13cd97ab6..55a18c163 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 ad8f454f0..d55e9d57f 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 8622707fb..b7a56b26d 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 b20c06d15..1f6940d10 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 5feed832a..435e16794 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 dd6749cae..2af3ba841 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 f2432c8a7..123de3e54 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 e62dd526d..4a57d1d89 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 b07066d68..0e878ce53 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 59c6737e2..e3162089f 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 4e963c52b..013dee97d 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 21c20315c..73c274c42 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 702d0dcb6..6b7e7ba53 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 59dd75794..fe2bb527c 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_7150-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7150-hpijs.ppd.gz Binary files differindex c79f08f97..a5a8c0032 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 e11cd7632..799d2b6a8 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 8fb9ba522..e1941b88c 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 de8833da2..6aa27af4a 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 9e5b94e92..9831ffe94 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_7550-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7550-hpijs.ppd.gz Binary files differindex 65b8fdd6a..b35cceeef 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 280d310e0..521c87b80 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 0e99b2a7c..382d9f602 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 14e4f6385..b65a5f2d8 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 6bbbf84a1..0b662df7e 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 240a1dfcc..d5f2e2918 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 f162bcd28..d03a2e47a 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 467872413..7f904ed79 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 7f8991fa7..d284699bc 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 3f5b6d906..e35dda4db 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 8b5e60b33..4b0d62d1f 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 7dfd8cde6..d452e53ca 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 a0c7929d5..8dcc96eb4 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 73b4eaea5..328e677c7 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 ebd07a11b..4d10228bb 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 c6884b7c9..72dc9721d 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 504464171..5eb49b37b 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 6bec2ef7d..1a74a0294 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 75aeb0b7f..82b5e424b 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 53f33bf72..c41a2a0cd 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 9bd74f7bb..8fe43a24e 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 585f2cb77..db2b22117 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 82ed1ba9f..3b62b4e5c 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_b109a_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_b109a_series-hpijs.ppd.gz Binary files differindex 7ca18f80d..089fe3dcb 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_b8500_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_b8500_series-hpijs.ppd.gz Binary files differindex 0dd39fcb5..5c012b8ba 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 4d58e14ac..4f222a1ff 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 96cb5ac23..3d8d84994 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 30c10ef2f..9bd78b096 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 c19ed9405..813eb670a 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 c36646a47..8ff65bd99 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 e43eeeb37..35d46d197 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 7b236fc07..fb7020265 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 0093d8abf..5215c30fe 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 e2c42dcd8..48bfab88c 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 1919e5c7e..b390672cf 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 030ce51cc..0c7e3a8b3 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 2cefff5cd..60f9a28ea 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 7d4226acc..3e6498c21 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 03ef8134c..59ccc965d 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 c1ce9b93d..a2d5f8647 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 8f481f924..2c1a9d9d9 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 67d464fc2..2e7754548 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 767282a68..d8081e041 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 3a67c9c6e..eda409787 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 e0000ff14..fac3833ac 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 differnew file mode 100644 index 000000000..a4becdd1b --- /dev/null +++ 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 79056334a..72aa58826 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 85ad3af98..40696e68f 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 3f0135117..5c4a5d349 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 10a02e9c0..cf0d515a0 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 2c9e7fdbb..607e871d2 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 52607473c..8dedd1ac9 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 751cb972d..137d9d5c8 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 a015cfbd9..c5f8812f8 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 fafb39819..44f9669b4 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 79ae236ed..84fd5f911 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_p1000-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_p1000-hpijs.ppd.gz Binary files differindex f75a8df46..9aa8b74d4 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 20206b9c6..bae7fbe5c 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 6ccf21cf0..39a26d1b2 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_prem-web_c309n-s-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz Binary files differindex 1fd15b899..6c417417f 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_premium_c309g-m-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_premium_c309g-m-hpijs.ppd.gz Binary files differindex c5956c2e8..1328076ac 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 698026b4d..e3c164e2c 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 fce3c1826..78628985e 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 9a1e9d47d..bfba9bbc8 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 e90947191..70f992299 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 9b9edb73c..dc6e2fe89 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 529b13006..59b877a32 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 ff1bef420..430796541 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 eb3f6c4b6..120ed2721 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 6f70f8c84..8475a0cb8 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 e3d1567e1..a3b309565 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 ea25de66f..620f6d3a2 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 3bb71d422..0eecc538d 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 a21f71a3b..d2c038f41 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 1a04f0ee6..dba00f387 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 898370196..f11f8e4e5 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 0191740d5..376cea41c 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 f92bd02b5..9b0935fa6 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 55e814ce1..0d1f46168 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 35af8fb89..61dc783ca 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 1e13f7864..dc67a5047 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 26fef6ba1..4dbc51b6f 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 377544088..c7792aaf9 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 320ce90be..e6823fbfd 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 4dc7094a6..26a910819 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 5bb9eee5b..f011d90cf 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 1c11cd0c7..de2c6bcd3 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 e90f30b5c..a8cfa7168 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 483e5290b..f7cb99331 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 1380e9ba1..b36ccdc72 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 e1cbc827c..1474ceba7 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 35ac0abe0..8b0f6ab55 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 99b7c4246..4a9733a78 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 9bd97d960..214246099 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 22831986d..987c9c575 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 bfef004e3..26391a526 100644 --- a/ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz diff --git a/prnt/cups.py b/prnt/cups.py index 3e42802bd..bf82c4d91 100644 --- a/prnt/cups.py +++ b/prnt/cups.py @@ -481,7 +481,7 @@ def getPPDFile2(stripped_model, ppds): # New PPD find num_matches = len(matches) if num_matches == 0: - log.error("No PPD found for model %s using new algorithm. Trying old algorithm..." % stripped_model) + log.warn("No PPD found for model %s using new algorithm. Trying old algorithm..." % stripped_model) matches2 = getPPDFile(stripModel(stripped_model), ppds).items() log.debug(matches2) num_matches2 = len(matches2) diff --git a/prnt/drv/hpcups.drv.in b/prnt/drv/hpcups.drv.in index 177920540..79a763834 100644 --- a/prnt/drv/hpcups.drv.in +++ b/prnt/drv/hpcups.drv.in @@ -201,6 +201,9 @@ // Added new tech subclass NoMaxDPI for Python class. // Python B-size: Added paper sizes: B7(ISO), B7(JIS), 10x20cm (tab), 4x10in, 4x11in, 4x12in, Double A4 // +// 05/07/10 adhir +// Added new class for LjZjsMono with NoAutoDuplex and no multiple trays. +// // Include necessary files... #include <font.defs> //#include <media.defs> @@ -2150,6 +2153,14 @@ Manufacturer "HP" // <%DJ55xx:Normal%> { + ModelName "HP Officejet 150 Mobile l511" + Attribute "NickName" "" "HP Officejet 150 Mobile l511, $Version" + Attribute "ShortNickName" "" "HP Officejet 150 Mobile l511" + Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 150 mobile l511;DES:officejet 150 mobile l511;" + PCFileName "hp-officejet_150_mobile_l511.ppd" + Attribute "Product" "" "(HP Officejet 150 Mobile l511 All-in-one Printer)" + } + { ModelName "HP Deskjet 460" Attribute "NickName" "" "HP Deskjet 460, $Version" Attribute "ShortNickName" "" "HP Deskjet 460" @@ -4460,6 +4471,14 @@ Manufacturer "HP" // <%ViperPlusVIP:Normal%> { + ModelName "HP Photosmart d110 Series" + Attribute "NickName" "" "HP Photosmart d110 Series, $Version" + Attribute "ShortNickName" "" "HP Photosmart d110 Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart d110 series;DES:photosmart d110 series;" + PCFileName "hp-photosmart_d110_series.ppd" + Attribute "Product" "" "(HP Photosmart d110 Series Printer)" + } + { ModelName "HP Deskjet f4400 Series" Attribute "NickName" "" "HP Deskjet f4400 Series, $Version" Attribute "ShortNickName" "" "HP Deskjet f4400 Series" @@ -4477,6 +4496,14 @@ Manufacturer "HP" Attribute "Product" "" "(HP Deskjet f4492 All-in-one Printer)" } { + ModelName "HP Officejet 4400 k410" + Attribute "NickName" "" "HP Officejet 4400 k410, $Version" + Attribute "ShortNickName" "" "HP Officejet 4400 k410" + Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4400 k410;DES:officejet 4400 k410;" + PCFileName "hp-officejet_4400_k410.ppd" + Attribute "Product" "" "(HP Officejet 4400 k410 All-in-one Printer)" + } + { ModelName "HP Officejet 4500 g510a-f" Attribute "NickName" "" "HP Officejet 4500 g510a-f, $Version" Attribute "ShortNickName" "" "HP Officejet 4500 g510a-f" @@ -4872,6 +4899,14 @@ Manufacturer "HP" Attribute "Product" "" "(HP Deskjet d2668 Printer)" Attribute "Product" "" "(HP Deskjet d2680 Printer)" } + { + ModelName "HP Officejet 4000 k210" + Attribute "NickName" "" "HP Officejet 4000 k210, $Version" + Attribute "ShortNickName" "" "HP Officejet 4000 k210" + Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4000 k210;DES:officejet 4000 k210;" + PCFileName "hp-officejet_4000_k210.ppd" + Attribute "Product" "" "(HP Officejet 4000 k210 Printer)" + } } // End Supported media sizes with full bleed. } // End ViperPlusTrim @@ -9165,14 +9200,6 @@ Group "RLT/HP Real Life Technologies" Attribute "Product" "" "(HP LaserJet p2035 Printer)" } { - ModelName "HP LaserJet p2055" - Attribute "NickName" "" "HP LaserJet p2055 pcl3, $Version" - Attribute "ShortNickName" "" "HP LaserJet p2055" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2055;DES:hp laserjet p2055;" - PCFileName "hp-laserjet_p2055-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet p2055 Printer)" - } - { ModelName "HP LaserJet p2055dn" Attribute "NickName" "" "HP LaserJet p2055dn pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet p2055dn" @@ -9181,6 +9208,14 @@ Group "RLT/HP Real Life Technologies" Attribute "Product" "" "(HP LaserJet p2055dn Printer)" } { + ModelName "HP LaserJet p2055" + Attribute "NickName" "" "HP LaserJet p2055 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet p2055" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2055;DES:hp laserjet p2055;" + PCFileName "hp-laserjet_p2055-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet p2055 Printer)" + } + { ModelName "HP LaserJet p2055d" Attribute "NickName" "" "HP LaserJet p2055d pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet p2055d" @@ -9907,6 +9942,14 @@ Group "RLT/HP Real Life Technologies" Attribute "Product" "" "(HP LaserJet m5035xs Multifunction Printer)" } { + ModelName "HP LaserJet m5039 MFP" + Attribute "NickName" "" "HP LaserJet m5039 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m5039 MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m5039 mfp;DES:hp laserjet m5039 mfp;" + PCFileName "hp-laserjet_m5039_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m5039 Multifunction Printer)" + } + { ModelName "HP LaserJet 5100 Series" Attribute "NickName" "" "HP LaserJet 5100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5100 Series" @@ -12826,6 +12869,138 @@ Group "RLT/HP Real Life Technologies" } // End Supported media sizes. } // End LJZjsMono (for proprietary plugin) +///////////////// LJZjsMono with No Auto Duplex and No multiple Trays (for proprietary plugin) +{ + Attribute "hpPrinterLanguage" "" "ljzjstream" + + Group "General/General" + + Attribute "cupsIPPReason" "hplip.plugin-error/printer requires a binary plugin, run hp-setup" "" + + // MediaPosition values map to MediaSource enumeration in global_types.h + Option "InputSlot/Media Source" PickOne AnySetup 10.0 + *Choice "Auto/Auto-Select" "<</MediaPosition 7>>setpagedevice" + Choice "Manual/Manual Feeder" "<</MediaPosition 2>>setpagedevice" + + // cupsRowCount values map to PEN_TYPE + 1 from global_types.h + Option "ColorModel/Output Mode" PickOne AnySetup 10.0 + *Choice "Gray/Grayscale" "<</cupsColorSpace 3/cupsBitsPerColor 1/cupsRowCount 1/cupsRowStep 2>>setpagedevice" + + // cupsMediaType values map to MEDIATYPE from global_types.h + Option "MediaType/Media Type" PickOne AnySetup 10.0 + *Choice "Plain/Plain Paper" "<</MediaType(Plain)/cupsMediaType 0>>setpagedevice" + + // cupsCompression values map to QUALITY_MODE from global_types.h + Option "OutputMode/Print Quality" PickOne AnySetup 10.0 + *Choice "Normal/Normal" "<</OutputType(0)/HWResolution[600 600]>>setpagedevice" + Choice "Draft/Draft" "<</OutputType(-1)/HWResolution[600 600]>>setpagedevice" + + + Attribute "cupsModelName" "" "HP LaserJet 1018" // APDK device class + + { +// 4x6 or smaller + CustomMedia "A6/A6 105x148mm" 298 420 12 12 12 12 "<</PageSize[298 420]/ImagingBBox null>>setpagedevice" + "<</cupsInteger0 24/PageSize[298 420]/ImagingBBox null>>setpagedevice" + +// 5x7 + CustomMedia "A5/A5 148x210mm" 420 595 12 12 12 12 "<</PageSize[420 595]/ImagingBBox null>>setpagedevice" + "<</cupsInteger0 25/PageSize[420 595]/ImagingBBox null>>setpagedevice" + +// Standard + CustomMedia "Postcard/Postcard" 283 420 12 12 12 12 "<</PageSize[283 420]/ImagingBBox null>>setpagedevice" + "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" + CustomMedia "DoublePostcard/Double Postcard" 420 567 12 12 12 12 "<</PageSize[420 567]/ImagingBBox null>>setpagedevice" + "<</cupsInteger0 72/PageSize[420 567]/ImagingBBox null>>setpagedevice" + CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 15.5 18 15.5 "<</PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice" + "<</cupsInteger0 96/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice" + CustomMedia "Executive/Executive 7.25x10.5in" 522 756 12 12 12 12 "<</PageSize[522 756]/ImagingBBox null>>setpagedevice" + "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice" + CustomMedia "16k195x270/16k 195x270mm" 553 765 18 15.5 18 15.5 "<</PageSize[553 765]/ImagingBBox null>>setpagedevice" + "<</cupsInteger0 34/PageSize[553 765]/ImagingBBox null>>setpagedevice" + CustomMedia "16k184x260/16k 184x260mm" 522 737 12 12 12 12 "<</PageSize[522 737]/ImagingBBox null>>setpagedevice" + "<</cupsInteger0 89/PageSize[522 737]/ImagingBBox null>>setpagedevice" + CustomMedia "16k197x273/16k 197x273mm" 558 774 12 12 12 12 "<</PageSize[558 774]/ImagingBBox null>>setpagedevice" + "<</cupsInteger0 17/PageSize[558 774]/ImagingBBox null>>setpagedevice" + *CustomMedia "Letter/Letter 8.5x11in" 612 792 12 12 12 12 "<</PageSize[612 792]/ImagingBBox null>>setpagedevice" + "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" + CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 15.5 18 15.5 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" + "<</cupsInteger0 9/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" + CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 12 12 12 12 "<</PageSize[612 936]/ImagingBBox null>>setpagedevice" + "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice" + CustomMedia "Legal/Legal 8.5x14in" 612 1008 12 12 12 12 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice" + "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" + +// Envelope + CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 18 15.5 18 15.5 "<</PageSize[279 540]/ImagingBBox null>>setpagedevice" + "<</cupsInteger0 96/PageSize[279 540]/ImagingBBox null>>setpagedevice" + CustomMedia "EnvDL/DL Envelope 110x220mm" 311.76 623.52 18 15.5 18 15.5 "<</PageSize[311.76 623.52]/ImagingBBox null>>setpagedevice" + "<</cupsInteger0 27/PageSize[311.76 623.52]/ImagingBBox null>>setpagedevice" + CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 12 12 12 12 "<</PageSize[297 684]/ImagingBBox null>>setpagedevice" + "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice" + CustomMedia "EnvC5/C5 Envelope 162x229mm" 459 649 12 12 12 12 "<</PageSize[459 649]/ImagingBBox null>>setpagedevice" + "<</cupsInteger0 91/PageSize[459 649]/ImagingBBox null>>setpagedevice" + CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 12 12 12 12 "<</PageSize[499 709]/ImagingBBox null>>setpagedevice" + "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice" + + // Custom page sizes + HWMargins 12 12 12 12 + VariablePaperSize Yes + MinSize 3in 5in + MaxSize 17in 36in + + // <%LJZjsMono:NoAutoDuplex%> + { + ModelName "HP LaserJet Professional p1102w" + Attribute "NickName" "" "HP LaserJet Professional p1102w, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet Professional p1102w" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional p1102w;DES:hp laserjet professional p1102w;" + PCFileName "hp-laserjet_professional_p1102w.ppd" + Attribute "Product" "" "(HP LaserJet Professional p1102w Printer)" + } + { + ModelName "HP LaserJet Professional p1102" + Attribute "NickName" "" "HP LaserJet Professional p1102, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet Professional p1102" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional p1102;DES:hp laserjet professional p1102;" + PCFileName "hp-laserjet_professional_p1102.ppd" + Attribute "Product" "" "(HP LaserJet Professional p1102 Printer)" + } + { + ModelName "HP LaserJet Professional m1132 MFP" + Attribute "NickName" "" "HP LaserJet Professional m1132 MFP, $Version" + Attribute "ShortNickName" "" "HP LJ Professional m1132 MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional m1132 mfp;DES:hp laserjet professional m1132 mfp;" + PCFileName "hp-laserjet_professional_m1132_mfp.ppd" + Attribute "Product" "" "(HP LaserJet Professional m1132 Multifunction Printer)" + } + { + ModelName "HP LaserJet Professional m1212nf MFP" + Attribute "NickName" "" "HP LaserJet Professional m1212nf MFP, $Version" + Attribute "ShortNickName" "" "HP LJ Professional m1212nf MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional m1212nf mfp;DES:hp laserjet professional m1212nf mfp;" + PCFileName "hp-laserjet_professional_m1212nf_mfp.ppd" + Attribute "Product" "" "(HP LaserJet Professional m1212nf Multifunction Printer)" + } + { + ModelName "HP LaserJet Professional p1566" + Attribute "NickName" "" "HP LaserJet Professional p1566, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet Professional p1566" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional p1566;DES:hp laserjet professional p1566;" + PCFileName "hp-laserjet_professional_p1566.ppd" + Attribute "Product" "" "(HP LaserJet Professional p1566)" + } + { + ModelName "HP LaserJet Professional p1606dn" + Attribute "NickName" "" "HP LaserJet Professional p1606dn, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LJ Professional p1606dn" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional p1606dn;DES:hp laserjet professional p1606dn;" + PCFileName "hp-laserjet_professional_p1606dn.ppd" + Attribute "Product" "" "(HP LaserJet Professional p1606dn Printer)" + } + } // End Supported media sizes. +} // End LJZjsMono with No Auto Duplex and No multiple Tray (for proprietary plugin) + ///////////////////// LJZjsColor (for proprietary plugin) { Attribute "hpPrinterLanguage" "" "ljzjstream" diff --git a/prnt/drv/hpijs.drv.in b/prnt/drv/hpijs.drv.in index 50cc96e54..f4ff495d3 100644 --- a/prnt/drv/hpijs.drv.in +++ b/prnt/drv/hpijs.drv.in @@ -2287,6 +2287,14 @@ lity:PenSet=2,Quality:FullBleed=1" CustomMedia "w612h935/Executive (JIS)" 612.00 935.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=w612h935" "%% FoomaticRIPOptionSetting: PageSize=w612h935" // <%DJ55xx:Normal%> { + ModelName "HP Officejet 150 Mobile l511 hpijs" + Attribute "NickName" "" "HP Officejet 150 Mobile l511 hpijs, $Version" + Attribute "ShortNickName" "" "HP OJ 150 Mobile l511 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 150 mobile l511;DES:officejet 150 mobile l511;" + PCFileName "hp-officejet_150_mobile_l511-hpijs.ppd" + Attribute "Product" "" "(HP Officejet 150 Mobile l511 All-in-one Printer)" + } + { ModelName "HP Deskjet 460 hpijs" Attribute "NickName" "" "HP Deskjet 460 hpijs, $Version" Attribute "ShortNickName" "" "HP Deskjet 460 hpijs" @@ -6659,14 +6667,6 @@ t=0" Attribute "Product" "" "(HP LaserJet p2035 Printer)" } { - ModelName "HP LaserJet p2055 hpijs" - Attribute "NickName" "" "HP LaserJet p2055 hpijs pcl3, $Version" - Attribute "ShortNickName" "" "HP LaserJet p2055 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2055;DES:hp laserjet p2055;" - PCFileName "hp-laserjet_p2055-hpijs-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet p2055 Printer)" - } - { ModelName "HP LaserJet p2055dn hpijs" Attribute "NickName" "" "HP LaserJet p2055dn hpijs pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet p2055dn hpijs" @@ -6675,6 +6675,14 @@ t=0" Attribute "Product" "" "(HP LaserJet p2055dn Printer)" } { + ModelName "HP LaserJet p2055 hpijs" + Attribute "NickName" "" "HP LaserJet p2055 hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet p2055 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2055;DES:hp laserjet p2055;" + PCFileName "hp-laserjet_p2055-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet p2055 Printer)" + } + { ModelName "HP LaserJet p2055d hpijs" Attribute "NickName" "" "HP LaserJet p2055d hpijs pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet p2055d hpijs" @@ -7363,6 +7371,14 @@ t=0" Attribute "Product" "" "(HP LaserJet m5035xs Multifunction Printer)" } { + ModelName "HP LaserJet m5039 MFP hpijs" + Attribute "NickName" "" "HP LaserJet m5039 MFP hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m5039 MFP hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m5039 mfp;DES:hp laserjet m5039 mfp;" + PCFileName "hp-laserjet_m5039_mfp-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m5039 Multifunction Printer)" + } + { ModelName "HP LaserJet 5100 Series hpijs" Attribute "NickName" "" "HP LaserJet 5100 Series hpijs pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5100 Series hpijs" @@ -11225,6 +11241,176 @@ Transparency" } } // end LJZjsMono (for proprietary plugin) +///////////////////// LJZjsMono with No Auto Duplex (for proprietary plugin) +{ + Attribute "DefaultResolution" "" "600dpi" + + // Custom page sizes from 1x4in to Ledger + HWMargins 18 14.4 18 14.4 + VariablePaperSize Yes + MinSize 1in 4in + MaxSize 11in 17in + Attribute "FoomaticRIPOptionSetting" "PageSize=Custom" " -dDEVICEWIDTHPOINTS=0 -dD&& +EVICEHEIGHTPOINTS=0" + + Attribute "FoomaticIDs" "" "HP-LaserJet_1018 hpijs" + Attribute "FoomaticRIPCommandLine" "" "gs -q -dBATCH -dPARANOIDSAFER -dQUIET -dNOPA&& +USE -sDEVICE=ijs -sIjsServer=hpijs%A%B%C%D -dIjsUseOutputFD%Z -sOutputFi&& +le=- -" + Attribute "FoomaticRIPOption" "Model" "enum CmdLine A 100" + Attribute "FoomaticRIPOptionSetting" "Model=HP-LaserJet_1018" " -sDeviceManufactur&& +er="HEWLETT-PACKARD" -sDeviceModel="HP LaserJet 1018"" + Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=600DraftGraysca&& +leK" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=600GrayscaleK" + Attribute "FoomaticRIPOption" "MediaType" "enum CmdLine C" + Attribute "FoomaticRipOptionSetting" "MediaType=Plain" ",Quality:MediaType=0" + Attribute "FoomaticRipOptionSetting" "MediaType=Transparency" ",Quality:MediaType=3" + Attribute "FoomaticRipOptionSetting" "MediaType=Photo" ",Quality:MediaType=3" + Attribute "FoomaticRIPOption" "InputSlot" "enum CmdLine D" + Attribute "FoomaticRIPOptionSetting" "InputSlot=Default" ",PS:MediaPosition=7" + Attribute "FoomaticRIPOptionSetting" "InputSlot=Manual" ",PS:MediaPosition=2" + Attribute "FoomaticRIPOption" "PageSize" "enum CmdLine A" + Attribute "FoomaticRIPOptionSetting" "PageSize=Letter" " -dDEVICEWIDTHPOINTS=612 -&& +dDEVICEHEIGHTPOINTS=792" + Attribute "FoomaticRIPOptionSetting" "PageSize=A4" " -dDEVICEWIDTHPOINTS=595 -dDEV&& +ICEHEIGHTPOINTS=842" + Attribute "FoomaticRIPOptionSetting" "PageSize=Photo" " -dDEVICEWIDTHPOINTS=288 -d&& +DEVICEHEIGHTPOINTS=432" + Attribute "FoomaticRIPOptionSetting" "PageSize=Photo5x7" " -dDEVICEWIDTHPOINTS=360&& + -dDEVICEHEIGHTPOINTS=504" + Attribute "FoomaticRIPOptionSetting" "PageSize=3x5" " -dDEVICEWIDTHPOINTS=216 -dDE&& +VICEHEIGHTPOINTS=360" + Attribute "FoomaticRIPOptionSetting" "PageSize=5x8" " -dDEVICEWIDTHPOINTS=360 -dDE&& +VICEHEIGHTPOINTS=576" + Attribute "FoomaticRIPOptionSetting" "PageSize=A5" " -dDEVICEWIDTHPOINTS=420 -dDEV&& +ICEHEIGHTPOINTS=595" + Attribute "FoomaticRIPOptionSetting" "PageSize=A6" " -dDEVICEWIDTHPOINTS=297 -dDEV&& +ICEHEIGHTPOINTS=420" + Attribute "FoomaticRIPOptionSetting" "PageSize=B5JIS" " -dDEVICEWIDTHPOINTS=516 -d&& +DEVICEHEIGHTPOINTS=729" + Attribute "FoomaticRIPOptionSetting" "PageSize=Env10" " -dDEVICEWIDTHPOINTS=297 -d&& +DEVICEHEIGHTPOINTS=684" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvC5" " -dDEVICEWIDTHPOINTS=459 -d&& +DEVICEHEIGHTPOINTS=649" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvC6" " -dDEVICEWIDTHPOINTS=323 -d&& +DEVICEHEIGHTPOINTS=459" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvDL" " -dDEVICEWIDTHPOINTS=312 -d&& +DEVICEHEIGHTPOINTS=624" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvISOB5" " -dDEVICEWIDTHPOINTS=499&& + -dDEVICEHEIGHTPOINTS=709" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvMonarch" " -dDEVICEWIDTHPOINTS=2&& +79 -dDEVICEHEIGHTPOINTS=540" + Attribute "FoomaticRIPOptionSetting" "PageSize=Executive" " -dDEVICEWIDTHPOINTS=52&& +2 -dDEVICEHEIGHTPOINTS=756" + Attribute "FoomaticRIPOptionSetting" "PageSize=FLSA" " -dDEVICEWIDTHPOINTS=612 -dD&& +EVICEHEIGHTPOINTS=936" + Attribute "FoomaticRIPOptionSetting" "PageSize=Hagaki" " -dDEVICEWIDTHPOINTS=283 -&& +dDEVICEHEIGHTPOINTS=420" + Attribute "FoomaticRIPOptionSetting" "PageSize=Legal" " -dDEVICEWIDTHPOINTS=612 -d&& +DEVICEHEIGHTPOINTS=1008" + Attribute "FoomaticRIPOptionSetting" "PageSize=Oufuku" " -dDEVICEWIDTHPOINTS=567 -&& +dDEVICEHEIGHTPOINTS=420" + Attribute "FoomaticRIPOptionSetting" "PageSize=w558h774" " -dDEVICEWIDTHPOINTS=558&& + -dDEVICEHEIGHTPOINTS=774" + Attribute "FoomaticRIPOptionSetting" "PageSize=w612h935" " -dDEVICEWIDTHPOINTS=612&& + -dDEVICEHEIGHTPOINTS=935" + Attribute "FoomaticRIPOption" "Quality" "enum CmdLine B" + Attribute "FoomaticRIPOptionSetting" "Quality=600DraftGrayscaleK" " -r600 -sIjsPar&& +ams=Quality:Quality=1,Quality:ColorMode=0,Quality:PenSet=0" + Attribute "FoomaticRIPOptionSetting" "Quality=600GrayscaleK" " -r600 -sIjsParams=Q&& +uality:Quality=0,Quality:ColorMode=0,Quality:PenSet=0" + Group "General/General" + Option "PrintoutMode/Printout Mode" PickOne AnySetup 10.0 + Choice "Draft/Draft (Economy)" "%% FoomaticRIPOptionSetting: PrintoutMode=Draft" + *Choice "Normal/Normal" "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" + Option "MediaType/Media Type" PickOne AnySetup 10.0 + *Choice "Plain/Plain Paper" "%% FoomaticRIPOptionSetting: MediaType=Plain" + Choice "Transparency/Transparency" "%% FoomaticRIPOptionSetting: MediaType=&& +Transparency" + Choice "Photo/Photo Paper" "%% FoomaticRIPOptionSetting: MediaType=Photo" + Option "InputSlot/Media Source" PickOne AnySetup 100.0 + *Choice "Default/Automatic" "%% FoomaticRIPOptionSetting: InputSlot=Default" + Choice "Manual/Manual Feeder" "%% FoomaticRIPOptionSetting: InputSlot=Manual" + Group "PrintoutMode/Printout Mode" + Option "Quality/Resolution, Quality, Toner Type, Media Type" PickOne AnySetup 100.0 + *Choice "FromPrintoutMode/Controlled by 'Printout Mode'" "%% FoomaticRIPOptionSetting: Quality=@PrintoutMode" + Choice "600DraftGrayscaleK/600 dpi, Draft, Grayscale, Black Toner" "%% FoomaticRIPOptionSetting: Quality=600DraftGrayscaleK" + Choice "600GrayscaleK/600 dpi, Normal, Grayscale, Black Toner" "%% FoomaticRIPOptionSetting: Quality=600GrayscaleK" + *CustomMedia "Letter/Letter" 612.00 792.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Letter" "%% FoomaticRIPOptionSetting: PageSize=Letter" + CustomMedia "A4/A4" 595.00 842.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=A4" "%% FoomaticRIPOptionSetting: PageSize=A4" + CustomMedia "Photo/Photo/4x6 inch index card" 288.00 432.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Photo" "%% FoomaticRIPOptionSetting: PageSize=Photo" + CustomMedia "Photo5x7/Photo/5x7 inch index card" 360.00 504.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Photo5x7" "%% FoomaticRIPOptionSetting: PageSize=Photo5x7" + CustomMedia "3x5/3x5 inch index card" 216.00 360.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=3x5" "%% FoomaticRIPOptionSetting: PageSize=3x5" + CustomMedia "5x8/5x8 inch index card" 360.00 576.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=5x8" "%% FoomaticRIPOptionSetting: PageSize=5x8" + CustomMedia "A5/A5" 420.00 595.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=A5" "%% FoomaticRIPOptionSetting: PageSize=A5" + CustomMedia "A6/A6" 297.00 420.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=A6" "%% FoomaticRIPOptionSetting: PageSize=A6" + CustomMedia "B5JIS/B5 (JIS)" 516.00 729.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=B5JIS" "%% FoomaticRIPOptionSetting: PageSize=B5JIS" + CustomMedia "Env10/Envelope #10" 297.00 684.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Env10" "%% FoomaticRIPOptionSetting: PageSize=Env10" + CustomMedia "EnvC5/Envelope C5" 459.00 649.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=EnvC5" "%% FoomaticRIPOptionSetting: PageSize=EnvC5" + CustomMedia "EnvC6/Envelope C6" 323.00 459.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=EnvC6" "%% FoomaticRIPOptionSetting: PageSize=EnvC6" + CustomMedia "EnvDL/Envelope DL" 312.00 624.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=EnvDL" "%% FoomaticRIPOptionSetting: PageSize=EnvDL" + CustomMedia "EnvISOB5/Envelope B5" 499.00 709.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=EnvISOB5" "%% FoomaticRIPOptionSetting: PageSize=EnvISOB5" + CustomMedia "EnvMonarch/Envelope Monarch" 279.00 540.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" + CustomMedia "Executive/Executive" 522.00 756.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Executive" "%% FoomaticRIPOptionSetting: PageSize=Executive" + CustomMedia "FLSA/American Foolscap" 612.00 936.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=FLSA" "%% FoomaticRIPOptionSetting: PageSize=FLSA" + CustomMedia "Hagaki/Hagaki" 283.00 420.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Hagaki" "%% FoomaticRIPOptionSetting: PageSize=Hagaki" + CustomMedia "Legal/Legal" 612.00 1008.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Legal" "%% FoomaticRIPOptionSetting: PageSize=Legal" + CustomMedia "Oufuku/Oufuku-Hagaki" 567.00 420.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Oufuku" "%% FoomaticRIPOptionSetting: PageSize=Oufuku" + CustomMedia "w558h774/16K" 558.00 774.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=w558h774" "%% FoomaticRIPOptionSetting: PageSize=w558h774" + CustomMedia "w612h935/Executive (JIS)" 612.00 935.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=w612h935" "%% FoomaticRIPOptionSetting: PageSize=w612h935" + // <%LJZjsMono:NoAutoDuplex%> + { + ModelName "HP LaserJet Professional p1102w hpijs" + Attribute "NickName" "" "HP LaserJet Professional p1102w hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LJ Professional p1102w hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional p1102w;DES:hp laserjet professional p1102w;" + PCFileName "hp-laserjet_professional_p1102w-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet Professional p1102w Printer)" + } + { + ModelName "HP LaserJet Professional p1102 hpijs" + Attribute "NickName" "" "HP LaserJet Professional p1102 hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LJ Professional p1102 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional p1102;DES:hp laserjet professional p1102;" + PCFileName "hp-laserjet_professional_p1102-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet Professional p1102 Printer)" + } + { + ModelName "HP LaserJet Professional m1132 MFP hpijs" + Attribute "NickName" "" "HP LaserJet Professional m1132 MFP hpijs, $Version" + Attribute "ShortNickName" "" "HP LJ Pro m1132 MFP hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional m1132 mfp;DES:hp laserjet professional m1132 mfp;" + PCFileName "hp-laserjet_professional_m1132_mfp-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet Professional m1132 Multifunction Printer)" + } + { + ModelName "HP LaserJet Professional m1212nf MFP hpijs" + Attribute "NickName" "" "HP LaserJet Professional m1212nf MFP hpijs, $Version" + Attribute "ShortNickName" "" "HP LJ Pro m1212nf MFP hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional m1212nf mfp;DES:hp laserjet professional m1212nf mfp;" + PCFileName "hp-laserjet_professional_m1212nf_mfp-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet Professional m1212nf Multifunction Printer)" + } + { + ModelName "HP LaserJet Professional p1566 hpijs" + Attribute "NickName" "" "HP LaserJet Professional p1566 hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LJ Professional p1566 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional p1566;DES:hp laserjet professional p1566;" + PCFileName "hp-laserjet_professional_p1566-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet Professional p1566)" + } + { + ModelName "HP LaserJet Professional p1606dn hpijs" + Attribute "NickName" "" "HP LaserJet Professional p1606dn hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LJ Pro p1606dn hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional p1606dn;DES:hp laserjet professional p1606dn;" + PCFileName "hp-laserjet_professional_p1606dn-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet Professional p1606dn Printer)" + } +} // end LJZjsMono with No Auto Duplex (for proprietary plugin) + ///////////// LJJetReady (for proprietary plugin) { Attribute "DefaultResolution" "" "600dpi" @@ -12400,6 +12586,14 @@ lity:PenSet=2,Quality:FullBleed=1" CustomMedia "w612h935/Executive (JIS)" 612.00 935.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=w612h935" "%% FoomaticRIPOptionSetting: PageSize=w612h935" // <%ViperPlusVIP:Normal%> { + ModelName "HP Photosmart d110 Series hpijs" + Attribute "NickName" "" "HP Photosmart d110 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Photosmart d110 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart d110 series;DES:photosmart d110 series;" + PCFileName "hp-photosmart_d110_series-hpijs.ppd" + Attribute "Product" "" "(HP Photosmart d110 Series Printer)" + } + { ModelName "HP Deskjet f4400 Series hpijs" Attribute "NickName" "" "HP Deskjet f4400 Series hpijs, $Version" Attribute "ShortNickName" "" "HP Deskjet f4400 Series hpijs" @@ -12417,6 +12611,14 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Deskjet f4492 All-in-one Printer)" } { + ModelName "HP Officejet 4400 k410 hpijs" + Attribute "NickName" "" "HP Officejet 4400 k410 hpijs, $Version" + Attribute "ShortNickName" "" "HP Officejet 4400 k410 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4400 k410;DES:officejet 4400 k410;" + PCFileName "hp-officejet_4400_k410-hpijs.ppd" + Attribute "Product" "" "(HP Officejet 4400 k410 All-in-one Printer)" + } + { ModelName "HP Officejet 4500 g510a-f hpijs" Attribute "NickName" "" "HP Officejet 4500 g510a-f hpijs, $Version" Attribute "ShortNickName" "" "HP Officejet 4500 g510a-f hpijs" @@ -12993,6 +13195,14 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Deskjet d2668 Printer)" Attribute "Product" "" "(HP Deskjet d2680 Printer)" } + { + ModelName "HP Officejet 4000 k210 hpijs" + Attribute "NickName" "" "HP Officejet 4000 k210 hpijs, $Version" + Attribute "ShortNickName" "" "HP Officejet 4000 k210 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4000 k210;DES:officejet 4000 k210;" + PCFileName "hp-officejet_4000_k210-hpijs.ppd" + Attribute "Product" "" "(HP Officejet 4000 k210 Printer)" + } } // end ViperPlusTrim /////////////// ViperMinusTrim diff --git a/prnt/drv/hpijs.drv.in.template b/prnt/drv/hpijs.drv.in.template index df6edf2e7..18a935e34 100644 --- a/prnt/drv/hpijs.drv.in.template +++ b/prnt/drv/hpijs.drv.in.template @@ -5565,6 +5565,128 @@ Transparency" // <%LJZjsMono:Normal%> } // end LJZjsMono (for proprietary plugin) +///////////////////// LJZjsMono with No Auto Duplex (for proprietary plugin) +{ + Attribute "DefaultResolution" "" "600dpi" + + // Custom page sizes from 1x4in to Ledger + HWMargins 18 14.4 18 14.4 + VariablePaperSize Yes + MinSize 1in 4in + MaxSize 11in 17in + Attribute "FoomaticRIPOptionSetting" "PageSize=Custom" " -dDEVICEWIDTHPOINTS=0 -dD&& +EVICEHEIGHTPOINTS=0" + + Attribute "FoomaticIDs" "" "HP-LaserJet_1018 hpijs" + Attribute "FoomaticRIPCommandLine" "" "gs -q -dBATCH -dPARANOIDSAFER -dQUIET -dNOPA&& +USE -sDEVICE=ijs -sIjsServer=hpijs%A%B%C%D -dIjsUseOutputFD%Z -sOutputFi&& +le=- -" + Attribute "FoomaticRIPOption" "Model" "enum CmdLine A 100" + Attribute "FoomaticRIPOptionSetting" "Model=HP-LaserJet_1018" " -sDeviceManufactur&& +er="HEWLETT-PACKARD" -sDeviceModel="HP LaserJet 1018"" + Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=600DraftGraysca&& +leK" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=600GrayscaleK" + Attribute "FoomaticRIPOption" "MediaType" "enum CmdLine C" + Attribute "FoomaticRipOptionSetting" "MediaType=Plain" ",Quality:MediaType=0" + Attribute "FoomaticRipOptionSetting" "MediaType=Transparency" ",Quality:MediaType=3" + Attribute "FoomaticRipOptionSetting" "MediaType=Photo" ",Quality:MediaType=3" + Attribute "FoomaticRIPOption" "InputSlot" "enum CmdLine D" + Attribute "FoomaticRIPOptionSetting" "InputSlot=Default" ",PS:MediaPosition=7" + Attribute "FoomaticRIPOptionSetting" "InputSlot=Manual" ",PS:MediaPosition=2" + Attribute "FoomaticRIPOption" "PageSize" "enum CmdLine A" + Attribute "FoomaticRIPOptionSetting" "PageSize=Letter" " -dDEVICEWIDTHPOINTS=612 -&& +dDEVICEHEIGHTPOINTS=792" + Attribute "FoomaticRIPOptionSetting" "PageSize=A4" " -dDEVICEWIDTHPOINTS=595 -dDEV&& +ICEHEIGHTPOINTS=842" + Attribute "FoomaticRIPOptionSetting" "PageSize=Photo" " -dDEVICEWIDTHPOINTS=288 -d&& +DEVICEHEIGHTPOINTS=432" + Attribute "FoomaticRIPOptionSetting" "PageSize=Photo5x7" " -dDEVICEWIDTHPOINTS=360&& + -dDEVICEHEIGHTPOINTS=504" + Attribute "FoomaticRIPOptionSetting" "PageSize=3x5" " -dDEVICEWIDTHPOINTS=216 -dDE&& +VICEHEIGHTPOINTS=360" + Attribute "FoomaticRIPOptionSetting" "PageSize=5x8" " -dDEVICEWIDTHPOINTS=360 -dDE&& +VICEHEIGHTPOINTS=576" + Attribute "FoomaticRIPOptionSetting" "PageSize=A5" " -dDEVICEWIDTHPOINTS=420 -dDEV&& +ICEHEIGHTPOINTS=595" + Attribute "FoomaticRIPOptionSetting" "PageSize=A6" " -dDEVICEWIDTHPOINTS=297 -dDEV&& +ICEHEIGHTPOINTS=420" + Attribute "FoomaticRIPOptionSetting" "PageSize=B5JIS" " -dDEVICEWIDTHPOINTS=516 -d&& +DEVICEHEIGHTPOINTS=729" + Attribute "FoomaticRIPOptionSetting" "PageSize=Env10" " -dDEVICEWIDTHPOINTS=297 -d&& +DEVICEHEIGHTPOINTS=684" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvC5" " -dDEVICEWIDTHPOINTS=459 -d&& +DEVICEHEIGHTPOINTS=649" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvC6" " -dDEVICEWIDTHPOINTS=323 -d&& +DEVICEHEIGHTPOINTS=459" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvDL" " -dDEVICEWIDTHPOINTS=312 -d&& +DEVICEHEIGHTPOINTS=624" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvISOB5" " -dDEVICEWIDTHPOINTS=499&& + -dDEVICEHEIGHTPOINTS=709" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvMonarch" " -dDEVICEWIDTHPOINTS=2&& +79 -dDEVICEHEIGHTPOINTS=540" + Attribute "FoomaticRIPOptionSetting" "PageSize=Executive" " -dDEVICEWIDTHPOINTS=52&& +2 -dDEVICEHEIGHTPOINTS=756" + Attribute "FoomaticRIPOptionSetting" "PageSize=FLSA" " -dDEVICEWIDTHPOINTS=612 -dD&& +EVICEHEIGHTPOINTS=936" + Attribute "FoomaticRIPOptionSetting" "PageSize=Hagaki" " -dDEVICEWIDTHPOINTS=283 -&& +dDEVICEHEIGHTPOINTS=420" + Attribute "FoomaticRIPOptionSetting" "PageSize=Legal" " -dDEVICEWIDTHPOINTS=612 -d&& +DEVICEHEIGHTPOINTS=1008" + Attribute "FoomaticRIPOptionSetting" "PageSize=Oufuku" " -dDEVICEWIDTHPOINTS=567 -&& +dDEVICEHEIGHTPOINTS=420" + Attribute "FoomaticRIPOptionSetting" "PageSize=w558h774" " -dDEVICEWIDTHPOINTS=558&& + -dDEVICEHEIGHTPOINTS=774" + Attribute "FoomaticRIPOptionSetting" "PageSize=w612h935" " -dDEVICEWIDTHPOINTS=612&& + -dDEVICEHEIGHTPOINTS=935" + Attribute "FoomaticRIPOption" "Quality" "enum CmdLine B" + Attribute "FoomaticRIPOptionSetting" "Quality=600DraftGrayscaleK" " -r600 -sIjsPar&& +ams=Quality:Quality=1,Quality:ColorMode=0,Quality:PenSet=0" + Attribute "FoomaticRIPOptionSetting" "Quality=600GrayscaleK" " -r600 -sIjsParams=Q&& +uality:Quality=0,Quality:ColorMode=0,Quality:PenSet=0" + Group "General/General" + Option "PrintoutMode/Printout Mode" PickOne AnySetup 10.0 + Choice "Draft/Draft (Economy)" "%% FoomaticRIPOptionSetting: PrintoutMode=Draft" + *Choice "Normal/Normal" "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" + Option "MediaType/Media Type" PickOne AnySetup 10.0 + *Choice "Plain/Plain Paper" "%% FoomaticRIPOptionSetting: MediaType=Plain" + Choice "Transparency/Transparency" "%% FoomaticRIPOptionSetting: MediaType=&& +Transparency" + Choice "Photo/Photo Paper" "%% FoomaticRIPOptionSetting: MediaType=Photo" + Option "InputSlot/Media Source" PickOne AnySetup 100.0 + *Choice "Default/Automatic" "%% FoomaticRIPOptionSetting: InputSlot=Default" + Choice "Manual/Manual Feeder" "%% FoomaticRIPOptionSetting: InputSlot=Manual" + Group "PrintoutMode/Printout Mode" + Option "Quality/Resolution, Quality, Toner Type, Media Type" PickOne AnySetup 100.0 + *Choice "FromPrintoutMode/Controlled by 'Printout Mode'" "%% FoomaticRIPOptionSetting: Quality=@PrintoutMode" + Choice "600DraftGrayscaleK/600 dpi, Draft, Grayscale, Black Toner" "%% FoomaticRIPOptionSetting: Quality=600DraftGrayscaleK" + Choice "600GrayscaleK/600 dpi, Normal, Grayscale, Black Toner" "%% FoomaticRIPOptionSetting: Quality=600GrayscaleK" + *CustomMedia "Letter/Letter" 612.00 792.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Letter" "%% FoomaticRIPOptionSetting: PageSize=Letter" + CustomMedia "A4/A4" 595.00 842.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=A4" "%% FoomaticRIPOptionSetting: PageSize=A4" + CustomMedia "Photo/Photo/4x6 inch index card" 288.00 432.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Photo" "%% FoomaticRIPOptionSetting: PageSize=Photo" + CustomMedia "Photo5x7/Photo/5x7 inch index card" 360.00 504.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Photo5x7" "%% FoomaticRIPOptionSetting: PageSize=Photo5x7" + CustomMedia "3x5/3x5 inch index card" 216.00 360.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=3x5" "%% FoomaticRIPOptionSetting: PageSize=3x5" + CustomMedia "5x8/5x8 inch index card" 360.00 576.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=5x8" "%% FoomaticRIPOptionSetting: PageSize=5x8" + CustomMedia "A5/A5" 420.00 595.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=A5" "%% FoomaticRIPOptionSetting: PageSize=A5" + CustomMedia "A6/A6" 297.00 420.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=A6" "%% FoomaticRIPOptionSetting: PageSize=A6" + CustomMedia "B5JIS/B5 (JIS)" 516.00 729.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=B5JIS" "%% FoomaticRIPOptionSetting: PageSize=B5JIS" + CustomMedia "Env10/Envelope #10" 297.00 684.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Env10" "%% FoomaticRIPOptionSetting: PageSize=Env10" + CustomMedia "EnvC5/Envelope C5" 459.00 649.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=EnvC5" "%% FoomaticRIPOptionSetting: PageSize=EnvC5" + CustomMedia "EnvC6/Envelope C6" 323.00 459.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=EnvC6" "%% FoomaticRIPOptionSetting: PageSize=EnvC6" + CustomMedia "EnvDL/Envelope DL" 312.00 624.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=EnvDL" "%% FoomaticRIPOptionSetting: PageSize=EnvDL" + CustomMedia "EnvISOB5/Envelope B5" 499.00 709.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=EnvISOB5" "%% FoomaticRIPOptionSetting: PageSize=EnvISOB5" + CustomMedia "EnvMonarch/Envelope Monarch" 279.00 540.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" + CustomMedia "Executive/Executive" 522.00 756.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Executive" "%% FoomaticRIPOptionSetting: PageSize=Executive" + CustomMedia "FLSA/American Foolscap" 612.00 936.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=FLSA" "%% FoomaticRIPOptionSetting: PageSize=FLSA" + CustomMedia "Hagaki/Hagaki" 283.00 420.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Hagaki" "%% FoomaticRIPOptionSetting: PageSize=Hagaki" + CustomMedia "Legal/Legal" 612.00 1008.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Legal" "%% FoomaticRIPOptionSetting: PageSize=Legal" + CustomMedia "Oufuku/Oufuku-Hagaki" 567.00 420.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Oufuku" "%% FoomaticRIPOptionSetting: PageSize=Oufuku" + CustomMedia "w558h774/16K" 558.00 774.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=w558h774" "%% FoomaticRIPOptionSetting: PageSize=w558h774" + CustomMedia "w612h935/Executive (JIS)" 612.00 935.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=w612h935" "%% FoomaticRIPOptionSetting: PageSize=w612h935" + // <%LJZjsMono:NoAutoDuplex%> +} // end LJZjsMono with No Auto Duplex (for proprietary plugin) + ///////////// LJJetReady (for proprietary plugin) { Attribute "DefaultResolution" "" "600dpi" 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 3a86cf3c7..d6c983984 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 68b112529..3f0e71109 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 94424ab75..bb08d9144 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 405cf50ae..f31bf7625 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 bc287169a..f8417540c 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 b5792e415..5f7d015e8 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 198a11608..150be7406 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 3b1aae27b..6cccad9b6 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 5ecb06c7f..0e556c87e 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 2d93e5aaa..f35ce45f3 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 9d4ced6f2..b8a748302 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 39ef79e96..a2ecebeef 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 e64c24646..64d93eb71 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 bffe8aee1..1a171868a 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 47c4887bb..bababb6a0 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 933ca02d0..d75afb2d5 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 07798e7bd..ef0e185e2 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 39d162238..c3940ed92 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 31a975313..7140349ff 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 c60c2308c..4ed35b5e6 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 b5d2977b0..3ae227665 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 2c082140c..cb28a4f8a 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 bffdefe9c..2de9a251a 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 1ffe5a671..7b0bdb109 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 5083c4914..c19e594be 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 f8f320d3d..94627c506 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 05ff9b304..60e0474d2 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 38f15a911..64ca25c47 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 700af2d2d..6537b462d 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 b493786ad..7ffcdeaa9 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 76ad0a2d8..f3cb94dc0 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 8de908aa8..13468a54c 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 bbbc9ef22..1ffdd45f3 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 2d472c99c..5f1109b23 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 4d4e25e45..383a9e170 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 a6226b463..f3c4741a7 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 cd46bff90..c16e5a427 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 b000bc3a8..b4975f196 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 99e7acaf7..da708c3be 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 6eb6161d6..4a50c3cba 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 c71211948..f0319a7fd 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 ddeb9228a..b6a99e53b 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 0b1808564..a9bfa1439 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 92adcb312..64b9c9e22 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 07efce253..09aef03f3 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 490e5605a..c1dfbb03f 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 bb2c5f2a0..c0ad18ad2 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 288f196d6..932bbbc9b 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 0432d59b2..d2f8f70ce 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_cm4730_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz Binary files differindex 4cfb72e78..58bf2d922 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 7d4cc5152..faec6d8e5 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 f6a97d4ef..6e8880e8c 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 f9b93a14b..346b0e200 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 ab9836c67..a3ebf80f9 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 25bb9b56c..ec42c6e61 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 a83b65ebe..b60fd4178 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 588acbc43..65669b199 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 ea859266d..f591b2c75 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 c64dc41f4..5fc31121f 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 32b1d90b3..7d2e75c70 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 0651453c0..f5c0af0f6 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 04a67d44f..6281ee297 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 d835da572..d89fa1386 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 7a88fc90f..2a39a2842 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 9d387d613..1883f194c 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 e18c307aa..8ce92fa3d 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 6d6767003..c5b8b0681 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 ccd4cf7eb..932e09068 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_cp6015-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp6015-ps.ppd.gz Binary files differindex 99a42aa40..7b05b78c1 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-designjet_4020ps-ps.ppd.gz b/prnt/ps/hp-designjet_4020ps-ps.ppd.gz Binary files differindex 6b2d14f6c..378235a89 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_4520mfp-ps.ppd.gz b/prnt/ps/hp-designjet_4520mfp-ps.ppd.gz Binary files differindex b42c6be35..e828f11aa 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 3e85fff89..e7296ac9a 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_t1120ps_24in-ps.ppd.gz b/prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz Binary files differdeleted file mode 100644 index 86d8a403a..000000000 --- a/prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz +++ /dev/null diff --git a/prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz b/prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz Binary files differdeleted file mode 100644 index d7e968ade..000000000 --- a/prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz +++ /dev/null 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 8e35261ec..4de7744b3 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_t770_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t770_postscript-ps.ppd.gz Binary files differindex e4c1ccd8f..fcafa4cdf 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 b1f649283..111c51532 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-laserjet_1200-ps.ppd.gz b/prnt/ps/hp-laserjet_1200-ps.ppd.gz Binary files differindex 9a73c7239..94dada28e 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 804655ef9..a7a83cd37 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 1a56f54cb..ba6e5de43 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 62706a4f6..b52ed2ab6 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 8d26d92fa..f4a8eb4ab 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 37c2cf096..9a80f9e16 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 25b456e6f..1e3195ae6 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 43fab0e6e..643db4fbb 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 bf5c74598..c562ffd51 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 c612b8653..186e6390d 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 80fa546f3..4f56e8a79 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 1a676bbf9..00b74263f 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_2100-ps.ppd.gz b/prnt/ps/hp-laserjet_2100-ps.ppd.gz Binary files differindex 151c1fbff..afe239bc6 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 96b8da46a..238048e43 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 768fc0b00..53794551b 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 bdc24c8fd..37dfc6dcf 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 8836c17d4..10186fb7c 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 385573d48..ef7c4c9aa 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 b5cd3629d..90dac3e29 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 cec011207..12009f9e9 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 48a25c7f2..a1503d845 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 daa0a923a..0e098fceb 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 03d204137..11ee14c3a 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 137fbeeee..8a1858071 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 41663b5f3..b0aed6c2c 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 154f20213..7fc42b139 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 4c067d2ad..c6a05714b 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 6ad67af12..38b888c49 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 91cd6c665..3e86f8df9 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 2d07683eb..1b8d24f2b 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 42eeca21c..35057fef3 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 07202db24..6911178ff 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_4050_series-ps.ppd.gz b/prnt/ps/hp-laserjet_4050_series-ps.ppd.gz Binary files differindex bbe5665fb..102d41dda 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 0e6f05fe9..2083d51a9 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 8f8d97d3c..d4eb568d3 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 586fcb5b8..9b980bc32 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 3897fe0ed..ea18688d1 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 62a52b7aa..60f5fce6f 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 93db9fca4..6c5738fbb 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 934fd2a18..aac0ef966 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 888ee284f..38396d98e 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 12c677e9c..c1718ebbf 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 4f53a37e6..d3c985ca0 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 8136279c1..008974962 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 3eedc2fe5..d91c4c8a1 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 c6b12d2eb..6b1b30361 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 2140ad7c9..de32a1721 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 59b29fbb3..9223cc8e9 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_5100_series-ps.ppd.gz b/prnt/ps/hp-laserjet_5100_series-ps.ppd.gz Binary files differindex fedc36e72..2af02b0ee 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 f87834b8c..8bd1cd1d9 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 83353fcea..207eb34cf 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 ab0fa2a23..49df7c74d 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 e64ffbcb8..10b1daa20 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 d0c770101..60f7d880f 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 761bdf616..e43ec38fa 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 85bc0cb4e..7ea0354e9 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_6mp-ps.ppd.gz b/prnt/ps/hp-laserjet_6mp-ps.ppd.gz Binary files differindex 8d198eb40..4fa4c2409 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 cadd9c3fc..9a14e949f 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_8000-ps.ppd.gz b/prnt/ps/hp-laserjet_8000-ps.ppd.gz Binary files differindex 6b903c9f4..0679c832a 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 b8c33d2ff..9c1286f6e 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 d86b9dd7b..b92afaa14 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 1862cc0a1..7a0b4f5ab 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 1be5b19e5..7b56b9094 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 af7598f9a..9ce775502 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 9d899d2e7..8b69bf1ef 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 6dd320141..db8114b67 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 f6c4e5d3e..853b199ec 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 afaa369c9..3a441cc07 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 a03d04ca0..40010dca8 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 f9fae8ea9..503f489ec 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 2eb602c61..aab7636d8 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_m1522_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m1522_mfp-ps.ppd.gz Binary files differindex c894749b8..10bb25718 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 bcf61afc8..70cb48977 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 60fe3e29f..b61e43715 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_m2727_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m2727_mfp-ps.ppd.gz Binary files differindex 64a2d1522..8db99a910 100644 --- a/prnt/ps/hp-laserjet_m2727_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m2727_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m2727nf_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m2727nf_mfp-ps.ppd.gz Binary files differindex 1da857fb3..c132148aa 100644 --- a/prnt/ps/hp-laserjet_m2727nf_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m2727nf_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m2727nfs_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m2727nfs_mfp-ps.ppd.gz Binary files differindex eba0467a9..1174093b9 100644 --- a/prnt/ps/hp-laserjet_m2727nfs_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m2727nfs_mfp-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 ff342b504..5af165023 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 2252b1912..d95dc7403 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 95e5ee5b6..8ac298c83 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 3c1c817b1..a9b02d7eb 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_m5025_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m5025_mfp-ps.ppd.gz Binary files differindex 84826ee02..66c04c40e 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 e8dfa14fc..5eb26332d 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_m9040_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m9040_mfp-ps.ppd.gz Binary files differindex bb1763d78..ae36c9b91 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 1257e49d5..71f89830b 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 d861bfd97..6f3c2173a 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_p2015_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz Binary files differindex 553c34660..c5e0c32f2 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_p2015dn_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.gz Binary files differindex 67729c73e..8dab2fb79 100644 --- a/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.gz Binary files differindex d4fef17eb..581c55a9a 100644 --- a/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.gz Binary files differindex 467e71614..098ac4b96 100644 --- a/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p2055-ps.ppd.gz b/prnt/ps/hp-laserjet_p2055-ps.ppd.gz Binary files differindex 3afcedcec..dbe96190d 100644 --- a/prnt/ps/hp-laserjet_p2055-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p2055-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p2055d-ps.ppd.gz b/prnt/ps/hp-laserjet_p2055d-ps.ppd.gz Binary files differindex c438b2b76..ff4de26a0 100644 --- a/prnt/ps/hp-laserjet_p2055d-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p2055d-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p2055dn-ps.ppd.gz b/prnt/ps/hp-laserjet_p2055dn-ps.ppd.gz Binary files differindex 89252089f..cda9bd1a5 100644 --- a/prnt/ps/hp-laserjet_p2055dn-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p2055dn-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p2055x-ps.ppd.gz b/prnt/ps/hp-laserjet_p2055x-ps.ppd.gz Binary files differindex 48f042680..e42d6ff3e 100644 --- a/prnt/ps/hp-laserjet_p2055x-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p2055x-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 021e0976c..85523db01 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 397940677..8fe41f9e2 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 419b336dd..5b5faff8e 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_p4014-ps.ppd.gz b/prnt/ps/hp-laserjet_p4014-ps.ppd.gz Binary files differindex f4715d74f..cd6bae317 100644 --- a/prnt/ps/hp-laserjet_p4014-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4014-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4014dn-ps.ppd.gz b/prnt/ps/hp-laserjet_p4014dn-ps.ppd.gz Binary files differindex 1c41e093a..8f6355147 100644 --- a/prnt/ps/hp-laserjet_p4014dn-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4014dn-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4014n-ps.ppd.gz b/prnt/ps/hp-laserjet_p4014n-ps.ppd.gz Binary files differindex 6656cf61e..49da4899a 100644 --- a/prnt/ps/hp-laserjet_p4014n-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4014n-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4015-ps.ppd.gz b/prnt/ps/hp-laserjet_p4015-ps.ppd.gz Binary files differindex eae1e99b9..eff3d4703 100644 --- a/prnt/ps/hp-laserjet_p4015-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4015-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4015dn-ps.ppd.gz b/prnt/ps/hp-laserjet_p4015dn-ps.ppd.gz Binary files differindex d197ef347..4feae73a2 100644 --- a/prnt/ps/hp-laserjet_p4015dn-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4015dn-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4015n-ps.ppd.gz b/prnt/ps/hp-laserjet_p4015n-ps.ppd.gz Binary files differindex 83d0d7f42..0c16a553a 100644 --- a/prnt/ps/hp-laserjet_p4015n-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4015n-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4015tn-ps.ppd.gz b/prnt/ps/hp-laserjet_p4015tn-ps.ppd.gz Binary files differindex faa519b5a..7da482f2d 100644 --- a/prnt/ps/hp-laserjet_p4015tn-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4015tn-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4015x-ps.ppd.gz b/prnt/ps/hp-laserjet_p4015x-ps.ppd.gz Binary files differindex 70513915e..7358cc03c 100644 --- a/prnt/ps/hp-laserjet_p4015x-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4015x-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4515-ps.ppd.gz b/prnt/ps/hp-laserjet_p4515-ps.ppd.gz Binary files differindex 0c5e1e645..d3cbcc9cc 100644 --- a/prnt/ps/hp-laserjet_p4515-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4515-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4515n-ps.ppd.gz b/prnt/ps/hp-laserjet_p4515n-ps.ppd.gz Binary files differindex 464c3aa4c..1b6d8034a 100644 --- a/prnt/ps/hp-laserjet_p4515n-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4515n-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4515tn-ps.ppd.gz b/prnt/ps/hp-laserjet_p4515tn-ps.ppd.gz Binary files differindex 812bd524a..0265df8e4 100644 --- a/prnt/ps/hp-laserjet_p4515tn-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4515tn-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4515x-ps.ppd.gz b/prnt/ps/hp-laserjet_p4515x-ps.ppd.gz Binary files differindex 5b4da7a9f..4493adea3 100644 --- a/prnt/ps/hp-laserjet_p4515x-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4515x-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4515xm-ps.ppd.gz b/prnt/ps/hp-laserjet_p4515xm-ps.ppd.gz Binary files differindex fd7f46781..36844ac25 100644 --- a/prnt/ps/hp-laserjet_p4515xm-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4515xm-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 e48d85551..aba7d2e13 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 c0296a092..ef192c36a 100644 --- a/prnt/ps/hp-mopier_320-ps.ppd.gz +++ b/prnt/ps/hp-mopier_320-ps.ppd.gz @@ -45,7 +45,7 @@ from prnt import cups username = prop.username res = 300 -scan_mode = 'color' +scan_mode = 'gray' tlx = None tly = None brx = None @@ -132,7 +132,7 @@ try: ("Scan destinations:", "-s<dest_list> or --dest=<dest_list>", "option", False), ("", "where <dest_list> is a comma separated list containing one or more of: 'file'\*, ", "option", False), ("", "'viewer', 'editor', 'pdf', 'fax', or 'print'. Use only commas between values, no spaces.", "option", False), - ("Scan mode:", "-m<mode> or --mode=<mode>. Where <mode> is 'color'\*, 'gray' or 'lineart'.", "option", False), + ("Scan mode:", "-m<mode> or --mode=<mode>. Where <mode> is 'gray'\*, 'color' or 'lineart'.", "option", False), ("Scanning resolution:", "-r<resolution_in_dpi> or --res=<resolution_in_dpi> or --resolution=<resolution_in_dpi>", "option", False), ("", "where <resolution_in_dpi> is %s (300 is default)." % ', '.join([str(x) for x in valid_res]), "option", False), ("Image resize:", "--resize=<scale_in_%> (min=1%, max=400%, default=100%)", "option", False), @@ -261,9 +261,9 @@ try: scan_mode = 'gray' else: - log.error("Invalid mode. Using default of 'color'.") + log.error("Invalid mode. Using default of 'gray'.") log.error("Valid modes are 'color', 'lineart', or 'gray'.") - scan_mode = 'color' + scan_mode = 'gray' elif o in ('--res', '--resolution', '-r'): try: diff --git a/scan/sane/hpaio.desc b/scan/sane/hpaio.desc index 2aeb7f045..843e95d10 100644 --- a/scan/sane/hpaio.desc +++ b/scan/sane/hpaio.desc @@ -106,6 +106,9 @@ :model "HP Photosmart Wireless All-in-one Printer - b109q=r" :status :good +:model "HP Photosmart d110 Series Printer" +:status :good + :model "HP Officejet d125xi All-in-one Printer" :status :good @@ -121,6 +124,9 @@ :model "HP Officejet d145 All-in-one Printer" :status :good +:model "HP Officejet 150 Mobile l511 All-in-one Printer" +:status :good + :model "HP Officejet d155xi All-in-one Printer" :status :good @@ -322,6 +328,9 @@ :model "HP LaserJet m1120n Multifunction Printer" :status :good +:model "HP LaserJet Professional m1132 Multifunction Printer" +:status :good + :model "HP Officejet Pro 1150c All-in-one Printer" :status :good @@ -364,6 +373,9 @@ :model "HP PSC 1210 All-in-one Printer" :status :good +:model "HP LaserJet Professional m1212nf Multifunction Printer" +:status :good + :model "HP PSC 1213 All-in-one Printer" :status :good @@ -685,10 +697,10 @@ :model "HP PSC 2352 All-in-one Printer" :status :good -:model "HP PSC 2353p All-in-one Printer" +:model "HP PSC 2353 All-in-one Printer" :status :good -:model "HP PSC 2353 All-in-one Printer" +:model "HP PSC 2353p All-in-one Printer" :status :good :model "HP PSC 2355 All-in-one Printer" @@ -1366,6 +1378,9 @@ :model "HP Photosmart c4388 All-in-one Printer" :status :good +:model "HP Officejet 4400 k410 All-in-one Printer" +:status :good + :model "HP Photosmart c4410 All-in-one Printer" :status :good @@ -1624,6 +1639,9 @@ :model "HP LaserJet m5035x Multifunction Printer" :status :good +:model "HP LaserJet m5039 Multifunction Printer" +:status :good + :model "HP Officejet 5100 All-in-one Printer" :status :good diff --git a/scan/sane/marvell.c b/scan/sane/marvell.c index 4551cb61c..c36caa7f4 100644 --- a/scan/sane/marvell.c +++ b/scan/sane/marvell.c @@ -392,6 +392,8 @@ SANE_Status marvell_open(SANE_String_Const device, SANE_Handle *handle) /* Get actual model attributes from models.dat. */ hpmud_query_model(session->uri, &ma); session->scan_type = ma.scantype; + session->scansrc = ma.scansrc; + session->scancolor= ma.scancolor; if (hpmud_open_device(session->uri, ma.mfp_mode, &session->dd) != HPMUD_R_OK) { @@ -427,26 +429,70 @@ SANE_Status marvell_open(SANE_String_Const device, SANE_Handle *handle) /* Set supported Scan Modes and set sane option. */ i=0; - session->scan_mode_list[i] = SANE_VALUE_SCAN_MODE_LINEART; - session->scan_mode_map[i++] = CE_BLACK_AND_WHITE1; - session->scan_mode_list[i] = SANE_VALUE_SCAN_MODE_GRAY; - session->scan_mode_map[i++] = CE_GRAY8; - session->scan_mode_list[i] = SANE_VALUE_SCAN_MODE_COLOR; - session->scan_mode_map[i++] = CE_RGB24; + + /* Tsunami doesnt support color scan, getting scan color option from the model file.*/ + if ( session->scancolor == HPMUD_SCANCOLOR_MONO) + { + session->scan_mode_list[i] = SANE_VALUE_SCAN_MODE_LINEART; + session->scan_mode_map[i++] = CE_BLACK_AND_WHITE1; + session->scan_mode_list[i] = SANE_VALUE_SCAN_MODE_GRAY; + session->scan_mode_map[i++] = CE_GRAY8; + DBG8("scan color HPMUD_SCANCOLOR_MONO \n"); + } + /* 0 value set in the model file, set all the scan color option */ + else + { + session->scan_mode_list[i] = SANE_VALUE_SCAN_MODE_LINEART; + session->scan_mode_map[i++] = CE_BLACK_AND_WHITE1; + session->scan_mode_list[i] = SANE_VALUE_SCAN_MODE_GRAY; + session->scan_mode_map[i++] = CE_GRAY8; + session->scan_mode_list[i] = SANE_VALUE_SCAN_MODE_COLOR; + session->scan_mode_map[i++] = CE_RGB24; + DBG8("scan color All \n"); + } marvell_control_option(session, MARVELL_OPTION_SCAN_MODE, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */ + /* Determine scan input source. */ i=0; - if (session->bb_is_paper_in_adf(session) == 2) + + /* Some of the marvell devices supports both flatbed and ADF, No command to get the src types supported */ + /* Getting from the model file */ + if ( session->scansrc == HPMUD_SCANSRC_BOTH) + { + session->input_source_list[i] = STR_ADF_MODE_ADF; + session->input_source_map[i++] = IS_ADF; + session->input_source_list[i] = STR_ADF_MODE_FLATBED; + session->input_source_map[i++] = IS_PLATEN; + DBG8("scan src HPMUD_SCANSRC_BOTH \n"); + } + else if ( session->scansrc == HPMUD_SCANSRC_ADF) + { + session->input_source_list[i] = STR_ADF_MODE_ADF; + session->input_source_map[i++] = IS_ADF; + DBG8("scan src HPMUD_SCANSRC_ADF \n"); + } + else if ( session->scansrc == HPMUD_SCANSRC_FLATBED) + { + session->input_source_list[i] = STR_ADF_MODE_FLATBED; + session->input_source_map[i++] = IS_PLATEN; + DBG8("scan src HPMUD_SCANSRC_FLATBED \n"); + } + /* Values if un specified in the, value is 0, get ADF state from the printer */ + else if (session->bb_is_paper_in_adf(session) == 2) { session->input_source_list[i] = STR_ADF_MODE_FLATBED; session->input_source_map[i++] = IS_PLATEN; + DBG8("scan src b_is_paper_in_adf value 2 \n"); } else { session->input_source_list[i] = STR_ADF_MODE_ADF; session->input_source_map[i++] = IS_ADF; + DBG8("scan src b_is_paper_in_adf value not 2 \n"); } + + marvell_control_option(session, MARVELL_OPTION_INPUT_SOURCE, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */ /* Set supported resolutions. */ @@ -575,7 +621,8 @@ SANE_Status marvell_control_option(SANE_Handle handle, SANE_Int option, SANE_Act } else { /* Set default. */ - ps->current_scan_mode = CE_RGB24; + ps->current_scan_mode = ps->scan_mode_map[0]; + ps->scan_mode_map[i]; stat = SANE_STATUS_GOOD; } break; diff --git a/scan/sane/marvelli.h b/scan/sane/marvelli.h index a84d8ca5e..572c5207f 100644 --- a/scan/sane/marvelli.h +++ b/scan/sane/marvelli.h @@ -118,6 +118,8 @@ struct marvell_session int (*bb_end_scan)(struct marvell_session *ps, int io_error); /* Add new elements here. */ void *math_handle; /* returned by dlopen */ + enum HPMUD_SCANSRC scansrc; /* 0=NA */ + enum HPMUD_SCANCOLOR scancolor; /* 0=NA*/ }; #endif // _MARVELLI_H diff --git a/ui/devmgr4.py b/ui/devmgr4.py index 928c9a7a7..d6fd53656 100644 --- a/ui/devmgr4.py +++ b/ui/devmgr4.py @@ -442,7 +442,7 @@ class DevMgr4(DevMgr4_base): self.update_thread.start() # Pipe from toolbox/dbus setup - self.fmt = "64s64sI32sI64sf" + self.fmt = "80s80sI32sI80sf" self.fmt_size = struct.calcsize(self.fmt) if read_pipe is not None and not disable_dbus: diff --git a/ui/systemtray.py b/ui/systemtray.py index 09e0264ea..9863a45bf 100644 --- a/ui/systemtray.py +++ b/ui/systemtray.py @@ -390,7 +390,7 @@ class SystemTrayApp(QApplication): QApplication.__init__(self, args) self.read_pipe = read_pipe - self.fmt = "64s64sI32sI64sf" + self.fmt = "80s80sI32sI80sf" self.fmt_size = struct.calcsize(self.fmt) self.tray_icon = SystrayIcon(load_pixmap("hp_logo", "32x32", (22, 22))) diff --git a/ui4/systemtray.py b/ui4/systemtray.py index 9cb5c5b78..8cdbae5e0 100644 --- a/ui4/systemtray.py +++ b/ui4/systemtray.py @@ -282,7 +282,7 @@ class SystemTrayApp(QApplication): self.menu = None self.read_pipe = read_pipe - self.fmt = "64s64sI32sI64sf" + self.fmt = "80s80sI32sI80sf" self.fmt_size = struct.calcsize(self.fmt) self.timer_active = False self.active_icon = False @@ -489,7 +489,7 @@ class SystemTrayApp(QApplication): log.debug("Exiting") self.sendMessage('', '', EVENT_SYSTEMTRAY_EXIT) self.quit() - + del self.tray_icon def toolboxTriggered(self): try: |