diff options
1313 files changed, 2006 insertions, 919 deletions
diff --git a/Makefile.am b/Makefile.am index 891660d02..9a4e67eae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,7 +47,7 @@ if !HPLIP_CLASS_DRIVER hpdir = $(cupsbackenddir) hp_PROGRAMS = hp hp_SOURCES = prnt/backend/hp.c -hp_LDADD = libhpmud.la $(DBUS_LIBS) +hp_LDADD = libhpmud.la libhpdiscovery.la $(DBUS_LIBS) hp_LDFLAGS = $(libhpmud_la_LDFLAGS) hp_CFLAGS = $(DBUS_CFLAGS) endif #HPLIP_CLASS_DRIVER @@ -86,10 +86,11 @@ endif # SCAN_BUILD # HP Service Discovery library if NETWORK_BUILD lib_LTLIBRARIES += libhpdiscovery.la -libhpdiscovery_la_SOURCES = protocol/discovery/mdns.c protocol/discovery/mdns.h -libhpdiscovery_la_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" -libhpdiscovery_la_LDFLAGS = -version-info 0:1:0 -libhpdiscovery_la_LIBADD = -l$(SNMPLIB) -lcrypto +#libhpdiscovery_la_SOURCES = protocol/discovery/mdns.c protocol/discovery/mdns.h +libhpdiscovery_la_SOURCES = protocol/discovery/avahiDiscovery.c protocol/discovery/avahiDiscovery.h +libhpdiscovery_la_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" -I/usr/include/avahi-client -I/usr/include/avahi-core -I/usr/include/avahi-common $(DBUS_CFLAGS) +libhpdiscovery_la_LDFLAGS = -version-info 0:1:0 -L$(libdir) +libhpdiscovery_la_LIBADD = -l$(SNMPLIB) -lcrypto -lavahi-client -lavahi-core -lavahi-common $(DBUS_LIBS) endif #NETWORK_BUILD @@ -250,7 +251,7 @@ if !HPLIP_CLASS_DRIVER # ptest noinst_PROGRAMS += ptest ptest_SOURCES = pcard/ptest.c pcard/ptest.h pcard/fat.c pcard/fat.h -ptest_LDADD = libhpmud.la +ptest_LDADD = libhpmud.la libhpdiscovery.la endif #!HPLIP_CLASS_DRIVER # data diff --git a/Makefile.in b/Makefile.in index 36423b6a4..61eccdbcb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -284,10 +284,13 @@ libapdk_la_OBJECTS = $(am_libapdk_la_OBJECTS) libapdk_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libapdk_la_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -libhpdiscovery_la_DEPENDENCIES = -am__libhpdiscovery_la_SOURCES_DIST = protocol/discovery/mdns.c \ - protocol/discovery/mdns.h -@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am_libhpdiscovery_la_OBJECTS = libhpdiscovery_la-mdns.lo +am__DEPENDENCIES_1 = +@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@libhpdiscovery_la_DEPENDENCIES = \ +@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@ $(am__DEPENDENCIES_1) +am__libhpdiscovery_la_SOURCES_DIST = \ + protocol/discovery/avahiDiscovery.c \ + protocol/discovery/avahiDiscovery.h +@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am_libhpdiscovery_la_OBJECTS = libhpdiscovery_la-avahiDiscovery.lo libhpdiscovery_la_OBJECTS = $(am_libhpdiscovery_la_OBJECTS) libhpdiscovery_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -355,7 +358,6 @@ libhpmud_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(CFLAGS) $(libhpmud_la_LDFLAGS) $(LDFLAGS) -o $@ @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@am_libhpmud_la_rpath = \ @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ -rpath $(libdir) -am__DEPENDENCIES_1 = @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@libsane_hpaio_la_DEPENDENCIES = libhpip.la \ @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ libhpmud.la \ @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ libhpipp.la \ @@ -440,6 +442,7 @@ am__hp_SOURCES_DIST = prnt/backend/hp.c hp_OBJECTS = $(am_hp_OBJECTS) @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@hp_DEPENDENCIES = \ @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ libhpmud.la \ +@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ libhpdiscovery.la \ @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ $(am__DEPENDENCIES_1) hp_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(hp_CFLAGS) $(CFLAGS) $(hp_LDFLAGS) \ @@ -612,7 +615,8 @@ am__ptest_SOURCES_DIST = pcard/ptest.c pcard/ptest.h pcard/fat.c \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@am_ptest_OBJECTS = ptest.$(OBJEXT) \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ fat.$(OBJEXT) ptest_OBJECTS = $(am_ptest_OBJECTS) -@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ptest_DEPENDENCIES = libhpmud.la +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ptest_DEPENDENCIES = libhpmud.la \ +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ libhpdiscovery.la am__dist_cmd_SCRIPTS_DIST = align.py info.py print.py toolbox.py \ clean.py colorcal.py unload.py testpage.py makeuri.py check.py \ fab.py levels.py sendfax.py setup.py makecopies.py probe.py \ @@ -818,6 +822,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_3050-ps.ppd.gz \ prnt/ps/hp-designjet_4020ps-ps.ppd.gz \ prnt/ps/hp-designjet_t1530-postscript.ppd.gz \ prnt/ps/hp-color_laserjet_2820-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_flowmfp_m578-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm2320_mfp-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz \ prnt/ps/hp-pagewide_color_755-ps.ppd.gz \ @@ -827,6 +832,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_3050-ps.ppd.gz \ prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz \ prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz \ prnt/ps/hp-officejet_color_x555-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_m578-ps.ppd.gz \ prnt/ps/hp-laserjet_4100_series-ps.ppd.gz \ prnt/ps/hp-laserjet_9050-ps.ppd.gz \ prnt/ps/hp-designjet_z6600-postscript.ppd.gz \ @@ -979,8 +985,10 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_3050-ps.ppd.gz \ prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_6000ps-ps.ppd.gz \ prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_e55040-ps.ppd.gz \ prnt/ps/hp-pagewide_color_mfp_586-ps.ppd.gz \ prnt/ps/hp-color_laserjet_5m-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_e57540-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp5225n-ps.ppd.gz \ prnt/ps/hp-laserjet_8150_mfp-ps.ppd.gz \ prnt/ps/hp-pagewide_377_mfp-ps.ppd.gz \ @@ -1001,6 +1009,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_3050-ps.ppd.gz \ prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz \ prnt/ps/hp-laserjet_4-ps.ppd.gz \ prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_flow_e57540-ps.ppd.gz \ prnt/ps/hp-laserjet_8000-ps.ppd.gz \ prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_4300-ps.ppd.gz \ @@ -1019,6 +1028,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_3050-ps.ppd.gz \ prnt/ps/hp-laserjet_4mp-ps.ppd.gz \ prnt/ps/hp-color_laserjet-ps.ppd.gz \ prnt/ps/hp-laserjet_4250-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m554-ps.ppd.gz \ prnt/ps/hp-postscript-laserjet.ppd.gz \ prnt/ps/hp-laserjet_mfp_e72425-ps.ppd.gz \ prnt/ps/hp-color_laserjet_m552-ps.ppd.gz \ @@ -1103,6 +1113,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_3050-ps.ppd.gz \ prnt/ps/hp-laserjet_4050_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_e65050_e65060-ps.ppd.gz \ prnt/ps/hp-color_laserjet_pro_m478f-9f-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m555-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz \ prnt/ps/hp-color_laserjet_e67550_e67560-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4600_series-ps.ppd.gz \ @@ -3197,6 +3208,7 @@ foomatic_ps_printers = \ prnt/ps/hp-designjet_4020ps-ps.ppd.gz \ prnt/ps/hp-designjet_t1530-postscript.ppd.gz \ prnt/ps/hp-color_laserjet_2820-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_flowmfp_m578-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm2320_mfp-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz \ prnt/ps/hp-pagewide_color_755-ps.ppd.gz \ @@ -3206,6 +3218,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz \ prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz \ prnt/ps/hp-officejet_color_x555-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_m578-ps.ppd.gz \ prnt/ps/hp-laserjet_4100_series-ps.ppd.gz \ prnt/ps/hp-laserjet_9050-ps.ppd.gz \ prnt/ps/hp-designjet_z6600-postscript.ppd.gz \ @@ -3358,8 +3371,10 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_6000ps-ps.ppd.gz \ prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_e55040-ps.ppd.gz \ prnt/ps/hp-pagewide_color_mfp_586-ps.ppd.gz \ prnt/ps/hp-color_laserjet_5m-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_e57540-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp5225n-ps.ppd.gz \ prnt/ps/hp-laserjet_8150_mfp-ps.ppd.gz \ prnt/ps/hp-pagewide_377_mfp-ps.ppd.gz \ @@ -3380,6 +3395,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz \ prnt/ps/hp-laserjet_4-ps.ppd.gz \ prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_flow_e57540-ps.ppd.gz \ prnt/ps/hp-laserjet_8000-ps.ppd.gz \ prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_4300-ps.ppd.gz \ @@ -3398,6 +3414,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_4mp-ps.ppd.gz \ prnt/ps/hp-color_laserjet-ps.ppd.gz \ prnt/ps/hp-laserjet_4250-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m554-ps.ppd.gz \ prnt/ps/hp-postscript-laserjet.ppd.gz \ prnt/ps/hp-laserjet_mfp_e72425-ps.ppd.gz \ prnt/ps/hp-color_laserjet_m552-ps.ppd.gz \ @@ -3482,6 +3499,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_4050_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_e65050_e65060-ps.ppd.gz \ prnt/ps/hp-color_laserjet_pro_m478f-9f-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m555-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz \ prnt/ps/hp-color_laserjet_e67550_e67560-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4600_series-ps.ppd.gz \ @@ -4441,7 +4459,7 @@ dist_unrel_DATA = # hp backend. @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@hpdir = $(cupsbackenddir) @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@hp_SOURCES = prnt/backend/hp.c -@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@hp_LDADD = libhpmud.la $(DBUS_LIBS) +@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@hp_LDADD = libhpmud.la libhpdiscovery.la $(DBUS_LIBS) @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@hp_LDFLAGS = $(libhpmud_la_LDFLAGS) @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@hp_CFLAGS = $(DBUS_CFLAGS) # hpaio sane backend @@ -4471,10 +4489,11 @@ dist_unrel_DATA = @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) \ @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ -Iprotocol \ @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ $(am__append_2) -@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@libhpdiscovery_la_SOURCES = protocol/discovery/mdns.c protocol/discovery/mdns.h -@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@libhpdiscovery_la_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" -@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@libhpdiscovery_la_LDFLAGS = -version-info 0:1:0 -@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@libhpdiscovery_la_LIBADD = -l$(SNMPLIB) -lcrypto +#libhpdiscovery_la_SOURCES = protocol/discovery/mdns.c protocol/discovery/mdns.h +@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@libhpdiscovery_la_SOURCES = protocol/discovery/avahiDiscovery.c protocol/discovery/avahiDiscovery.h +@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@libhpdiscovery_la_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" -I/usr/include/avahi-client -I/usr/include/avahi-core -I/usr/include/avahi-common $(DBUS_CFLAGS) +@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@libhpdiscovery_la_LDFLAGS = -version-info 0:1:0 -L$(libdir) +@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@libhpdiscovery_la_LIBADD = -l$(SNMPLIB) -lcrypto -lavahi-client -lavahi-core -lavahi-common $(DBUS_LIBS) # hpmud library @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@MUDNAME = hpmud @@ -4597,7 +4616,7 @@ dist_unrel_DATA = @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@selinuxdir = @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_selinux_DATA = selinux/hplip.te selinux/hplip.fc selinux/hplip.pp selinux/hplip.if selinux/mypol.pp selinux/mypol.te @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ptest_SOURCES = pcard/ptest.c pcard/ptest.h pcard/fat.c pcard/fat.h -@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ptest_LDADD = libhpmud.la +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ptest_LDADD = libhpmud.la libhpdiscovery.la # data @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@modelsdir = $(hplipdir)/data/models @@ -5927,7 +5946,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libapdk_la-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libapdk_la-version.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libapdk_la-versioncode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhpdiscovery_la-mdns.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhpdiscovery_la-avahiDiscovery.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhpipp_la-hp_ipp.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhpmud_la-dot4.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhpmud_la-hpmud.Plo@am__quote@ @@ -6053,12 +6072,12 @@ libapdk_la-utils.lo: common/utils.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapdk_la_CFLAGS) $(CFLAGS) -c -o libapdk_la-utils.lo `test -f 'common/utils.c' || echo '$(srcdir)/'`common/utils.c -libhpdiscovery_la-mdns.lo: protocol/discovery/mdns.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhpdiscovery_la_CFLAGS) $(CFLAGS) -MT libhpdiscovery_la-mdns.lo -MD -MP -MF $(DEPDIR)/libhpdiscovery_la-mdns.Tpo -c -o libhpdiscovery_la-mdns.lo `test -f 'protocol/discovery/mdns.c' || echo '$(srcdir)/'`protocol/discovery/mdns.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libhpdiscovery_la-mdns.Tpo $(DEPDIR)/libhpdiscovery_la-mdns.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='protocol/discovery/mdns.c' object='libhpdiscovery_la-mdns.lo' libtool=yes @AMDEPBACKSLASH@ +libhpdiscovery_la-avahiDiscovery.lo: protocol/discovery/avahiDiscovery.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhpdiscovery_la_CFLAGS) $(CFLAGS) -MT libhpdiscovery_la-avahiDiscovery.lo -MD -MP -MF $(DEPDIR)/libhpdiscovery_la-avahiDiscovery.Tpo -c -o libhpdiscovery_la-avahiDiscovery.lo `test -f 'protocol/discovery/avahiDiscovery.c' || echo '$(srcdir)/'`protocol/discovery/avahiDiscovery.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libhpdiscovery_la-avahiDiscovery.Tpo $(DEPDIR)/libhpdiscovery_la-avahiDiscovery.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='protocol/discovery/avahiDiscovery.c' object='libhpdiscovery_la-avahiDiscovery.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhpdiscovery_la_CFLAGS) $(CFLAGS) -c -o libhpdiscovery_la-mdns.lo `test -f 'protocol/discovery/mdns.c' || echo '$(srcdir)/'`protocol/discovery/mdns.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhpdiscovery_la_CFLAGS) $(CFLAGS) -c -o libhpdiscovery_la-avahiDiscovery.lo `test -f 'protocol/discovery/avahiDiscovery.c' || echo '$(srcdir)/'`protocol/discovery/avahiDiscovery.c xconvolve.lo: ip/xconvolve.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xconvolve.lo -MD -MP -MF $(DEPDIR)/xconvolve.Tpo -c -o xconvolve.lo `test -f 'ip/xconvolve.c' || echo '$(srcdir)/'`ip/xconvolve.c diff --git a/base/device.py b/base/device.py index 1962f0309..df9f5386a 100644 --- a/base/device.py +++ b/base/device.py @@ -357,18 +357,9 @@ def makeURI(param, port=1): else: # Try Zeroconf hostname log.debug("Trying ZC hostname %s" % param) - result_code, uri = hpmudext.make_zc_uri(param, port) + if ( len (param) < 251): - if result_code == hpmudext.HPMUD_R_OK and uri: - uri = to_string_utf8(uri) - log.debug("Found: %s" % uri) - found = True - cups_uri = uri - - else: # Try DNS hostname - log.debug("Device not found using mDNS hostname. Trying with DNS hostname %s" % param) - - result_code, uri = hpmudext.make_net_uri(param, port) + result_code, uri = hpmudext.make_zc_uri(param, port) if result_code == hpmudext.HPMUD_R_OK and uri: uri = to_string_utf8(uri) @@ -376,8 +367,20 @@ def makeURI(param, port=1): log.debug("Found: %s" % uri) found = True cups_uri = uri - else: - log.debug("Not found.") + + else: # Try DNS hostname + log.debug("Device not found using mDNS hostname. Trying with DNS hostname %s" % param) + + result_code, uri = hpmudext.make_net_uri(param, port) + + if result_code == hpmudext.HPMUD_R_OK and uri: + uri = to_string_utf8(uri) + uri = uri.replace("ip=","hostname=") + log.debug("Found: %s" % uri) + found = True + cups_uri = uri + else: + log.debug("Not found.") if not found: log.debug("Trying serial number %s" % param) @@ -1009,6 +1012,7 @@ class Device(object): raise Error(ERROR_DEVICE_NOT_FOUND) self.device_uri = device_uri + self.printer_name = printer_name self.callback = callback self.device_type = DEVICE_TYPE_UNKNOWN @@ -1693,7 +1697,7 @@ class Device(object): elif status_type == STATUS_TYPE_IPP: log.debug("Type 12: IPP") - status_block = status.StatusTypeIPP(self.device_uri) + status_block = status.StatusTypeIPP(self.device_uri,self.printer_name) else: log.error("Unimplemented status type: %d" % status_type) diff --git a/base/status.py b/base/status.py index f79b78d70..2d6e7cbe4 100644 --- a/base/status.py +++ b/base/status.py @@ -1948,7 +1948,7 @@ def StatusTypeIPPAgents(attrs): return status_block -def StatusTypeIPP(device_uri): +def StatusTypeIPP(device_uri,printer_name): status_block = { 'revision' : STATUS_REV_UNKNOWN, 'agents' : [], 'top-door' : TOP_DOOR_NOT_PRESENT, @@ -1961,7 +1961,7 @@ def StatusTypeIPP(device_uri): 'status-code' : STATUS_PRINTER_IDLE, } - status_attrs = cupsext.getStatusAttributes(device_uri) + status_attrs = cupsext.getStatusAttributes(device_uri,printer_name) if status_attrs: status_block.update(StatusTypeIPPAgents(status_attrs) ) @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.20.6. +# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.20.9. # -# Report bugs to <3.20.6>. +# Report bugs to <3.20.9>. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -246,7 +246,7 @@ fi $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and 3.20.6 about your + $as_echo "$0: Please tell bug-autoconf@gnu.org and 3.20.9 about your $0: system, including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." @@ -569,9 +569,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='HP Linux Imaging and Printing' PACKAGE_TARNAME='hplip' -PACKAGE_VERSION='3.20.6' -PACKAGE_STRING='HP Linux Imaging and Printing 3.20.6' -PACKAGE_BUGREPORT='3.20.6' +PACKAGE_VERSION='3.20.9' +PACKAGE_STRING='HP Linux Imaging and Printing 3.20.9' +PACKAGE_BUGREPORT='3.20.9' PACKAGE_URL='' # Factoring default headers for most tests. @@ -1488,7 +1488,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.20.6 to adapt to many kinds of systems. +\`configure' configures HP Linux Imaging and Printing 3.20.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1558,7 +1558,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.20.6:";; + short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.20.9:";; esac cat <<\_ACEOF @@ -1661,7 +1661,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.20.6>. +Report bugs to <3.20.9>. _ACEOF ac_status=$? fi @@ -1724,7 +1724,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HP Linux Imaging and Printing configure 3.20.6 +HP Linux Imaging and Printing configure 3.20.9 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2191,7 +2191,7 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" > { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ( $as_echo "## --------------------- ## -## Report this to 3.20.6 ## +## Report this to 3.20.9 ## ## --------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -2268,7 +2268,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.20.6, which was +It was created by HP Linux Imaging and Printing $as_me 3.20.9, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3084,7 +3084,7 @@ fi # Define the identity of the package. PACKAGE='hplip' - VERSION='3.20.6' + VERSION='3.20.9' cat >>confdefs.h <<_ACEOF @@ -17083,6 +17083,48 @@ fi #CFLAGS=`(python-config --includes)` if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$lite_build" = "no" && test "$hpcups_only_build" = "no"; then + for ac_prog in python python3 python2 +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:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$PYTHON"; then + ac_cv_prog_PYTHON="$PYTHON" # 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_PYTHON="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +PYTHON=$ac_cv_prog_PYTHON +if test -n "$PYTHON"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +$as_echo "$PYTHON" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$PYTHON" && break +done + @@ -18473,7 +18515,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by HP Linux Imaging and Printing $as_me 3.20.6, which was +This file was extended by HP Linux Imaging and Printing $as_me 3.20.9, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18524,13 +18566,13 @@ $config_files Configuration commands: $config_commands -Report bugs to <3.20.6>." +Report bugs to <3.20.9>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -HP Linux Imaging and Printing config.status 3.20.6 +HP Linux Imaging and Printing config.status 3.20.9 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 12ed85db7..87bef025f 100755 --- a/configure.in +++ b/configure.in @@ -26,7 +26,7 @@ # 104 = no libdl #AC_PREREQ(2.59) -AC_INIT([HP Linux Imaging and Printing], [3.20.6], [3.20.6], [hplip]) +AC_INIT([HP Linux Imaging and Printing], [3.20.9], [3.20.9], [hplip]) #AM_INIT_AUTOMAKE([1.9 foreign]) AM_INIT_AUTOMAKE AC_DISABLE_STATIC @@ -620,6 +620,7 @@ fi #CFLAGS=`(python-config --includes)` if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$lite_build" = "no" && test "$hpcups_only_build" = "no"; then AC_ARG_VAR([PYTHON], [Python interpreter/compiler command]) + AC_CHECK_PROGS(PYTHON,[python python3 python2]) AM_PATH_PYTHON([2.2]) AC_MSG_CHECKING([for path to Python.h]) PYTHONINCLUDEDIR=`$PYTHON -c "from distutils.sysconfig import get_python_inc; print (get_python_inc());"` diff --git a/data/models/models.dat b/data/models/models.dat index 85485636e..90ed2941e 100644 --- a/data/models/models.dat +++ b/data/models/models.dat @@ -3439,7 +3439,7 @@ model1=HP LaserJet Pro MFP M127fw monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=65 power-settings=0 pq-diag-type=0 @@ -3809,7 +3809,7 @@ model1=HP Color LaserJet Pro MPF M176n monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=65 power-settings=0 pq-diag-type=0 @@ -16911,7 +16911,7 @@ model1=HP LaserJet 1000 Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=1 power-settings=0 pq-diag-type=0 @@ -17091,7 +17091,7 @@ model1=HP LaserJet 1005 Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=1 power-settings=0 pq-diag-type=0 @@ -17131,7 +17131,7 @@ model1=HP LaserJet P1005 Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=1 power-settings=0 pq-diag-type=0 @@ -17174,7 +17174,7 @@ model1=HP LaserJet M1005 Multifunction Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=65 power-settings=0 pq-diag-type=0 @@ -17217,7 +17217,7 @@ model1=HP LaserJet P1006 Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=1 power-settings=0 pq-diag-type=0 @@ -17260,7 +17260,7 @@ model1=HP LaserJet P1007 Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=1 power-settings=0 pq-diag-type=0 @@ -17303,7 +17303,7 @@ model1=HP LaserJet P1008 Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=1 power-settings=0 pq-diag-type=0 @@ -17347,7 +17347,7 @@ monitor-type=0 panel-check-type=0 pcard-type=0 plugin=0 -plugin-reason=1 +plugin-reason=0 power-settings=0 pq-diag-type=0 r-type=0 @@ -17563,8 +17563,8 @@ model1=HP Color LaserJet CM1015 Multifunction Printer monitor-type=0 panel-check-type=1 pcard-type=2 -plugin=0 -plugin-reason=0 +plugin=1 +plugin-reason=64 power-settings=0 pq-diag-type=0 r-type=0 @@ -17615,8 +17615,8 @@ model1=HP Color LaserJet CM1017 Multifunction Printer monitor-type=0 panel-check-type=1 pcard-type=2 -plugin=0 -plugin-reason=0 +plugin=1 +plugin-reason=64 power-settings=0 pq-diag-type=0 r-type=0 @@ -17668,7 +17668,7 @@ model2=HP LaserJet 1018s Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=1 power-settings=0 pq-diag-type=0 @@ -17712,7 +17712,7 @@ model2=HP LaserJet 1020 Plus Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=1 power-settings=0 pq-diag-type=0 @@ -17885,7 +17885,7 @@ model1=HP LaserJet Pro CP1025nw Color Printer Series monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=1 power-settings=0 pq-diag-type=0 @@ -18487,7 +18487,7 @@ model2=HP Laserjet Professional P1102s Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=1 power-settings=0 pq-diag-type=0 @@ -19091,7 +19091,7 @@ model1=HP LaserJet M1120 Multifunction Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=65 power-settings=0 pq-diag-type=0 @@ -19134,7 +19134,7 @@ model1=HP LaserJet M1120n Multifunction Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=65 power-settings=0 pq-diag-type=0 @@ -20117,7 +20117,7 @@ model1=HP Color LaserJet CP1215 Printer monitor-type=0 panel-check-type=1 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=1 power-settings=0 pq-diag-type=0 @@ -20311,7 +20311,7 @@ model1=HP LaserJet Professional M1217nfW Multifunction Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=65 power-settings=0 pq-diag-type=0 @@ -21235,8 +21235,8 @@ model1=HP Color LaserJet CM1312nfi Multifunction Printer monitor-type=0 panel-check-type=1 pcard-type=2 -plugin=0 -plugin-reason=0 +plugin=1 +plugin-reason=64 power-settings=0 pq-diag-type=0 r-type=0 @@ -21287,8 +21287,8 @@ model1=HP Color LaserJet CM1312 Multifunction Printer monitor-type=0 panel-check-type=1 pcard-type=0 -plugin=0 -plugin-reason=0 +plugin=1 +plugin-reason=64 power-settings=0 pq-diag-type=0 r-type=0 @@ -21385,7 +21385,7 @@ model1=HP LaserJet M1319f Multifunction Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=65 power-settings=0 pq-diag-type=0 @@ -22619,7 +22619,7 @@ model1=HP LaserJet P1505 Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=1 power-settings=0 pq-diag-type=0 @@ -22921,8 +22921,8 @@ ppd-name=hp-laserjet_m1522_mfp-ps.ppd monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 -plugin-reason=0 +plugin=1 +plugin-reason=64 power-settings=0 pq-diag-type=0 r-type=0 @@ -23019,8 +23019,8 @@ ppd-name=hp-laserjet_m1522_mfp-ps.ppd monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 -plugin-reason=0 +plugin=1 +plugin-reason=64 power-settings=0 pq-diag-type=0 r-type=0 @@ -23063,8 +23063,8 @@ ppd-name=hp-laserjet_m1522_mfp-ps.ppd monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 -plugin-reason=0 +plugin=1 +plugin-reason=64 power-settings=0 pq-diag-type=0 r-type=0 @@ -23607,7 +23607,7 @@ model1=HP LaserJet Professional P1566 monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=1 power-settings=0 pq-diag-type=0 @@ -24132,7 +24132,7 @@ model1=HP Color LaserJet 1600 Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=1 power-settings=0 pq-diag-type=0 @@ -25254,7 +25254,7 @@ model1=HP LaserJet P2035n Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=1 power-settings=0 pq-diag-type=0 @@ -25297,7 +25297,7 @@ model1=HP LaserJet P2035 Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=1 power-settings=0 pq-diag-type=0 @@ -26939,8 +26939,8 @@ model1=HP Color LaserJet CM2320 Multifunction Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 -plugin-reason=0 +plugin=1 +plugin-reason=64 power-settings=0 pq-diag-type=0 r-type=0 @@ -26991,8 +26991,8 @@ model1=HP Color LaserJet CM2320nf Multifunction Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 -plugin-reason=0 +plugin=1 +plugin-reason=64 power-settings=0 pq-diag-type=0 r-type=0 @@ -27043,8 +27043,8 @@ model1=HP Color LaserJet CM2320fxi Multifunction Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 -plugin-reason=0 +plugin=1 +plugin-reason=64 power-settings=0 pq-diag-type=0 r-type=0 @@ -27095,8 +27095,8 @@ model1=HP Color LaserJet CM2320n Multifunction Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 -plugin-reason=0 +plugin=1 +plugin-reason=64 power-settings=0 pq-diag-type=0 r-type=0 @@ -28453,7 +28453,7 @@ model1=HP Color LaserJet 2600n Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 +plugin=1 plugin-reason=1 power-settings=0 pq-diag-type=0 @@ -29353,8 +29353,8 @@ model1=HP LaserJet M2727 Multifunction Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 -plugin-reason=0 +plugin=1 +plugin-reason=64 power-settings=0 ppd-name=hp-laserjet_m2727_mfp_series-ps.ppd pq-diag-type=0 @@ -29397,8 +29397,8 @@ model1=HP LaserJet M2727nfs Multifunction Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 -plugin-reason=0 +plugin=1 +plugin-reason=64 power-settings=0 ppd-name=hp-laserjet_m2727_mfp_series-ps.ppd pq-diag-type=0 @@ -29441,8 +29441,8 @@ model1=HP LaserJet M2727nf Multifunction Printer monitor-type=0 panel-check-type=0 pcard-type=0 -plugin=0 -plugin-reason=0 +plugin=1 +plugin-reason=64 power-settings=0 ppd-name=hp-laserjet_m2727_mfp_series-ps.ppd family-ppd=hp-postscript-laserjet.ppd @@ -66992,56 +66992,6 @@ usb-pid=2254 usb-vid=03f0 wifi-config=3 -[hp_laserjet_mfp_m232-m237] -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_color_laserjet_cm1312_mfp.png -io-mfp-mode=1 -io-mode=1 -io-support=14 -job-storage=0 -linefeed-cal-type=0 -model1=HP LaserJet MFP M233d -model2=HP LaserJet MFP M236d -model3=HP LaserJet MFP M234dw -model4=HP LaserJet MFP M236dw -model5=HP LaserJet MFP M233dw -model6=HP LaserJet MFP M234sdn -model7=HP LaserJet MFP M233sdn -model8=HP LaserJet MFP M236sdn -model9=HP LaserJet MFP M232sdn -model10=HP LaserJet MFP M234sdw -model11=HP LaserJet MFP M236sdw -model12=HP LaserJet MFP M233sdw -monitor-type=0 -panel-check-type=0 -pcard-type=0 -plugin=0 -plugin-reason=0 -power-settings=0 -pq-diag-type=0 -scan-src=3 -scan-type=9 -status-battery-check=0 -status-dynamic-counters=0 -status-type=10 -support-released=True -support-subtype=48c3 -support-type=2 -support-ver=3.20.4 -tech-class=Hbpl1 -family-class=PCLM_MONO -tech-subclass=Mono -tech-type=3 -usb-pid=0972 -usb-vid=03F0 -wifi-config=3 - [deskjet_2700_series] align-type=15 clean-type=0 @@ -68031,6 +67981,428 @@ usb-pid=fc2a usb-vid=03f0 wifi-config=3 +[hp_laserjet_mfp_m232-m237] +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_color_laserjet_cm1312_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet MFP M234dw +model2=HP LaserJet MFP M234dwe +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +scan-src=1 +scan-type=9 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=48c3 +support-type=2 +support-ver=3.20.9 +tech-class=Hbpl1 +family-class=PCLM_MONO +tech-subclass=Mono +tech-type=3 +usb-pid=0972 +usb-vid=03F0 +wifi-config=3 + +[hp_color_laserjet_mfp_e57540] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp3525.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=1 +linefeed-cal-type=0 +model1=HP Color LaserJet Managed MFP E57540dn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-color_laserjet_mfp_e57540-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF360A/CF360X +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CF361A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CF363A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CF362A +r0-agent4-type=6 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.20.9 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=4 +usb-pid=d02a +usb-vid=3f0 +wifi-config=0 + +[hp_color_laserjet_flow_e57540] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp3525.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=1 +linefeed-cal-type=0 +model1=HP Color LaserJet Managed Flow MFP E57540c +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-color_laserjet_flow_e57540-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF360A/CF360X +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CF361A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CF363A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CF362A +r0-agent4-type=6 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.20.9 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=4 +usb-pid=d02a +usb-vid=3f0 +wifi-config=0 + +[hp_color_laserjet_mfp_m578] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp3525.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=1 +linefeed-cal-type=0 +model1=HP Color LaserJet Enterprise MFP M578dn +model2=HP Color LaserJet Enterprise MFP M578f +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-color_laserjet_mfp_m578-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF360A/CF360X +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CF361A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CF363A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CF362A +r0-agent4-type=6 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.20.9 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=4 +usb-pid=0773 +usb-vid=3f0 +wifi-config=0 + +[hp_color_laserjet_flowmfp_m578] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp3525.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=1 +linefeed-cal-type=0 +model1=HP Color LaserJet Enterprise Flow MFP M578c +model2=HP Color LaserJet Enterprise Flow MFP M578z +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-color_laserjet_flowmfp_m578-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF360A/CF360X +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CF361A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CF363A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CF362A +r0-agent4-type=6 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.20.9 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=4 +usb-pid=0773 +usb-vid=3f0 +wifi-config=0 + +[hp_color_laserjet_e55040] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color LaserJet Managed E55040dw +model2=HP Color LaserJet Managed E55040dn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-color_laserjet_e55040-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF360A/CF360X +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CF361A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CF363A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CF362A +r0-agent4-type=6 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=48c3 +support-type=2 +support-ver=3.20.9 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=4 +usb-pid=cf2a +usb-vid=03f0 +wifi-config=0 + +[hp_color_laserjet_m554] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color LaserJet Enterprise M554dn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-color_laserjet_m554-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF360A/CF360X +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CF361A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CF363A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CF362A +r0-agent4-type=6 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=48c3 +support-type=2 +support-ver=3.20.9 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=4 +usb-pid=0873 +usb-vid=03f0 +wifi-config=0 + +[hp_color_laserjet_m555] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color LaserJet Enterprise M555dn +model2=HP Color LaserJet Enterprise M555x +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-color_laserjet_m555-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF360A/CF360X +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CF361A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CF363A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CF362A +r0-agent4-type=6 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=48c3 +support-type=2 +support-ver=3.20.9 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=4 +usb-pid=0873 +usb-vid=03f0 +wifi-config=0 + # align-type # ---------- # Align cartridges type diff --git a/fax/ppd/HP-Fax-hpcups.ppd.gz b/fax/ppd/HP-Fax-hpcups.ppd.gz Binary files differindex 9c2f39df6..a03af684c 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 9fdfc4238..78b7577f1 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 4e075573e..d0efe73c9 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 dc5671315..5d2afde15 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 233a63f7e..213e4e549 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 c0bcebcfb..33080e643 100644 --- a/fax/ppd/HP-Fax3-hpijs.ppd.gz +++ b/fax/ppd/HP-Fax3-hpijs.ppd.gz diff --git a/fax/ppd/HP-Fax4-hpcups.ppd.gz b/fax/ppd/HP-Fax4-hpcups.ppd.gz Binary files differindex 4bdc7501f..8ba034ded 100644 --- a/fax/ppd/HP-Fax4-hpcups.ppd.gz +++ b/fax/ppd/HP-Fax4-hpcups.ppd.gz diff --git a/fax/ppd/HP-Fax4-hpijs.ppd.gz b/fax/ppd/HP-Fax4-hpijs.ppd.gz Binary files differindex efae5e880..2e11d0d0d 100644 --- a/fax/ppd/HP-Fax4-hpijs.ppd.gz +++ b/fax/ppd/HP-Fax4-hpijs.ppd.gz diff --git a/foomatic_drv.inc b/foomatic_drv.inc index 2d3b3a2fa..4a2f9e1b7 100644 --- a/foomatic_drv.inc +++ b/foomatic_drv.inc @@ -838,6 +838,7 @@ foomatic_ps_printers = \ prnt/ps/hp-designjet_4020ps-ps.ppd.gz \ prnt/ps/hp-designjet_t1530-postscript.ppd.gz \ prnt/ps/hp-color_laserjet_2820-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_flowmfp_m578-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm2320_mfp-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz \ prnt/ps/hp-pagewide_color_755-ps.ppd.gz \ @@ -847,6 +848,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz \ prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz \ prnt/ps/hp-officejet_color_x555-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_m578-ps.ppd.gz \ prnt/ps/hp-laserjet_4100_series-ps.ppd.gz \ prnt/ps/hp-laserjet_9050-ps.ppd.gz \ prnt/ps/hp-designjet_z6600-postscript.ppd.gz \ @@ -999,8 +1001,10 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_6000ps-ps.ppd.gz \ prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_e55040-ps.ppd.gz \ prnt/ps/hp-pagewide_color_mfp_586-ps.ppd.gz \ prnt/ps/hp-color_laserjet_5m-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_e57540-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp5225n-ps.ppd.gz \ prnt/ps/hp-laserjet_8150_mfp-ps.ppd.gz \ prnt/ps/hp-pagewide_377_mfp-ps.ppd.gz \ @@ -1021,6 +1025,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz \ prnt/ps/hp-laserjet_4-ps.ppd.gz \ prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_flow_e57540-ps.ppd.gz \ prnt/ps/hp-laserjet_8000-ps.ppd.gz \ prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_4300-ps.ppd.gz \ @@ -1039,6 +1044,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_4mp-ps.ppd.gz \ prnt/ps/hp-color_laserjet-ps.ppd.gz \ prnt/ps/hp-laserjet_4250-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m554-ps.ppd.gz \ prnt/ps/hp-postscript-laserjet.ppd.gz \ prnt/ps/hp-laserjet_mfp_e72425-ps.ppd.gz \ prnt/ps/hp-color_laserjet_m552-ps.ppd.gz \ @@ -1123,6 +1129,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_4050_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_e65050_e65060-ps.ppd.gz \ prnt/ps/hp-color_laserjet_pro_m478f-9f-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m555-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz \ prnt/ps/hp-color_laserjet_e67550_e67560-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4600_series-ps.ppd.gz \ diff --git a/hplipclassdriver.spec b/hplipclassdriver.spec index 88d9fc089..914191e22 100644 --- a/hplipclassdriver.spec +++ b/hplipclassdriver.spec @@ -1,5 +1,5 @@ Name: hplipclassdriver -Version: 3.20.6 +Version: 3.20.9 Release: 0 License: (c) 2004-2009 Copyright HP Development Company, LP Packager: HPLIP diff --git a/installer/core_install.py b/installer/core_install.py index aaf98473c..7c4d9043f 100644 --- a/installer/core_install.py +++ b/installer/core_install.py @@ -200,6 +200,7 @@ SCANEXT_STR = 'Scan-SANE-Extension' QT_STR = "Python-Qt" EPM_STR = "Build Debian Package" AUTOMAKE_STR = "Build Driver" +LIB_AVAHI="libavahi-dev" APPARMOR_DIR = "/etc/apparmor.d" SELINUX_DIR = "/etc/selinux/targeted/policy/policy*" @@ -302,6 +303,7 @@ class CoreInstall(object): 'package_arch': TYPE_LIST, 'open_mdns_port': TYPE_LIST, # command to use to open mdns multicast port 5353 'libdir_path': TYPE_STRING, + 'hp_libs_remove_cmd': TYPE_STRING, } # components @@ -377,6 +379,7 @@ class CoreInstall(object): # Required scan packages 'sane': (True, ['scan'], SANE_STR, self.check_sane, DEPENDENCY_RUN_TIME, '-', 'sane-config --version', GENERALDEP), 'sane-devel': (True, ['scan'], SANE_DEV_STR, self.check_sane_devel, DEPENDENCY_COMPILE_TIME, '-', 'sane-config --version', GENERALDEP), + 'libavahi-dev': (True, ['scan'], LIB_AVAHI, self.check_libavahi_dev, DEPENDENCY_RUN_AND_COMPILE_TIME, '-', 'FUNC#check_libavahi_dev', GENERALDEP), #'tesseract': (True, ['scan'], TESS_STR, self.check_tesseract, DEPENDENCY_RUN_TIME, '-', 'tesseract --version', GENERALDEP), #'zbar': (True, ['scan'], ZBAR_STR, self.check_zbar, DEPENDENCY_RUN_TIME, '-', None, GENERALDEP), @@ -1245,6 +1248,11 @@ class CoreInstall(object): # TODO: Compute these paths some way or another... return check_file('media.defs', "/usr/share/cups/ppdc/") + def check_libavahi_dev(self): + log.debug("Checking for libavahi-dev") + # TODO: Compute these paths some way or another... + return check_file('client.h', "/usr/include/avahi-client") + def check_policykit(self): log.debug("Checking for PolicyKit...") if check_file('PolicyKit.conf', "/etc/PolicyKit") and check_file('org.gnome.PolicyKit.AuthorizationManager.service', "/usr/share/dbus-1/services"): @@ -1865,6 +1873,25 @@ class CoreInstall(object): else: return False + def remove_default_hplip_libs(self, callback=None, distro_ver=None): + hp_lib_rm_cmd = self.get_distro_ver_data('hp_libs_remove_cmd', None, distro_ver) + log.debug(hp_lib_rm_cmd) + print(hp_lib_rm_cmd) + if hp_lib_rm_cmd: + x = 1 + #for cmd in hp_lib_rm_cmd: + status, output = utils.run(hp_lib_rm_cmd, self.passwordObj) + if any(['yum' in hp_lib_rm_cmd,'zypper' in hp_lib_rm_cmd, 'dnf' in hp_lib_rm_cmd, 'pacman' in hp_lib_rm_cmd]): + if status == 1: + log.warn("An error occurred running '%s'" % hp_lib_rm_cmd) + else: + if status != 0: + log.warn("An error occurred running '%s'" % hp_lib_rm_cmd) + + if callback is not None: + callback(hp_lib_rm_cmd, " hp_libs_remove step %d" % x) + + x += 1 def run_pre_depend(self, callback=None, distro_ver=None): pre_cmd = self.get_distro_ver_data('pre_depend_cmd', None, distro_ver) diff --git a/installer/distros.dat b/installer/distros.dat index fcc63b647..6e44739a2 100644 --- a/installer/distros.dat +++ b/installer/distros.dat @@ -85,7 +85,7 @@ # open_mdns_port=<command(s) to use to open the mdns multicast port 5353> [TYPE_LIST]
# acl_rules=1|0 [TYPE_BOOL] # For Karmic+
# libdir_path=<lib directory path> [TYPE_STRING] # Used if libdir location is to be provided in 64 bit machines
-
+# hp_libs_remove_cmd to remove the hp libs
# # Only include these sections if supported==1 for this <distro name>:<version name>.
# [<distro name>:<version name>:<dependency name>]
# packages=<package list to satisfy dependency (comma sep. list)> [TYPE_LIST]
@@ -114,7 +114,7 @@ supported=0 [suse]
index=3
-versions=12.2,12.3,13.1,13.2,42.1,42.2,42.3,15.0,15.1
+versions=12.2,12.3,13.1,13.2,42.1,42.2,42.3,15.0,15.1,15.2
display_name=SUSE Linux
alt_names=
display=1
@@ -123,6 +123,7 @@ package_mgrs=yast,yast2,opensuse-updater,zypper,package-manager package_mgr_cmd=su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses $packages_to_install"
pre_depend_cmd=
post_depend_cmd=
+hp_libs_remove_cmd=su -c "zypper --non-interactive rm hplip-sane hplip-devel"
scanjet_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks remove python-numpy",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses python-pip",su -c "pip2 install --upgrade pip",su -c "pip2 install setuptools",su -c "pip2 install opencv-python",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses leptonica-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-traineddata-*",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses libzbar-devel",su -c "pip2 install zbar",su -c "pip2 install PyPDF2",su -c "pip2 install imutils",su -c "pip2 install tesserocr",su -c "pip2 install pypdfocr",su -c "pip2 install --ignore-installed decorator",su -c "pip2 install scikit-image",su -c "pip2 install scipy"
#su -c "pip2 install --upgrade setuptools"
scanjet_py3_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses python3-pip",su -c "pip3 install --upgrade pip",su -c "pip3 install opencv-python",su -c "pip3 install setuptools",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses leptonica-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-traineddata-*",su -c "pip3 install PyPDF2",su -c "pip3 install imutils",su -c "pip3 install tesserocr",su -c "pip3 install ocrmypdf",su -c "pip3 install --ignore-installed decorator",su -c "pip3 install scikit-image",su -c "pip3 install scipy"
@@ -276,6 +277,9 @@ packages=python3-xml [suse:12.2:automake]
packages=automake
+[suse:12.2:libavahi-dev]
+packages=libavahi-devel
+
# ********************
[suse:12.3]
@@ -424,6 +428,9 @@ packages=python3-notify2 [suse:12.3:automake]
packages=automake
+[suse:12.3:libavahi-dev]
+packages=libavahi-devel
+
# ****************************************
@@ -583,6 +590,9 @@ packages=python3-notify2 [suse:13.2:automake]
packages=automake
+[suse:13.2:libavahi-dev]
+packages=libavahi-devel
+
# ****************************************
[suse:42.1]
@@ -742,6 +752,9 @@ packages=python3-notify2 [suse:42.2:automake]
packages=automake
+[suse:42.2:libavahi-dev]
+packages=libavahi-devel
+
# ****************************************
@@ -894,6 +907,9 @@ packages=python3-notify2 [suse:42.3:automake]
packages=automake
+[suse:42.3:libavahi-dev]
+packages=libavahi-devel
+
# ****************************************
@@ -1048,6 +1064,10 @@ packages=python3-notify2 [suse:15.0:automake]
packages=automake
+[suse:15.0:libavahi-dev]
+packages=libavahi-devel
+
+
# ****************************************
@@ -1201,6 +1221,166 @@ packages=python3-notify2 [suse:15.1:automake]
packages=automake
+[suse:15.1:libavahi-dev]
+packages=libavahi-devel
+
+
+# ****************************************
+
+[suse:15.2]
+code_name=Leap
+supported=1
+packaged_version=3.20.9
+release_date=02.07.2020
+scan_supported=1
+fax_supported=1
+pcard_supported=0
+network_supported=1
+parallel_supported=0
+usb_supported=1
+notes=Please be sure to disable the CD repositories in YaST.
+ppd_install=drv
+udev_mode_fix=1
+ppd_dir=/usr/share/cups/model/HP
+fix_ppd_symlink=0
+drv_dir=/usr/share/cups/drv/HP
+cups_path_with_bitness=0
+ui_toolkit=qt4
+native_cups=1
+pre_depend_cmd=su -c "zypper refresh"
+post_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks in --force --auto-agree-with-licenses cups-filters-ghostscript",su -c "service cups restart"
+scanjet_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks remove python-numpy",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses python-pip",su -c "pip2 install --upgrade pip",su -c "pip2 install setuptools",su -c "pip2 install opencv-contrib-python",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses leptonica-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-traineddata-*",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses libzbar-devel",su -c "pip2 install zbar-py",su -c "pip2 install PyPDF2",su -c "pip2 install imutils",su -c "pip2 install tesserocr",su -c "pip2 install pypdfocr",su -c "pip2 install --ignore-installed decorator",su -c "pip2 install scikit-image",su -c "pip2 install reportlab==3.4.0",su -c "pip2 install scipy"
+#su -c "pip2 install --upgrade setuptools"
+scanjet_py3_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses python3-pip",su -c "pip3 install --upgrade pip",su -c "pip3 install opencv-python",su -c "pip3 install setuptools",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses leptonica-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-traineddata-*",su -c "pip3 install PyPDF2",su -c "pip3 install imutils",su -c "pip3 install tesserocr",su -c "pip3 install ocrmypdf",su -c "pip3 install --ignore-installed decorator",su -c "pip3 install scikit-image",su -c "pip3 install reportlab==3.4.0",su -c "pip3 install scipy"
+
+[suse:15.2:cups]
+packages=cups,cups-client
+
+[suse:15.2:cups-devel]
+packages=cups-devel,cupsddk
+
+[suse:15.2:gcc]
+packages=gcc-c++
+
+[suse:15.2:gs]
+packages=ghostscript-library
+
+[suse:15.2:libcrypto]
+packages=openssl
+
+[suse:15.2:libjpeg]
+packages=libjpeg-devel,zlib-devel
+
+[suse:15.2:libnetsnmp-devel]
+packages=net-snmp-devel
+
+[suse:15.2:libpthread]
+packages=glibc
+
+[suse:15.2:libtool]
+packages=libtool,libgphoto2-devel,rpm-build
+
+[suse:15.2:libusb]
+packages=libusb-1_0-devel,libusb-1_0-0
+
+[suse:15.2:make]
+packages=make
+
+[suse:15.2:pil]
+packages=python-imaging
+
+[suse:15.2:ppdev]
+packages=
+commands=su -c "modprobe ppdev"
+
+[suse:15.2:pyqt]
+packages=python-qt
+
+[suse:15.2:pyqt4]
+packages=python-qt4
+
+[suse:15.2:pyqt4-dbus]
+packages=dbus-1-python-devel,dbus-1-python
+
+[suse:15.2:python-devel]
+packages=python-devel,python-xml,libpython2_7-1_0
+
+[suse:15.2:python23]
+packages=python
+
+[suse:15.2:python2X]
+packages=python
+
+[suse:15.2:reportlab]
+packages=
+
+[suse:15.2:sane]
+packages=xsane
+
+[suse:15.2:sane-devel]
+packages=sane-backends-devel
+
+[suse:15.2:scanimage]
+packages=sane-backends
+
+[suse:15.2:xsane]
+packages=xsane
+
+[suse:15.2:cups-ddk]
+packages=cupsddk
+
+[suse:15.2:python-dbus]
+packages=dbus-1-python
+
+[suse:15.2:dbus]
+packages=dbus-1-devel,python-gobject2
+
+[suse:15.2:python-xml]
+packages=python-xml,libpython2_7-1_0
+
+[suse:15.2:cups-image]
+packages=cups-devel
+
+[suse:15.2:python-notify]
+packages=python-notify
+
+[suse:15.2:network]
+packages=wget
+
+[suse:15.2:avahi-utils]
+packages=avahi-utils
+
+[suse:15.2:python3-pyqt4]
+packages=python3-qt4,python3-qt4-devel
+
+[suse:15.2:python3-dbus]
+packages=dbus-1-python3,python3-gobject,python3-gobject2-devel
+
+[suse:15.2:python3-xml]
+packages=python3-xml,python3-lxml
+
+[suse:15.2:python3-devel]
+packages=python3-devel
+
+[suse:15.2:python3-pyqt4-dbus]
+packages=dbus-1-python3-devel,dbus-1-python3
+
+[suse:15.2:python3-pil]
+packages=python3-Pillow
+
+[suse:15.2:python3-reportlab]
+packages=python3-reportlab
+
+[suse:15.2:python3-notify2]
+packages=python3-notify2
+
+[suse:15.2:automake]
+packages=automake
+
+[suse:15.2:libavahi-dev]
+packages=libavahi-devel
+
+
# ****************************************
[redhat]
index=6
@@ -1411,6 +1591,7 @@ package_mgrs=yum,rpm,up2date package_mgr_cmd=su -c "yum -y -d 10 -e 1 install $packages_to_install"
pre_depend_cmd=su -c "yum clean all",su -c "yum check-update"
post_depend_cmd=
+hp_libs_remove_cmd=sudo yum -y -d 10 -e 1 remove hplip-libs libsane-hpaio
#scanjet_depend_cmd=su -c "dnf -y -d 10 -e 1 install python2-pip",su -c "dnf -y -d 10 -e 1 install leptonica",su -c "dnf -y -d 10 -e 1 install leptonica-devel",su -c "dnf -y -d 10 -e 1 install tesseract",su -c "dnf -y -d 10 -e 1 install tesseract-devel",su -c "pip2 install tesserocr",su -c "dnf -y -d 10 -e 1 install tesseract-langpack-*",su -c "dnf -y -d 10 -e 1 install zbar-devel",su -c "pip2 install zbar",su -c "pip2 install opencv-python",su -c "pip2 install pypdf2",su -c "pip2 install imutils",su -c "pip2 install pypdfocr",su -c "pip2 install scikit-image",su -c "pip2 install scipy"
scanjet_depend_cmd=su -c "dnf -y -d 10 -e 1 install python-pip",su -c "pip install opencv-python",su -c "pip install pypdf2",su -c "pip install imutils",su -c "dnf -y -d 10 -e 1 install zbar-devel",su -c "dnf update gcc",su -c "dnf -y -d 10 -e 1 install zbar-*",su -c "dnf -y -d 10 -e 1 install ImageMagick*",su -c "dnf -y -d 10 -e 1 install leptonica",su -c "dnf -y -d 10 -e 1 install leptonica-devel",su -c "dnf -y -d 10 -e 1 install tesseract",su -c "dnf -y -d 10 -e 1 install tesseract-devel",su -c "pip install tesserocr",su -c "dnf -y -d 10 -e 1 install tesseract-langpack-*",su -c "dnf -y -d 10 -e 1 install tesseract-osd",,su -c "pip install pypdfocr",su -c "pip install scikit-image",su -c "pip install scipy"
scanjet_py3_depend_cmd=su -c "dnf -y -d 10 -e 1 install python3-pip",su -c "pip3 install opencv-python",su -c "pip3 install pypdf2",su -c "pip3 install imutils",su -c "dnf -y -d 10 -e 1 install ImageMagick*",su -c "dnf -y -d 10 -e 1 install leptonica",su -c "dnf -y -d 10 -e 1 install leptonica-devel",su -c "dnf -y -d 10 -e 1 install tesseract",su -c "dnf -y -d 10 -e 1 install tesseract-devel",su -c "pip3 install tesserocr",su -c "dnf -y -d 10 -e 1 install tesseract-langpack-*",su -c "dnf -y -d 10 -e 1 install tesseract-osd",su -c "pip3 install ocrmypdf",su -c "pip3 install scikit-image",su -c "pip3 install scipy"
@@ -1544,6 +1725,9 @@ packages=avahi-tools [fedora:17:automake]
packages=automake
+[fedora:17:libavahi-dev]
+packages=avahi-devel
+
# ********************
[fedora:18]
code_name=Sperical Cow
@@ -1665,6 +1849,9 @@ packages=avahi-tools [fedora:18:automake]
packages=automake
+[fedora:18:libavahi-dev]
+packages=avahi-devel
+
# ****************************************
[fedora:19]
@@ -1841,6 +2028,9 @@ packages=python3-reportlab [fedora:22:automake]
packages=automake
+[fedora:22:libavahi-dev]
+packages=avahi-devel
+
# ****************************************
[fedora:23]
@@ -2025,6 +2215,9 @@ packages=python3-reportlab [fedora:27:automake]
packages=automake
+[fedora:27:libavahi-dev]
+packages=avahi-devel
+
# ****************************************
@@ -2051,6 +2244,7 @@ native_cups=1 open_mdns_port=/bin/bash ./init-iptables-firewall
package_mgr_cmd= sudo dnf -y -d 10 -e 1 install $packages_to_install
pre_depend_cmd=sudo dnf check-update
+hp_libs_remove_cmd=sudo yum -y -d 10 -e 1 remove hplip-libs libsane-hpaio
scanjet_depend_cmd=sudo dnf -y -d 10 -e 1 install python-pip,sudo pip install opencv-python,sudo pip install pypdf2,sudo pip install imutils,sudo dnf -y -d 10 -e 1 install zbar-devel,sudo dnf update gcc,sudo dnf -y -d 10 -e 1 install zbar-*,sudo dnf -y -d 10 -e 1 install leptonica,sudo dnf -y -d 10 -e 1 install leptonica-devel,sudo dnf -y -d 10 -e 1 install tesseract,sudo dnf -y -d 10 -e 1 install tesseract-devel,sudo pip install tesserocr,sudo dnf -y -d 10 -e 1 install tesseract-langpack-*,sudo dnf -y -d 10 -e 1 install tesseract-osd, sudo pip install pypdfocr,sudo pip install scikit-image,sudo pip install scipy
scanjet_py3_depend_cmd=sudo dnf -y -d 10 -e 1 install python3-pip,sudo pip3 install opencv-python,sudo pip3 install pypdf2,sudo pip3 install imutils,sudo dnf -y -d 10 -e 1 install leptonica,sudo dnf -y -d 10 -e 1 install leptonica-devel,sudo dnf -y -d 10 -e 1 install tesseract,sudo dnf -y -d 10 -e 1 install tesseract-devel,sudo pip3 install tesserocr,sudo dnf -y -d 10 -e 1 install tesseract-langpack-*,sudo dnf -y -d 10 -e 1 install tesseract-osd,sudo pip3 install ocrmypdf,sudo pip3 install scikit-image,sudo pip3 install scipy
hplip_remove_cmd=sudo dnf -y -d 10 -e 1 remove hplip
@@ -2173,6 +2367,9 @@ packages=python3-reportlab [fedora:28:automake]
packages=automake
+[fedora:28:libavahi-dev]
+packages=avahi-devel
+
# ****************************************
[fedora:29]
@@ -2320,6 +2517,9 @@ packages=python3-reportlab [fedora:29:automake]
packages=automake
+[fedora:29:libavahi-dev]
+packages=avahi-devel
+
# ****************************************
[fedora:30]
@@ -2467,6 +2667,9 @@ packages=python3-reportlab [fedora:30:automake]
packages=automake
+[fedora:30:libavahi-dev]
+packages=avahi-devel
+
# ****************************************
[fedora:31]
@@ -2614,6 +2817,9 @@ packages=python3-reportlab [fedora:31:automake]
packages=automake
+[fedora:31:libavahi-dev]
+packages=avahi-devel
+
# ****************************************
[fedora:32]
@@ -2761,6 +2967,9 @@ packages=python3-reportlab [fedora:32:automake]
packages=automake
+[fedora:32:libavahi-dev]
+packages=avahi-devel
+
# ****************************************
[linspire]
@@ -2943,6 +3152,9 @@ packages=avahi-tools [rhel:5.0:automake]
packages=automake1.11
+[rhel:5.0:libavahi-dev]
+packages=avahi-devel
+
# ********************
[rhel:6.0]
code_name=Santiago
@@ -3063,6 +3275,9 @@ packages=avahi-tools [rhel:6.0:automake]
packages=automake1.11
+[rhel:6.0:libavahi-dev]
+packages=avahi-devel
+
# ****************************************
[rhel:7.0]
code_name=Maipo
@@ -3212,6 +3427,9 @@ packages=avahi-tools [rhel:8:0:automake]
packages=automake1.11
+[rhel:8.0:libavahi-dev]
+packages=avahi-devel
+
# ****************************************
[rhel:8.1]
code_name=Ootpa
@@ -3329,6 +3547,9 @@ packages=avahi-tools [rhel:8.1:automake]
packages=automake1.11
+[rhel:8.1:libavahi-dev]
+packages=avahi-devel
+
# ****************************************
[rhel:8.2]
packaged_version=3.20.6
@@ -3526,6 +3747,7 @@ notes= package_mgrs=pup,yum,rpm
package_mgr_cmd=su -c 'yum -y -d 10 -e 1 install $packages_to_install'
pre_depend_cmd=su -c 'yum list update'
+hp_libs_remove_cmd=su -c "yum -y -d 10 -e 1 remove hplip-libs libsane-hpaio"
post_depend_cmd=
hplip_remove_cmd=
su_sudo=su
@@ -3658,6 +3880,9 @@ packages=avahi-tools [centos:any:automake]
packages=automake1.11
+[centos:any:libavahi-dev]
+packages=avahi-devel
+
# ****************************************
[gentoo]
index=9
@@ -3713,6 +3938,7 @@ pre_install_cmd=su - -c "/etc/init.d/cups restart",su -c "touch /etc/security/co pre_depend_cmd=su -c "apt-get update"
post_depend_cmd=
hplip_remove_cmd=su -c "apt-get remove --yes hplip hpijs"
+hp_libs_remove_cmd=su -c "apt-get remove hplip-libs libsane-hpaio"
su_sudo=su
ppd_install=ppd
udev_mode_fix=1
@@ -3836,6 +4062,9 @@ packages=avahi [pclinuxos:2006.0:automake]
packages=automake1.11
+[pclinuxos:2006.0:libavahi-dev]
+packages=lib64avahi-common-devel,lib64avahi-core-devel,lib64avahi-client-devel
+
# ********************
[pclinuxos:2006]
same_as_version=2006.0
@@ -3958,6 +4187,9 @@ packages=avahi [pclinuxos:2007.0:automake]
packages=automake1.11
+[pclinuxos:2007.0:libavahi-dev]
+packages=lib64avahi-common-devel,lib64avahi-core-devel,lib64avahi-client-devel
+
# ********************
[pclinuxos:2007]
same_as_version=2007.0
@@ -4080,6 +4312,9 @@ packages=avahi [pclinuxos:2008.0:automake]
packages=automake1.11
+[pclinuxos:2008.0:libavahi-dev]
+packages=lib64avahi-common-devel,lib64avahi-core-devel,lib64avahi-client-devel
+
# ********************
[pclinuxos:2008]
same_as_version=2008.0
@@ -4202,6 +4437,9 @@ packages=avahi [pclinuxos:2009.0:automake]
packages=automake1.11
+[pclinuxos:2009.0:libavahi-dev]
+packages=lib64avahi-common-devel,lib64avahi-core-devel,lib64avahi-client-devel
+
# ********************
[pclinuxos:2009]
same_as_version=2009.0
@@ -4324,6 +4562,9 @@ packages=avahi [pclinuxos:2009.1:automake]
packages=automake1.11
+[pclinuxos:2009.1:libavahi-dev]
+packages=lib64avahi-common-devel,lib64avahi-core-devel,lib64avahi-client-devel
+
# ****************************************
[igos]
index=32
@@ -4473,6 +4714,7 @@ package_mgrs=dpkg,apt-get,synaptic,update-manager,adept,aptitude,adept-updater package_mgr_cmd=sudo apt-get install --assume-yes $packages_to_install
pre_depend_cmd=sudo dpkg --configure -a,sudo apt-get install --yes --force-yes -f,sudo apt-get update
post_depend_cmd=
+hp_libs_remove_cmd= sudo apt-get remove libhpmud0 libsane-hpaio
scanjet_depend_cmd=sudo apt-get install --assume-yes python-pip,sudo pip2 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip2 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo -H pip2 install opencv-python,sudo -H pip2 install PyPDF2,sudo -H pip2 install imutils,sudo -H pip2 install pypdfocr,sudo -H pip2 install scikit-image,sudo -H pip2 install scipy
#sudo apt-get install --assume-yes tesseract-ocr-all
scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image,sudo -H pip3 install scipy,sudo apt-get install --assume-yes qpdf
@@ -4605,6 +4847,9 @@ packages=wget [ubuntu:10.04:avahi-utils]
packages=avahi-utils
+[ubuntu:10.04:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
[ubuntu:10.04:automake]
packages=automake1.11
@@ -4732,6 +4977,9 @@ packages=wget [ubuntu:11.10:avahi-utils]
packages=avahi-utils
+[ubuntu:11.10:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
[ubuntu:11.10:automake]
packages=automake1.11
@@ -4883,6 +5131,9 @@ packages=python3-dev [ubuntu:12.04:python3-pil]
packages=PKG_FROM_PIP:pillow
+[ubuntu:12.04:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
[ubuntu:12.04:automake]
packages=automake1.11
@@ -5041,6 +5292,9 @@ packages=python3-dev [ubuntu:13.04:python3-pil]
packages=python3-imaging
+[ubuntu:13.04:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
[ubuntu:13.04:automake]
packages=automake1.11
@@ -5191,6 +5445,9 @@ packages=python3-imaging [ubuntu:13.10:python3-reportlab]
packages=python3-reportlab
+[ubuntu:13.10:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
[ubuntu:13.10:automake]
packages=automake1.11
@@ -5348,6 +5605,9 @@ packages=python3-pil [ubuntu:14.10:python3-reportlab]
packages=python3-reportlab
+[ubuntu:14.10:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
[ubuntu:14.10:automake]
packages=automake1.11
@@ -5498,6 +5758,9 @@ packages=python3-pil [ubuntu:15.04:python3-reportlab]
packages=python3-reportlab
+[ubuntu:15.04:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
[ubuntu:15.04:automake]
packages=automake1.11
@@ -5515,6 +5778,9 @@ same_as_version=15.04 [ubuntu:15.10:python3-devel]
packages=python3-dev,python3.4-dev,python3.5-dev
+[ubuntu:15.10:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
# ********************
[ubuntu:16.04]
code_name=Xenial
@@ -5644,6 +5910,9 @@ packages=wget [ubuntu:16.04:avahi-utils]
packages=avahi-utils
+[ubuntu:16.04:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
[ubuntu:16.04:python3-notify2]
packages=python3-notify2
@@ -5808,6 +6077,9 @@ packages=wget [ubuntu:16.10:avahi-utils]
packages=avahi-utils
+[ubuntu:16.10:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
[ubuntu:16.10:python3-notify2]
packages=python3-notify2
@@ -5972,6 +6244,9 @@ packages=wget [ubuntu:17.04:avahi-utils]
packages=avahi-utils
+[ubuntu:17.04:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
[ubuntu:17.04:python3-notify2]
packages=python3-notify2
@@ -6137,6 +6412,9 @@ packages=wget [ubuntu:17.10:avahi-utils]
packages=avahi-utils
+[ubuntu:17.10:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
[ubuntu:17.10:python3-notify2]
packages=python3-notify2
@@ -6300,6 +6578,9 @@ packages=wget [ubuntu:18.04:avahi-utils]
packages=avahi-utils
+[ubuntu:18.04:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
[ubuntu:18.04:python3-notify2]
packages=python3-notify2
@@ -6469,6 +6750,9 @@ packages=wget [ubuntu:18.10:avahi-utils]
packages=avahi-utils
+[ubuntu:18.10:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
[ubuntu:18.10:python3-notify2]
packages=python3-notify2
@@ -6638,6 +6922,9 @@ packages=wget [ubuntu:19.04:avahi-utils]
packages=avahi-utils
+[ubuntu:19.04:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
[ubuntu:19.04:python3-notify2]
packages=python3-notify2
@@ -6808,6 +7095,9 @@ packages=wget [ubuntu:19.10:avahi-utils]
packages=avahi-utils
+[ubuntu:19.10:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
[ubuntu:19.10:python3-notify2]
packages=python3-notify2
@@ -6977,6 +7267,9 @@ packages=wget [ubuntu:20.04:avahi-utils]
packages=avahi-utils
+[ubuntu:20.04:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
[ubuntu:20.04:python3-notify2]
packages=python3-notify2
@@ -7011,7 +7304,7 @@ packages=epm # ****************************************
[debian]
index=2
-versions=6.0,6.0.1,6.0.2,6.0.3,6.0.4,6.0.5,6.0.6,6.0.7,6.0.8,6.0.9,6.0.10,7.0,7.1,7.2,7.3,7.4,7.5,7.6,7.7,7.8,7.9,8.0,8.1,8.2,8.3,8.4,8.5,8.6,8.7,8.8,9.1,9.2,9.3,9.4,9.5,9.6,9.7,9.8,9.9,10.0,10.1,10.2,10.3
+versions=6.0,6.0.1,6.0.2,6.0.3,6.0.4,6.0.5,6.0.6,6.0.7,6.0.8,6.0.9,6.0.10,7.0,7.1,7.2,7.3,7.4,7.5,7.6,7.7,7.8,7.9,8.0,8.1,8.2,8.3,8.4,8.5,8.6,8.7,8.8,9.1,9.2,9.3,9.4,9.5,9.6,9.7,9.8,9.9,10.0,10.1,10.2,10.3,10.4
display_name=Debian
alt_names=
display=1
@@ -7020,6 +7313,7 @@ package_mgrs=dpkg,apt-get,synaptic,update-manager,adept,aptitude package_mgr_cmd=su -c "apt-get install --force-yes -y $packages_to_install"
pre_depend_cmd=su -c "dpkg --configure -a",su -c "apt-get install -f",su -c "apt-get update"
post_depend_cmd=
+hp_libs_remove_cmd= sudo apt-get remove libhpmud0 libsane-hpaio
#su -c "apt-get install --force-yes -y python-qt4",su -c "apt-get install --force-yes -y python-qt4-dbus",
scanjet_depend_cmd=su -c "apt-get install --force-yes -y python-pip",su -c "pip install --upgrade pip",su -c "apt-get install --force-yes -y libleptonica-dev",su -c "apt-get install --force-yes -y tesseract-ocr",su -c "apt-get install --force-yes -y libtesseract-dev",su -c "pip install tesserocr",su -c "apt-get install --force-yes -y libzbar-dev",su -c "apt-get install --force-yes -y python-zbar",su -c "apt-get install --force-yes -y python-opencv",su -c "apt-get install --force-yes -y python-pypdf2",su -c "pip install imutils",su -c "pip install pypdfocr",su -c "pip install scikit-image",su -c "pip install scipy"
#su -c "apt-get install --force-yes -y tesseract-ocr-all",
@@ -7163,6 +7457,9 @@ packages=automake1.11 [debian:6.0:epm]
packages=epm
+[debian:6.0:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
# *********************
[debian:6.0.1]
same_as_version=6.0
@@ -7350,6 +7647,8 @@ packages=automake1.11 [debian:7.0:epm]
packages=epm
+[debian:7.0:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
# ****************************************
@@ -7540,6 +7839,8 @@ packages=automake1.11 [debian:8.0:epm]
packages=epm
+[debian:8.0:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
# *********************
@@ -7727,6 +8028,8 @@ packages=automake1.11 [debian:8.4:epm]
packages=epm
+[debian:8.4:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
# *********************
@@ -7899,6 +8202,9 @@ packages=automake1.11 [debian:8.5:epm]
packages=epm
+[debian:8.5:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
# *********************
@@ -8024,7 +8330,8 @@ packages=automake1.11 [debian:8.6:epm]
packages=epm
-
+[debian:8.6:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
# *********************
@@ -8150,6 +8457,8 @@ packages=automake1.11 [debian:8.7:epm]
packages=epm
+[debian:8.7:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
# *********************
@@ -8278,6 +8587,8 @@ packages=automake1.11 [debian:8.8:epm]
packages=epm
+[debian:8.8:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
# *********************
@@ -8403,7 +8714,8 @@ packages=automake1.11 [debian:9.1:epm]
packages=epm
-
+[debian:9.1:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
# ****************************************
@@ -8594,6 +8906,8 @@ packages=python-dbus.mainloop.pyqt5 packages=automake1.11
[debian:9.9:epm]
packages=epm
+[debian:9.9:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
# ****************************************
[debian:10.0]
@@ -8716,6 +9030,9 @@ packages=automake1.11 [debian:10.0:epm]
packages=epm
+[debian:10.0:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
# ****************************************
[debian:10.1]
@@ -8838,6 +9155,9 @@ packages=automake1.11 [debian:10.1:epm]
packages=epm
+[debian:10.1:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
# ****************************************
[debian:10.2]
code_name=Buster
@@ -8956,6 +9276,8 @@ packages=python-dbus.mainloop.pyqt5 packages=automake1.11
[debian:10.2:epm]
packages=epm
+[debian:10.2:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
# ****************************************
@@ -9076,9 +9398,132 @@ packages=python-dbus.mainloop.pyqt5 packages=automake1.11
[debian:10.3:epm]
packages=epm
+[debian:10.3:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+# ****************************************
+[debian:10.4]
+code_name=Buster
+supported=1
+scan_supported=1
+fax_supported=1
+pcard_supported=1
+network_supported=1
+parallel_supported=1
+usb_supported=1
+packaged_version=3.20.9
+release_date=09/05/2020
+notes=NOTE: Disable the CD Sources in your apt sources.list or the install will fail and hang.
+ppd_install=drv
+udev_mode_fix=1
+ppd_dir=/usr/share/ppd/HP
+fix_ppd_symlink=0
+drv_dir=/usr/share/cups/drv/HP
+ui_toolkit=qt5
+native_cups=1
+policykit=0
+# This libdir_path will be used only for 64 bit machine.
+libdir_path=/usr/lib/x86_64-linux-gnu
+[debian:10.4:cups]
+packages=cups,libcups2
+[debian:10.4:cups-devel]
+packages=libcups2-dev,cups-bsd,cups-client
+[debian:10.4:gcc]
+packages=g++
+[debian:10.4:gs]
+packages=ghostscript,ghostscript-cups,ghostscript-x
+[debian:10.4:libcrypto]
+packages=libssl-dev
+[debian:10.4:libjpeg]
+packages=libjpeg62-turbo-dev
+[debian:10.4:libnetsnmp-devel]
+packages=libsnmp-dev,snmp
+[debian:10.4:libpthread]
+packages=libc6
+[debian:10.4:libtool]
+packages=libtool,libtool-bin
+[debian:10.4:libusb]
+packages=libusb-1.0.0-dev
+[debian:10.4:make]
+packages=make
+[debian:10.4:ppdev]
+packages=
+commands=su -c "modprobe ppdev",su -c cp -f /etc/modules /etc/modules.hplip,echo ppdev | su -c tee -a /etc/modules
+[debian:10.4:pyqt]
+packages=python-qt3
+[debian:10.4:python-devel]
+packages=python-dev
+[debian:10.4:pyqt4]
+packages=python-qt4
+[debian:10.4:pyqt4-dbus]
+packages=python-qt4-dbus
+[debian:10.4:python23]
+packages=python
+[debian:10.4:python2X]
+packages=python
+[debian:10.4:reportlab]
+packages=python-reportlab
+[debian:10.4:sane]
+packages=sane
+[debian:10.4:sane-devel]
+packages=libsane-dev
+[debian:10.4:scanimage]
+packages=sane-utils
+[debian:10.4:xsane]
+packages=xsane
+[debian:10.4:cups-ddk]
+packages=
+[debian:10.4:python-dbus]
+packages=python-dbus,python-gobject
+[debian:10.4:dbus]
+packages=libdbus-1-dev
+[debian:10.4:python-ctypes]
+packages=python-ctypes
+[debian:10.4:cups-image]
+packages=libcupsimage2,libcupsimage2-dev
+[debian:10.4:policykit]
+packages=policykit-1,policykit-1-gnome
+[debian:10.4:python-notify]
+packages=python-notify
+[debian:10.4:network]
+packages=wget
+[debian:10.4:avahi-utils]
+packages=avahi-utils
+[debian:10.4:gtk]
+packages=libcanberra-gtk-module
+[debian:10.4:python3-notify2]
+packages=python3-notify2
+[debian:10.4:python3-pyqt4-dbus]
+packages=python3-dbus.mainloop.qt
+[debian:10.4:python3-pyqt4]
+packages=python3-pyqt4,gtk2-engines-pixbuf
+[debian:10.4:python3-dbus]
+packages=python3-dbus,python3-gi
+[debian:10.4:python3-xml]
+packages=python3-lxml
+[debian:10.4:python3-devel]
+packages=python3-dev
+[debian:10.4:python3-pil]
+packages=python3-pil
+[debian:10.4:python3-reportlab]
+packages=python3-reportlab
+[debian:10.4:python3-pyqt5-dbus]
+packages=python3-dbus.mainloop.pyqt5
+[debian:10.4:python3-pyqt5]
+packages=python3-pyqt5,gtk2-engines-pixbuf
+[debian:10.4:pyqt5]
+packages=gtk2-engines-pixbuf,python-pyqt5
+[debian:10.4:pyqt5-dbus]
+packages=python-dbus.mainloop.pyqt5
+[debian:10.4:automake]
+packages=automake1.11
+[debian:10.4:epm]
+packages=epm
+[debian:10.4:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
# ****************************************
+
[xandros]
index=13
versions=any
@@ -11179,7 +11624,7 @@ packages=epm # ****************************************
[linuxmint]
index=22
-versions=13,14,15,16,17,17.1,17.2,17.3,18,18.1,18.2,18.3,19,19.1,19.2,19.3
+versions=13,14,15,16,17,17.1,17.2,17.3,18,18.1,18.2,18.3,19,19.1,19.2,19.3,20
display_name=Linux Mint
alt_names=mint, mint linux
display=1
@@ -11188,6 +11633,7 @@ package_mgrs=dpkg,apt-get,synaptic,update-manager,adept,aptitude,adept-updater package_mgr_cmd=sudo apt-get install --assume-yes $packages_to_install
pre_depend_cmd=sudo dpkg --configure -a,sudo apt-get install --yes --force-yes -f,sudo apt-get update
post_depend_cmd=
+hp_libs_remove_cmd= sudo apt-get remove libhpmud0 libsane-hpaio
scanjet_depend_cmd=sudo apt-get install --assume-yes python-pip,sudo pip install --upgrade pip,sudo -H pip install setuptools,sudo pip install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-eng,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo apt-get install --assume-yes python-opencv,sudo apt-get install --assume-yes python-pypdf2,sudo -H pip install imutils,sudo apt-get install --assume-yes imagemagick*,sudo apt-get install --assume-yes graphicsmagick* ,sudo -H pip install pypdfocr,sudo -H pip install scikit-image,sudo -H pip install scipy
scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo -H pip3 install setuptools,sudo pip3 install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-eng,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo apt-get install --assume-yes imagemagick*,sudo apt-get install --assume-yes graphicsmagick*,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image,sudo -H pip3 install scipy
hplip_remove_cmd=sudo aptitude remove --assume-yes hplip hpijs
@@ -11348,6 +11794,8 @@ packages=automake1.11 [linuxmint:13:epm]
packages=epm
+[linuxmint:13:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
# ****************************************
@@ -11496,6 +11944,9 @@ packages=automake1.11 [linuxmint:14:epm]
packages=epm
+[linuxmint:14:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
# ****************************************
@@ -11647,6 +12098,10 @@ packages=automake1.11 [linuxmint:15:epm]
packages=epm
+[linuxmint:15:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
+
# ****************************************
[linuxmint:16]
@@ -11807,6 +12262,10 @@ packages=automake1.11 [linuxmint:17:epm]
packages=epm
+[linuxmint:17:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
+
# ****************************************
[linuxmint:17.1]
@@ -11986,6 +12445,10 @@ packages=automake1.11 [linuxmint:18:epm]
packages=epm
+[linuxmint:18:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
+
# ****************************************
[linuxmint:18.1]
@@ -12138,6 +12601,10 @@ packages=automake1.11 [linuxmint:18.1:epm]
packages=epm
+[linuxmint:18.1:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
+
# ****************************************
[linuxmint:18.2]
@@ -12290,6 +12757,9 @@ packages=automake1.11 [linuxmint:18.2:epm]
packages=epm
+[linuxmint:18.2:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
# ****************************************
@@ -12445,6 +12915,10 @@ packages=automake1.11 [linuxmint:18.3:epm]
packages=epm
+[linuxmint:18.3:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
+
# ****************************************
@@ -12600,6 +13074,8 @@ packages=automake1.11 [linuxmint:19:epm]
packages=epm
+[linuxmint:19:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
# ****************************************
@@ -12757,6 +13233,10 @@ packages=automake1.11 [linuxmint:19.1:epm]
packages=epm
+[linuxmint:19.1:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
+
# ****************************************
[linuxmint:19.2]
@@ -12913,6 +13393,8 @@ packages=automake1.11 [linuxmint:19.2:epm]
packages=epm
+[linuxmint:19.2:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
# ****************************************
@@ -13070,8 +13552,153 @@ packages=automake1.11 [linuxmint:19.3:epm]
packages=epm
+[linuxmint:19.3:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
+
# ****************************************
+[linuxmint:20]
+code_name=Ulyana
+packaged_version=3.20.9
+release_date=23/04/20
+supported=1
+scan_supported=1
+fax_supported=1
+pcard_supported=1
+network_supported=1
+parallel_supported=1
+usb_supported=1
+notes=Enable the universe/multiverse repositories. Also be sure you are using the Ubuntu "Main" Repositories. See: https://help.ubuntu.com/community/Repositories/Ubuntu for more information. Disable the CD-ROM/DVD source if you do not have the Ubuntu installation media inserted in the drive.
+ppd_install=drv
+udev_mode_fix=1
+ppd_dir=/usr/share/ppd/HP
+fix_ppd_symlink=0
+drv_dir=/usr/share/cups/drv/HP
+ui_toolkit=qt5
+native_cups=1
+acl_rules=1
+#scanjet_depend_cmd=sudo apt-get install --assume-yes python2-pip,sudo pip2 install --upgrade pip,sudo -H pip2 install setuptools,sudo pip2 install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip2 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo apt-get install --assume-yes python-opencv,sudo apt-get install --assume-yes python-pypdf2,sudo -H pip2 install imutils,sudo -H pip2 install pypdfocr,sudo -H pip2 install scikit-image,sudo -H pip2 install scipy
+#scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo -H pip3 install setuptools,sudo pip3 install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image,sudo -H pip3 install scipy
+
+libdir_path=/usr/lib/x86_64-linux-gnu
+
+[linuxmint:20:cups]
+packages=libcups2
+
+[linuxmint:20:cups-devel]
+packages=libcups2-dev,cups-bsd,cups-client
+
+[linuxmint:20:gcc]
+packages=build-essential
+
+[linuxmint:20:gs]
+packages=ghostscript
+
+[linuxmint:20:libcrypto]
+packages=
+commands=sudo DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install openssl
+
+[linuxmint:20:libjpeg]
+packages=libjpeg8-dev
+
+[linuxmint:20:libnetsnmp-devel]
+packages=
+commands=sudo DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install libsnmp-dev,sudo apt-get --assume-yes install snmp-mibs-downloader
+
+[linuxmint:20:libpthread]
+packages=build-essential
+
+[linuxmint:20:libtool]
+packages=libtool,libtool-bin
+
+[linuxmint:20:libusb]
+packages=libusb-1.0.0-dev
+
+[linuxmint:20:make]
+packages=build-essential
+
+#[linuxmint:20:pil]
+#packages=python-imaging
+
+[linuxmint:20:ppdev]
+packages=
+commands=sudo modprobe ppdev,sudo cp -f /etc/modules /etc/modules.hplip,echo ppdev | sudo tee -a /etc/modules
+
+[linuxmint:20:reportlab]
+packages=python-reportlab
+
+[linuxmint:20:sane]
+packages=libsane
+
+[linuxmint:20:sane-devel]
+packages=libsane-dev
+
+[linuxmint:20:scanimage]
+packages=sane-utils
+
+[linuxmint:20:xsane]
+packages=xsane
+
+[linuxmint:20:python-dbus]
+packages=python-dbus,python-gobject
+
+[linuxmint:20:dbus]
+packages=libdbus-1-dev
+
+[linuxmint:20:cups-image]
+packages=libcupsimage2-dev
+
+[linuxmint:20:cups-ddk]
+packages=cups,libcupsimage2-dev
+
+[linuxmint:20:policykit]
+packages=policykit-1,policykit-1-gnome
+
+[linuxmint:20:python-notify]
+packages=python-notify
+
+[linuxmint:20:network]
+packages=wget
+
+[linuxmint:20:avahi-utils]
+packages=avahi-utils
+
+[linuxmint:20:python3-pyqt5-dbus]
+packages=python3-dbus.mainloop.pyqt5
+
+[linuxmint:20:python3-pyqt5]
+packages=python3-pyqt5,gtk2-engines-pixbuf
+
+[linuxmint:20:python3-dbus]
+packages=python3-dbus,python3-gi
+
+[linuxmint:20:python3-xml]
+packages=python3-lxml
+
+[linuxmint:20:python3-devel]
+packages=python3-dev
+
+[linuxmint:20:python3-pil]
+packages=python3-pil
+
+[linuxmint:20:python3-reportlab]
+packages=python3-reportlab
+
+[linuxmint:20:python3-notify2]
+packages=python3-notify2,mate-notification-daemon
+
+[linuxmint:20:automake]
+packages=automake1.11
+
+[linuxmint:20:epm]
+packages=epm
+
+[linuxmint:20:libavahi-dev]
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
+
+
+# ****************************************
[linpus]
index=25
versions=9.4,9.5
@@ -14081,6 +14708,8 @@ packages= [manjarolinux:17.1.4:automake]
packages=automake
+[manjarolinux:17.1.4:libavahi-dev]
+packages=avahi
# ****************************************
@@ -14262,6 +14891,9 @@ packages= [manjarolinux:18.0:automake]
packages=automake
+[manjarolinux:18.0:libavahi-dev]
+packages=avahi
+
# ****************************************
[manjarolinux:18.0.4]
@@ -14442,6 +15074,9 @@ packages= [manjarolinux:18.0.4:automake]
packages=automake
+[manjarolinux:18.0.4:libavahi-dev]
+packages=avahi
+
# ****************************************
[manjarolinux:18.1.0]
@@ -14612,6 +15247,9 @@ packages= [manjarolinux:18.1.0:automake]
packages=automake
+[manjarolinux:18.1.0:libavahi-dev]
+packages=avahi
+
# ****************************************
@@ -14783,6 +15421,9 @@ packages= [manjarolinux:18.1.2:automake]
packages=automake
+[manjarolinux:18.1.2:libavahi-dev]
+packages=avahi
+
# ****************************************
@@ -14954,6 +15595,9 @@ packages= [manjarolinux:19.0:automake]
packages=automake
+[manjarolinux:19.0:libavahi-dev]
+packages=avahi
+
# ****************************************
[manjarolinux:20.0.1]
@@ -15124,3 +15768,6 @@ packages= [manjarolinux:20.0.1:automake]
packages=automake
+[manjarolinux:20.0.1:libavahi-dev]
+packages=avahi
+
diff --git a/installer/text_install.py b/installer/text_install.py index e23fe9a9a..020ff90ef 100755 --- a/installer/text_install.py +++ b/installer/text_install.py @@ -781,6 +781,13 @@ def start(language, auto=True, test_depends=False, log.info("OK") # + # HPLIP LIBS REMOVE COMMANDS + # + tui.title("RUNNING HPLIP LIBS REMOVE COMMANDS") + core.remove_default_hplip_libs(progress_callback, distro_alternate_version) + log.info("OK") + + # # REQUIRED DEPENDENCIES INSTALL # package_mgr_cmd = core.get_distro_ver_data('package_mgr_cmd') @@ -1262,6 +1269,10 @@ def start(language, auto=True, test_depends=False, cmd1 = 'sudo pacman -Sy --force --noconfirm ghostscript' if os_utils.execute(cmd1) != 0: log.warning("Missing ghost script dependency,installation may fail") + if core.distro_version >= '19.0': + cmd3 = 'sudo pacman -Sy --noconfirm libxcrypt --overwrite "*"' + if os_utils.execute(cmd3) != 0: + log.warning("Missing libxcrypt dependency, configure may fail due to missing crypt.h") if core.distro_name.lower() == 'fedora' and core.distro_version >= '30': cmd_fedora = 'sudo dnf -y -d 10 -e 1 install dbus-devel' diff --git a/io/hpmud/hpmud.c b/io/hpmud/hpmud.c index 0eb6fff3a..12209e93e 100644 --- a/io/hpmud/hpmud.c +++ b/io/hpmud/hpmud.c @@ -506,10 +506,10 @@ int hpmud_get_uri_datalink(const char *uri, char *buf, int buf_size) if (zc) { #ifdef HAVE_LIBNETSNMP - if (mdns_lookup(p, ip) != MDNS_STATUS_OK) + if (avahi_lookup(p) != AVAHI_STATUS_OK) return 0; - for (i=0; (ip[i] != 0) && (i < buf_size); i++) - buf[i] = ip[i]; + for (i=0; (ipAddressBuff[i] != 0) && (i < buf_size); i++) + buf[i] = ipAddressBuff[i]; #else return 0; #endif diff --git a/io/hpmud/hpmudi.h b/io/hpmud/hpmudi.h index fca8fdd02..22ddce66e 100644 --- a/io/hpmud/hpmudi.h +++ b/io/hpmud/hpmudi.h @@ -52,7 +52,8 @@ #include "pml.h" #ifdef HAVE_LIBNETSNMP #include "jd.h" -#include "mdns.h" +//#include "mdns.h" +#include "avahiDiscovery.h" #endif #ifdef HAVE_PPORT #include "pp.h" diff --git a/io/hpmud/jd.c b/io/hpmud/jd.c index 06f5072ee..975baf34a 100644 --- a/io/hpmud/jd.c +++ b/io/hpmud/jd.c @@ -773,7 +773,7 @@ enum HPMUD_RESULT hpmud_make_mdns_uri(const char *host, int port, char *uri, int goto bugout; } - if (mdns_lookup(host, ip) != MDNS_STATUS_OK) + if (avahi_lookup(host) != AVAHI_STATUS_OK) { BUG("invalid host %s, check firewall UDP/5353 or try using IP\n", host); stat = HPMUD_R_INVALID_MDNS; diff --git a/io/mudext/hpmudext.c b/io/mudext/hpmudext.c index 975fe48e6..23906f11a 100644 --- a/io/mudext/hpmudext.c +++ b/io/mudext/hpmudext.c @@ -344,12 +344,12 @@ static PyObject *get_zc_ip_address(PyObject *self, PyObject *args) Py_BEGIN_ALLOW_THREADS - if(mdns_lookup(hn, ip) != MDNS_STATUS_OK) + if(avahi_lookup(hn) != AVAHI_STATUS_OK) result = HPMUD_R_INVALID_MDNS; Py_END_ALLOW_THREADS - return Py_BuildValue("(is)", result, ip); + return Py_BuildValue("(is)", result, ipAddressBuff); } #else static PyObject *get_zc_ip_address(PyObject *self, PyObject *args) diff --git a/ppd/classppd/hpcups/hp-Ampere.ppd.gz b/ppd/classppd/hpcups/hp-Ampere.ppd.gz Binary files differindex 28210cda2..e6985fdd8 100644 --- a/ppd/classppd/hpcups/hp-Ampere.ppd.gz +++ b/ppd/classppd/hpcups/hp-Ampere.ppd.gz diff --git a/ppd/classppd/hpcups/hp-CLE.ppd.gz b/ppd/classppd/hpcups/hp-CLE.ppd.gz Binary files differindex dd057a56d..d63b8ffc5 100644 --- a/ppd/classppd/hpcups/hp-CLE.ppd.gz +++ b/ppd/classppd/hpcups/hp-CLE.ppd.gz diff --git a/ppd/classppd/hpcups/hp-CLE17.ppd.gz b/ppd/classppd/hpcups/hp-CLE17.ppd.gz Binary files differindex dc090ec9e..3970654fc 100644 --- a/ppd/classppd/hpcups/hp-CLE17.ppd.gz +++ b/ppd/classppd/hpcups/hp-CLE17.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Copperhead.ppd.gz b/ppd/classppd/hpcups/hp-Copperhead.ppd.gz Binary files differindex 25d69be9f..92ccfb239 100644 --- a/ppd/classppd/hpcups/hp-Copperhead.ppd.gz +++ b/ppd/classppd/hpcups/hp-Copperhead.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Copperhead12.ppd.gz b/ppd/classppd/hpcups/hp-Copperhead12.ppd.gz Binary files differindex c4b34ba47..f1fdd9fed 100644 --- a/ppd/classppd/hpcups/hp-Copperhead12.ppd.gz +++ b/ppd/classppd/hpcups/hp-Copperhead12.ppd.gz diff --git a/ppd/classppd/hpcups/hp-CopperheadIPH.ppd.gz b/ppd/classppd/hpcups/hp-CopperheadIPH.ppd.gz Binary files differindex 39595be91..ff9476502 100644 --- a/ppd/classppd/hpcups/hp-CopperheadIPH.ppd.gz +++ b/ppd/classppd/hpcups/hp-CopperheadIPH.ppd.gz diff --git a/ppd/classppd/hpcups/hp-CopperheadIPH15.ppd.gz b/ppd/classppd/hpcups/hp-CopperheadIPH15.ppd.gz Binary files differindex ce0a7dd21..ab6f3ccfe 100644 --- a/ppd/classppd/hpcups/hp-CopperheadIPH15.ppd.gz +++ b/ppd/classppd/hpcups/hp-CopperheadIPH15.ppd.gz diff --git a/ppd/classppd/hpcups/hp-CopperheadIPH17.ppd.gz b/ppd/classppd/hpcups/hp-CopperheadIPH17.ppd.gz Binary files differindex 09eec801c..e0440d9ba 100644 --- a/ppd/classppd/hpcups/hp-CopperheadIPH17.ppd.gz +++ b/ppd/classppd/hpcups/hp-CopperheadIPH17.ppd.gz diff --git a/ppd/classppd/hpcups/hp-CopperheadXLP.ppd.gz b/ppd/classppd/hpcups/hp-CopperheadXLP.ppd.gz Binary files differindex abedca7c7..414416fa1 100644 --- a/ppd/classppd/hpcups/hp-CopperheadXLP.ppd.gz +++ b/ppd/classppd/hpcups/hp-CopperheadXLP.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Corbett.ppd.gz b/ppd/classppd/hpcups/hp-Corbett.ppd.gz Binary files differindex 816eaaea3..92b05b21b 100644 --- a/ppd/classppd/hpcups/hp-Corbett.ppd.gz +++ b/ppd/classppd/hpcups/hp-Corbett.ppd.gz diff --git a/ppd/classppd/hpcups/hp-DJ55xx.ppd.gz b/ppd/classppd/hpcups/hp-DJ55xx.ppd.gz Binary files differindex 5daa25ee1..fcc8a0513 100644 --- a/ppd/classppd/hpcups/hp-DJ55xx.ppd.gz +++ b/ppd/classppd/hpcups/hp-DJ55xx.ppd.gz diff --git a/ppd/classppd/hpcups/hp-DJ9xxVIP.ppd.gz b/ppd/classppd/hpcups/hp-DJ9xxVIP.ppd.gz Binary files differindex 479fc8ce2..0f9f80a39 100644 --- a/ppd/classppd/hpcups/hp-DJ9xxVIP.ppd.gz +++ b/ppd/classppd/hpcups/hp-DJ9xxVIP.ppd.gz diff --git a/ppd/classppd/hpcups/hp-DJGenericVIP.ppd.gz b/ppd/classppd/hpcups/hp-DJGenericVIP.ppd.gz Binary files differindex c963f1164..7d9efbb1a 100644 --- a/ppd/classppd/hpcups/hp-DJGenericVIP.ppd.gz +++ b/ppd/classppd/hpcups/hp-DJGenericVIP.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Gemstone.ppd.gz b/ppd/classppd/hpcups/hp-Gemstone.ppd.gz Binary files differindex 6baf5a0a0..3002a2c88 100644 --- a/ppd/classppd/hpcups/hp-Gemstone.ppd.gz +++ b/ppd/classppd/hpcups/hp-Gemstone.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Kapan.ppd.gz b/ppd/classppd/hpcups/hp-Kapan.ppd.gz Binary files differindex debc69baa..b5eaa75b6 100644 --- a/ppd/classppd/hpcups/hp-Kapan.ppd.gz +++ b/ppd/classppd/hpcups/hp-Kapan.ppd.gz diff --git a/ppd/classppd/hpcups/hp-LJ-Class1.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class1.ppd.gz Binary files differindex dbf0223c9..577971a7c 100644 --- a/ppd/classppd/hpcups/hp-LJ-Class1.ppd.gz +++ b/ppd/classppd/hpcups/hp-LJ-Class1.ppd.gz diff --git a/ppd/classppd/hpcups/hp-LJ-Class2.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class2.ppd.gz Binary files differindex 229b9e077..66e83feb8 100644 --- a/ppd/classppd/hpcups/hp-LJ-Class2.ppd.gz +++ b/ppd/classppd/hpcups/hp-LJ-Class2.ppd.gz diff --git a/ppd/classppd/hpcups/hp-LJ-Class3.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class3.ppd.gz Binary files differindex ac7bd0256..73c0374d8 100644 --- a/ppd/classppd/hpcups/hp-LJ-Class3.ppd.gz +++ b/ppd/classppd/hpcups/hp-LJ-Class3.ppd.gz diff --git a/ppd/classppd/hpcups/hp-LJ-Class4.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class4.ppd.gz Binary files differindex 3b4534d17..5f4bb2f6b 100644 --- a/ppd/classppd/hpcups/hp-LJ-Class4.ppd.gz +++ b/ppd/classppd/hpcups/hp-LJ-Class4.ppd.gz diff --git a/ppd/classppd/hpcups/hp-LJ-Class4A.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class4A.ppd.gz Binary files differindex 184782f10..6d9bf21c5 100644 --- a/ppd/classppd/hpcups/hp-LJ-Class4A.ppd.gz +++ b/ppd/classppd/hpcups/hp-LJ-Class4A.ppd.gz diff --git a/ppd/classppd/hpcups/hp-LJ-Class5.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class5.ppd.gz Binary files differindex 2a2cdb22e..1c4b01260 100644 --- a/ppd/classppd/hpcups/hp-LJ-Class5.ppd.gz +++ b/ppd/classppd/hpcups/hp-LJ-Class5.ppd.gz diff --git a/ppd/classppd/hpcups/hp-LJ-Class6.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class6.ppd.gz Binary files differindex 00394e93e..00a8a4c66 100644 --- a/ppd/classppd/hpcups/hp-LJ-Class6.ppd.gz +++ b/ppd/classppd/hpcups/hp-LJ-Class6.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Mimas.ppd.gz b/ppd/classppd/hpcups/hp-Mimas.ppd.gz Binary files differindex 3343017e4..0beb3493a 100644 --- a/ppd/classppd/hpcups/hp-Mimas.ppd.gz +++ b/ppd/classppd/hpcups/hp-Mimas.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Mimas15.ppd.gz b/ppd/classppd/hpcups/hp-Mimas15.ppd.gz Binary files differindex c91d19493..bc77ea7e2 100644 --- a/ppd/classppd/hpcups/hp-Mimas15.ppd.gz +++ b/ppd/classppd/hpcups/hp-Mimas15.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Mimas17.ppd.gz b/ppd/classppd/hpcups/hp-Mimas17.ppd.gz Binary files differindex 063cf0bbb..b676116c3 100644 --- a/ppd/classppd/hpcups/hp-Mimas17.ppd.gz +++ b/ppd/classppd/hpcups/hp-Mimas17.ppd.gz diff --git a/ppd/classppd/hpcups/hp-MimasTDR.ppd.gz b/ppd/classppd/hpcups/hp-MimasTDR.ppd.gz Binary files differindex df0196e14..f5f31faf0 100644 --- a/ppd/classppd/hpcups/hp-MimasTDR.ppd.gz +++ b/ppd/classppd/hpcups/hp-MimasTDR.ppd.gz diff --git a/ppd/classppd/hpcups/hp-OJ7000.ppd.gz b/ppd/classppd/hpcups/hp-OJ7000.ppd.gz Binary files differindex fec5f4e73..9802b6e30 100644 --- a/ppd/classppd/hpcups/hp-OJ7000.ppd.gz +++ b/ppd/classppd/hpcups/hp-OJ7000.ppd.gz diff --git a/ppd/classppd/hpcups/hp-OJProKx50.ppd.gz b/ppd/classppd/hpcups/hp-OJProKx50.ppd.gz Binary files differindex a2ddb7ddb..d80f821ba 100644 --- a/ppd/classppd/hpcups/hp-OJProKx50.ppd.gz +++ b/ppd/classppd/hpcups/hp-OJProKx50.ppd.gz diff --git a/ppd/classppd/hpcups/hp-P15_CISS.ppd.gz b/ppd/classppd/hpcups/hp-P15_CISS.ppd.gz Binary files differindex d5d6e037f..4a29c0fc3 100644 --- a/ppd/classppd/hpcups/hp-P15_CISS.ppd.gz +++ b/ppd/classppd/hpcups/hp-P15_CISS.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PCL3-Class3.ppd.gz b/ppd/classppd/hpcups/hp-PCL3-Class3.ppd.gz Binary files differindex 9a8bbf7a7..f1856ac15 100644 --- a/ppd/classppd/hpcups/hp-PCL3-Class3.ppd.gz +++ b/ppd/classppd/hpcups/hp-PCL3-Class3.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PCL3-Class3A.ppd.gz b/ppd/classppd/hpcups/hp-PCL3-Class3A.ppd.gz Binary files differindex 569e51658..12ef77825 100644 --- a/ppd/classppd/hpcups/hp-PCL3-Class3A.ppd.gz +++ b/ppd/classppd/hpcups/hp-PCL3-Class3A.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PCL3-Class3B.ppd.gz b/ppd/classppd/hpcups/hp-PCL3-Class3B.ppd.gz Binary files differindex b4284cf98..fb33830a6 100644 --- a/ppd/classppd/hpcups/hp-PCL3-Class3B.ppd.gz +++ b/ppd/classppd/hpcups/hp-PCL3-Class3B.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PCL4-Class1.ppd.gz b/ppd/classppd/hpcups/hp-PCL4-Class1.ppd.gz Binary files differindex 2b8cca1f9..bda77f139 100644 --- a/ppd/classppd/hpcups/hp-PCL4-Class1.ppd.gz +++ b/ppd/classppd/hpcups/hp-PCL4-Class1.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PCLM_COLOR.ppd.gz b/ppd/classppd/hpcups/hp-PCLM_COLOR.ppd.gz Binary files differindex 891d520d3..e1f06874d 100644 --- a/ppd/classppd/hpcups/hp-PCLM_COLOR.ppd.gz +++ b/ppd/classppd/hpcups/hp-PCLM_COLOR.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PCLM_MONO.ppd.gz b/ppd/classppd/hpcups/hp-PCLM_MONO.ppd.gz Binary files differindex 0cf5e37b4..9dcc58464 100644 --- a/ppd/classppd/hpcups/hp-PCLM_MONO.ppd.gz +++ b/ppd/classppd/hpcups/hp-PCLM_MONO.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PSP100.ppd.gz b/ppd/classppd/hpcups/hp-PSP100.ppd.gz Binary files differindex 3fb8c4428..4cc59b4e2 100644 --- a/ppd/classppd/hpcups/hp-PSP100.ppd.gz +++ b/ppd/classppd/hpcups/hp-PSP100.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PSP470.ppd.gz b/ppd/classppd/hpcups/hp-PSP470.ppd.gz Binary files differindex 8c0487b43..d0075a71c 100644 --- a/ppd/classppd/hpcups/hp-PSP470.ppd.gz +++ b/ppd/classppd/hpcups/hp-PSP470.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Pyramid.ppd.gz b/ppd/classppd/hpcups/hp-Pyramid.ppd.gz Binary files differindex a3f7dc427..4520baf53 100644 --- a/ppd/classppd/hpcups/hp-Pyramid.ppd.gz +++ b/ppd/classppd/hpcups/hp-Pyramid.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Pyramid15.ppd.gz b/ppd/classppd/hpcups/hp-Pyramid15.ppd.gz Binary files differindex 3cc9002b9..ee6358c2c 100644 --- a/ppd/classppd/hpcups/hp-Pyramid15.ppd.gz +++ b/ppd/classppd/hpcups/hp-Pyramid15.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PyramidPlus.ppd.gz b/ppd/classppd/hpcups/hp-PyramidPlus.ppd.gz Binary files differindex ab19cfd8b..cdcc078ce 100644 --- a/ppd/classppd/hpcups/hp-PyramidPlus.ppd.gz +++ b/ppd/classppd/hpcups/hp-PyramidPlus.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PyramidRefresh15.ppd.gz b/ppd/classppd/hpcups/hp-PyramidRefresh15.ppd.gz Binary files differindex 969eefa44..a3d22ae79 100644 --- a/ppd/classppd/hpcups/hp-PyramidRefresh15.ppd.gz +++ b/ppd/classppd/hpcups/hp-PyramidRefresh15.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PyramidRefresh17.ppd.gz b/ppd/classppd/hpcups/hp-PyramidRefresh17.ppd.gz Binary files differindex d3c786850..49301560a 100644 --- a/ppd/classppd/hpcups/hp-PyramidRefresh17.ppd.gz +++ b/ppd/classppd/hpcups/hp-PyramidRefresh17.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Python.ppd.gz b/ppd/classppd/hpcups/hp-Python.ppd.gz Binary files differindex 5de65bf57..d8ecc6757 100644 --- a/ppd/classppd/hpcups/hp-Python.ppd.gz +++ b/ppd/classppd/hpcups/hp-Python.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Python10.ppd.gz b/ppd/classppd/hpcups/hp-Python10.ppd.gz Binary files differindex 953c72864..e6b9376e5 100644 --- a/ppd/classppd/hpcups/hp-Python10.ppd.gz +++ b/ppd/classppd/hpcups/hp-Python10.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Python11.ppd.gz b/ppd/classppd/hpcups/hp-Python11.ppd.gz Binary files differindex b38545294..e683fb290 100644 --- a/ppd/classppd/hpcups/hp-Python11.ppd.gz +++ b/ppd/classppd/hpcups/hp-Python11.ppd.gz diff --git a/ppd/classppd/hpcups/hp-SPDOfficejetProAsize.ppd.gz b/ppd/classppd/hpcups/hp-SPDOfficejetProAsize.ppd.gz Binary files differindex a2dc1995d..33ca7f962 100644 --- a/ppd/classppd/hpcups/hp-SPDOfficejetProAsize.ppd.gz +++ b/ppd/classppd/hpcups/hp-SPDOfficejetProAsize.ppd.gz diff --git a/ppd/classppd/hpcups/hp-SPDOfficejetProBsize.ppd.gz b/ppd/classppd/hpcups/hp-SPDOfficejetProBsize.ppd.gz Binary files differindex a2eb084ed..19de9adcf 100644 --- a/ppd/classppd/hpcups/hp-SPDOfficejetProBsize.ppd.gz +++ b/ppd/classppd/hpcups/hp-SPDOfficejetProBsize.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Saipan.ppd.gz b/ppd/classppd/hpcups/hp-Saipan.ppd.gz Binary files differindex 663761711..7a87bd448 100644 --- a/ppd/classppd/hpcups/hp-Saipan.ppd.gz +++ b/ppd/classppd/hpcups/hp-Saipan.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Saipan15B.ppd.gz b/ppd/classppd/hpcups/hp-Saipan15B.ppd.gz Binary files differindex 092417963..e2119ae44 100644 --- a/ppd/classppd/hpcups/hp-Saipan15B.ppd.gz +++ b/ppd/classppd/hpcups/hp-Saipan15B.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Stabler.ppd.gz b/ppd/classppd/hpcups/hp-Stabler.ppd.gz Binary files differindex cbb18c67f..3b3bc4a7f 100644 --- a/ppd/classppd/hpcups/hp-Stabler.ppd.gz +++ b/ppd/classppd/hpcups/hp-Stabler.ppd.gz diff --git a/ppd/classppd/hpcups/hp-StingrayOJ.ppd.gz b/ppd/classppd/hpcups/hp-StingrayOJ.ppd.gz Binary files differindex ffe3d95fd..0778280f8 100644 --- a/ppd/classppd/hpcups/hp-StingrayOJ.ppd.gz +++ b/ppd/classppd/hpcups/hp-StingrayOJ.ppd.gz diff --git a/ppd/classppd/hpcups/hp-ViperMinusVIP.ppd.gz b/ppd/classppd/hpcups/hp-ViperMinusVIP.ppd.gz Binary files differindex 67aa4a4ec..15d72fb8c 100644 --- a/ppd/classppd/hpcups/hp-ViperMinusVIP.ppd.gz +++ b/ppd/classppd/hpcups/hp-ViperMinusVIP.ppd.gz diff --git a/ppd/classppd/hpcups/hp-ViperPlusVIP.ppd.gz b/ppd/classppd/hpcups/hp-ViperPlusVIP.ppd.gz Binary files differindex 0ed4f49e2..034601cf5 100644 --- a/ppd/classppd/hpcups/hp-ViperPlusVIP.ppd.gz +++ b/ppd/classppd/hpcups/hp-ViperPlusVIP.ppd.gz diff --git a/ppd/classppd/ps/hp-postscript-inkjet.ppd.gz b/ppd/classppd/ps/hp-postscript-inkjet.ppd.gz Binary files differindex 0345c503a..f543763bd 100644 --- a/ppd/classppd/ps/hp-postscript-inkjet.ppd.gz +++ b/ppd/classppd/ps/hp-postscript-inkjet.ppd.gz diff --git a/ppd/classppd/ps/hp-postscript-laserjet-pro.ppd.gz b/ppd/classppd/ps/hp-postscript-laserjet-pro.ppd.gz Binary files differindex 5aa4f03f0..3c27fb769 100644 --- a/ppd/classppd/ps/hp-postscript-laserjet-pro.ppd.gz +++ b/ppd/classppd/ps/hp-postscript-laserjet-pro.ppd.gz diff --git a/ppd/classppd/ps/hp-postscript-laserjet.ppd.gz b/ppd/classppd/ps/hp-postscript-laserjet.ppd.gz Binary files differindex 8b1f2774b..baed49b36 100644 --- a/ppd/classppd/ps/hp-postscript-laserjet.ppd.gz +++ b/ppd/classppd/ps/hp-postscript-laserjet.ppd.gz diff --git a/ppd/hpcups/apollo-2100.ppd.gz b/ppd/hpcups/apollo-2100.ppd.gz Binary files differindex 3f9784d94..a3f793956 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 7b94ed36b..9a06058fe 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 03c5843f6..f85745f26 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 372d2342a..48e436149 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 657638e2b..7cf0e128d 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 98bc41016..5d189e23c 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 314269d51..0f784bff2 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 4a48187b2..f77e2b056 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 ce240215f..39e046a96 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 e3c16c6f6..48e0df9c9 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 c5576fb58..7d6b9e86f 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 86b2d5615..d4547e81b 100644 --- a/ppd/hpcups/hp-915.ppd.gz +++ b/ppd/hpcups/hp-915.ppd.gz diff --git a/ppd/hpcups/hp-amp.ppd.gz b/ppd/hpcups/hp-amp.ppd.gz Binary files differindex 470eb843e..0e95ce08a 100644 --- a/ppd/hpcups/hp-amp.ppd.gz +++ b/ppd/hpcups/hp-amp.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 09df8437d..0fa5a0f34 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 f69da59c6..6f12ca3c0 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 4f8e3f075..97b29fe86 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 46fa9857d..89a5926a4 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 5c10b910f..0ee981aa5 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 b2aa3e9da..f2ab58f7a 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 46f1a94c1..3c687017d 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 3d321e2c1..19221b4ed 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 a437ce34a..69d059f8c 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 4510c992e..eaffeab32 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 227443d88..d02b75bd6 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_printer_cp1700.ppd.gz b/ppd/hpcups/hp-color_inkjet_printer_cp1700.ppd.gz Binary files differindex 975d87f7d..181355536 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 c0934d30d..ea839e9cd 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_series.ppd.gz b/ppd/hpcups/hp-color_laserjet_2500_series.ppd.gz Binary files differindex 61e304060..3c2af3663 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 0c8023ec7..926e9806c 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 dba9801ef..8c4bb75c7 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 0de76f960..8a24cd4df 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 91384a5cc..13bb91b25 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 6a9715679..3ac1c5262 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 04e8da556..a21298342 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 7207170dd..fb8668a55 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 8773d2fac..e2f7fb056 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 57a73bac4..ccde27235 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 81c5fe217..42e381409 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 f6432c4c7..5844af281 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 d1991ac6b..56bb4f24a 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 2595cb20c..20f3a6029 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_4610-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4610-pcl3.ppd.gz Binary files differindex 8c79ce8fc..2c152fc0d 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 2e7185ed5..247484e66 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 7d60e0278..93dab34a4 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 931442bd2..18ca49eca 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 3f30bed69..5a9e8fb7d 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 1a945b783..ff808400f 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 6f62adc14..64b67aec9 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 4223fafdf..b5bda76e0 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 3885233d4..4adfe7373 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 b586df2b0..4430fe05b 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 48b265f06..c228d6712 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_cm1312_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz Binary files differindex 472d981d4..14e2b7747 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 3724b5e36..27cb180f1 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 87ebbf1b4..d44afed98 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 717a63589..e50ad42bf 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 6b68f1fa6..dccf7d157 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 94fcdad43..b03de508d 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 5afd3105a..1751f5f28 100644 --- a/ppd/hpcups/hp-color_laserjet_cm3530_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm3530_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz Binary files differindex 4e5b3706f..65496ec72 100644 --- a/ppd/hpcups/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm4730_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm4730_mfp-pcl3.ppd.gz Binary files differindex 572f57bb0..434d45202 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 aa95ae7d3..18dda02e8 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 956f19068..7e2a7842d 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 59b42e50e..824d2669e 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 ac76861d6..9ba8bb86b 100644 --- a/ppd/hpcups/hp-color_laserjet_cp1215.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp1215.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp1217.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp1217.ppd.gz Binary files differindex 983c11efb..68ab664a2 100644 --- a/ppd/hpcups/hp-color_laserjet_cp1217.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp1217.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp1514n-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp1514n-pcl3.ppd.gz Binary files differindex def82b24f..349781e70 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 a420ef3f3..7137ec768 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 fd0da9b37..1629e7319 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 aa1ada9f1..a46fb9fc4 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 6a0b8721f..f3afc94df 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 ed69c166f..86ea6a81e 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 1139bbec6..65cef8ecd 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 c01b63b1b..faf8144e9 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 d23c0f2e5..bd206762a 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 524832172..3a4f8fe21 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 ef1d83ee5..0a7e3de89 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 6233c3285..d06a32c06 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 9013444cb..da76d6c0d 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 099d820b9..66ad33d3a 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 aaeb809ea..9de9c9826 100644 --- a/ppd/hpcups/hp-color_laserjet_cp5225n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp5225n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz Binary files differindex 2d7dce5a3..e8ae72848 100644 --- a/ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz Binary files differindex 048b7ec30..448e3cacf 100644 --- a/ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_pro_mfp_m176n.ppd.gz b/ppd/hpcups/hp-color_laserjet_pro_mfp_m176n.ppd.gz Binary files differindex 32390eaeb..6fea5a9e9 100644 --- a/ppd/hpcups/hp-color_laserjet_pro_mfp_m176n.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_pro_mfp_m176n.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_pro_mfp_m177fw.ppd.gz b/ppd/hpcups/hp-color_laserjet_pro_mfp_m177fw.ppd.gz Binary files differindex 611b8b6bf..5b35f72d9 100644 --- a/ppd/hpcups/hp-color_laserjet_pro_mfp_m177fw.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_pro_mfp_m177fw.ppd.gz diff --git a/ppd/hpcups/hp-cp1160.ppd.gz b/ppd/hpcups/hp-cp1160.ppd.gz Binary files differindex 8007edb6d..c2bace2c0 100644 --- a/ppd/hpcups/hp-cp1160.ppd.gz +++ b/ppd/hpcups/hp-cp1160.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz b/ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz Binary files differindex 36c972e61..25bfc968e 100644 --- a/ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1010_series.ppd.gz b/ppd/hpcups/hp-deskjet_1010_series.ppd.gz Binary files differindex 66c9753ee..a9a7af47a 100644 --- a/ppd/hpcups/hp-deskjet_1010_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1010_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1050_j410_series.ppd.gz b/ppd/hpcups/hp-deskjet_1050_j410_series.ppd.gz Binary files differindex d0ecdc1fa..2bebc2dae 100644 --- a/ppd/hpcups/hp-deskjet_1050_j410_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1050_j410_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1100.ppd.gz b/ppd/hpcups/hp-deskjet_1100.ppd.gz Binary files differindex 63e75b779..0cb19f16a 100644 --- a/ppd/hpcups/hp-deskjet_1100.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1100.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1110_series.ppd.gz b/ppd/hpcups/hp-deskjet_1110_series.ppd.gz Binary files differindex f7b9b9a11..adb912721 100644 --- a/ppd/hpcups/hp-deskjet_1110_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1110_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1120.ppd.gz b/ppd/hpcups/hp-deskjet_1120.ppd.gz Binary files differindex dc326be12..6ae62eab4 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 3983824dc..a2aaa5494 100644 --- a/ppd/hpcups/hp-deskjet_1125.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1125.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1200_series.ppd.gz b/ppd/hpcups/hp-deskjet_1200_series.ppd.gz Binary files differindex 6454361c9..5444b016b 100644 --- a/ppd/hpcups/hp-deskjet_1200_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1200_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1200c.ppd.gz b/ppd/hpcups/hp-deskjet_1200c.ppd.gz Binary files differindex e433c4ff1..e3d487f85 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 b5e89f1c3..a7e29413d 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 9b6e12027..0b5a826f5 100644 --- a/ppd/hpcups/hp-deskjet_1280.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1280.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1510_series.ppd.gz b/ppd/hpcups/hp-deskjet_1510_series.ppd.gz Binary files differindex d239fe3a0..35a2b982c 100644 --- a/ppd/hpcups/hp-deskjet_1510_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1510_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1600c.ppd.gz b/ppd/hpcups/hp-deskjet_1600c.ppd.gz Binary files differindex d2ec30e9c..c8bd49163 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 fd16fb895..d65706d9f 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 eb29b4402..69fb85364 100644 --- a/ppd/hpcups/hp-deskjet_1600cn.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1600cn.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2000_j210_series.ppd.gz b/ppd/hpcups/hp-deskjet_2000_j210_series.ppd.gz Binary files differindex 83a0c01c0..0c1a8fb54 100644 --- a/ppd/hpcups/hp-deskjet_2000_j210_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2000_j210_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2020_series.ppd.gz b/ppd/hpcups/hp-deskjet_2020_series.ppd.gz Binary files differindex b477f6b98..3b4c6c217 100644 --- a/ppd/hpcups/hp-deskjet_2020_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2020_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2050_j510_series.ppd.gz b/ppd/hpcups/hp-deskjet_2050_j510_series.ppd.gz Binary files differindex dd7debe45..52190ec05 100644 --- a/ppd/hpcups/hp-deskjet_2050_j510_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2050_j510_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2130_series.ppd.gz b/ppd/hpcups/hp-deskjet_2130_series.ppd.gz Binary files differindex e4c49539f..870c4194f 100644 --- a/ppd/hpcups/hp-deskjet_2130_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2130_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2200_series.ppd.gz b/ppd/hpcups/hp-deskjet_2200_series.ppd.gz Binary files differindex 463736208..dbccfd6e1 100644 --- a/ppd/hpcups/hp-deskjet_2200_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2200_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2300_series.ppd.gz b/ppd/hpcups/hp-deskjet_2300_series.ppd.gz Binary files differindex e97c59929..70bd0dc10 100644 --- a/ppd/hpcups/hp-deskjet_2300_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2300_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2510_series.ppd.gz b/ppd/hpcups/hp-deskjet_2510_series.ppd.gz Binary files differindex 647b99bce..81717206f 100644 --- a/ppd/hpcups/hp-deskjet_2510_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2510_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2520_series.ppd.gz b/ppd/hpcups/hp-deskjet_2520_series.ppd.gz Binary files differindex a1dba21a4..1f0a42817 100644 --- a/ppd/hpcups/hp-deskjet_2520_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2520_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2540_series.ppd.gz b/ppd/hpcups/hp-deskjet_2540_series.ppd.gz Binary files differindex 18cf4483f..10ec908b5 100644 --- a/ppd/hpcups/hp-deskjet_2540_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2540_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2600_series.ppd.gz b/ppd/hpcups/hp-deskjet_2600_series.ppd.gz Binary files differindex 4facd4041..75001ab91 100644 --- a/ppd/hpcups/hp-deskjet_2600_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2600_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2640_series.ppd.gz b/ppd/hpcups/hp-deskjet_2640_series.ppd.gz Binary files differindex e62ed7dda..460f4a913 100644 --- a/ppd/hpcups/hp-deskjet_2640_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2640_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2700_series.ppd.gz b/ppd/hpcups/hp-deskjet_2700_series.ppd.gz Binary files differindex 8db8d93ac..38a0c7312 100644 --- a/ppd/hpcups/hp-deskjet_2700_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2700_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz b/ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz Binary files differindex 3f01b1028..028040ed9 100644 --- a/ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz b/ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz Binary files differindex 7f31c56d6..66d571e4c 100644 --- a/ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3050a_j611_series.ppd.gz b/ppd/hpcups/hp-deskjet_3050a_j611_series.ppd.gz Binary files differindex b7c7a9bc7..5c801aca6 100644 --- a/ppd/hpcups/hp-deskjet_3050a_j611_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3050a_j611_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3070_b611_series.ppd.gz b/ppd/hpcups/hp-deskjet_3070_b611_series.ppd.gz Binary files differindex 6f9b653b4..c96160d1a 100644 --- a/ppd/hpcups/hp-deskjet_3070_b611_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3070_b611_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3320.ppd.gz b/ppd/hpcups/hp-deskjet_3320.ppd.gz Binary files differindex ea11eacab..2a3a5e1fb 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 f571376af..9b4f7bcb7 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 2da77717a..39ff88334 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 250e7edbe..df4e52854 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 4bf058ac2..6bae10726 100644 --- a/ppd/hpcups/hp-deskjet_3450.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3450.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_350.ppd.gz b/ppd/hpcups/hp-deskjet_350.ppd.gz Binary files differindex 235260a7f..f20879064 100644 --- a/ppd/hpcups/hp-deskjet_350.ppd.gz +++ b/ppd/hpcups/hp-deskjet_350.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3500.ppd.gz b/ppd/hpcups/hp-deskjet_3500.ppd.gz Binary files differindex 81847d486..2a52fa866 100644 --- a/ppd/hpcups/hp-deskjet_3500.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3500.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3510_series.ppd.gz b/ppd/hpcups/hp-deskjet_3510_series.ppd.gz Binary files differindex 5b151c2e7..7fef163b3 100644 --- a/ppd/hpcups/hp-deskjet_3510_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3510_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3520_series.ppd.gz b/ppd/hpcups/hp-deskjet_3520_series.ppd.gz Binary files differindex f55ac90d2..f028b7e57 100644 --- a/ppd/hpcups/hp-deskjet_3520_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3520_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3540_series.ppd.gz b/ppd/hpcups/hp-deskjet_3540_series.ppd.gz Binary files differindex a111c54ee..69f413665 100644 --- a/ppd/hpcups/hp-deskjet_3540_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3540_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3550.ppd.gz b/ppd/hpcups/hp-deskjet_3550.ppd.gz Binary files differindex c0b8f2750..777caaf9e 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 62a82487f..0b381cf32 100644 --- a/ppd/hpcups/hp-deskjet_3600.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3600.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3630_series.ppd.gz b/ppd/hpcups/hp-deskjet_3630_series.ppd.gz Binary files differindex 171279486..068791424 100644 --- a/ppd/hpcups/hp-deskjet_3630_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3630_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3650.ppd.gz b/ppd/hpcups/hp-deskjet_3650.ppd.gz Binary files differindex 87071aeef..9a8b04194 100644 --- a/ppd/hpcups/hp-deskjet_3650.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3650.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3700_series.ppd.gz b/ppd/hpcups/hp-deskjet_3700_series.ppd.gz Binary files differindex d7d8c21fe..9e10064a3 100644 --- a/ppd/hpcups/hp-deskjet_3700_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3700_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3740.ppd.gz b/ppd/hpcups/hp-deskjet_3740.ppd.gz Binary files differindex efa009449..79c576791 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 7dfdb74a0..42af9519c 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 2f1a02855..92ffe75cb 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 840a2ded2..5f2e98efc 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 c5a6fc519..af1b0acc5 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 d56536f85..89bb7e5ca 100644 --- a/ppd/hpcups/hp-deskjet_3822.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3822.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3830_series.ppd.gz b/ppd/hpcups/hp-deskjet_3830_series.ppd.gz Binary files differindex cdd537031..7265422cd 100644 --- a/ppd/hpcups/hp-deskjet_3830_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3830_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3840.ppd.gz b/ppd/hpcups/hp-deskjet_3840.ppd.gz Binary files differindex f2503cd1f..fffbb5367 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 ce1dd5a47..732d54567 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 8279e981c..7379012c9 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 40f333ea6..eb44fd6b6 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 4f10e209e..7a07be7fd 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 1befb41c2..f6580b0c1 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 2103511a1..2806e4055 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 a331cc133..61e5822c1 100644 --- a/ppd/hpcups/hp-deskjet_400l.ppd.gz +++ b/ppd/hpcups/hp-deskjet_400l.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_4100_series.ppd.gz b/ppd/hpcups/hp-deskjet_4100_series.ppd.gz Binary files differindex 833ff3f76..5e702576b 100644 --- a/ppd/hpcups/hp-deskjet_4100_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_4100_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_450.ppd.gz b/ppd/hpcups/hp-deskjet_450.ppd.gz Binary files differindex 896e959d3..6f6607e89 100644 --- a/ppd/hpcups/hp-deskjet_450.ppd.gz +++ b/ppd/hpcups/hp-deskjet_450.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_4510_series.ppd.gz b/ppd/hpcups/hp-deskjet_4510_series.ppd.gz Binary files differindex 538967bd5..c6daf5fd8 100644 --- a/ppd/hpcups/hp-deskjet_4510_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_4510_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_4530_series.ppd.gz b/ppd/hpcups/hp-deskjet_4530_series.ppd.gz Binary files differindex f131e1c98..fb68645d8 100644 --- a/ppd/hpcups/hp-deskjet_4530_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_4530_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_460.ppd.gz b/ppd/hpcups/hp-deskjet_460.ppd.gz Binary files differindex 4291b61d6..2399d0582 100644 --- a/ppd/hpcups/hp-deskjet_460.ppd.gz +++ b/ppd/hpcups/hp-deskjet_460.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_4610_series.ppd.gz b/ppd/hpcups/hp-deskjet_4610_series.ppd.gz Binary files differindex cd000f77a..028cff99b 100644 --- a/ppd/hpcups/hp-deskjet_4610_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_4610_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_4620_series.ppd.gz b/ppd/hpcups/hp-deskjet_4620_series.ppd.gz Binary files differindex 6c1046c64..6134bacaf 100644 --- a/ppd/hpcups/hp-deskjet_4620_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_4620_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_4640_series.ppd.gz b/ppd/hpcups/hp-deskjet_4640_series.ppd.gz Binary files differindex 11d06aa69..0e8238fb1 100644 --- a/ppd/hpcups/hp-deskjet_4640_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_4640_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_4670_series.ppd.gz b/ppd/hpcups/hp-deskjet_4670_series.ppd.gz Binary files differindex 972d9bd49..0785a0eb0 100644 --- a/ppd/hpcups/hp-deskjet_4670_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_4670_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_4720_series.ppd.gz b/ppd/hpcups/hp-deskjet_4720_series.ppd.gz Binary files differindex 4b76c626e..851d58003 100644 --- a/ppd/hpcups/hp-deskjet_4720_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_4720_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_500.ppd.gz b/ppd/hpcups/hp-deskjet_500.ppd.gz Binary files differindex f1c4d9662..550845134 100644 --- a/ppd/hpcups/hp-deskjet_500.ppd.gz +++ b/ppd/hpcups/hp-deskjet_500.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5000_series.ppd.gz b/ppd/hpcups/hp-deskjet_5000_series.ppd.gz Binary files differindex 151b79ca0..61dbd0c93 100644 --- a/ppd/hpcups/hp-deskjet_5000_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5000_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_500c.ppd.gz b/ppd/hpcups/hp-deskjet_500c.ppd.gz Binary files differindex 5208a4613..6efdd1e7e 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 58a4e42a8..3664d49c5 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 02869bcf5..dc0179ca6 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 f8fd59770..a975c0d63 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 7fdd06664..6049e0d28 100644 --- a/ppd/hpcups/hp-deskjet_520.ppd.gz +++ b/ppd/hpcups/hp-deskjet_520.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5200_series.ppd.gz b/ppd/hpcups/hp-deskjet_5200_series.ppd.gz Binary files differindex 012e56f9e..9bd307ae8 100644 --- a/ppd/hpcups/hp-deskjet_5200_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5200_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_540.ppd.gz b/ppd/hpcups/hp-deskjet_540.ppd.gz Binary files differindex 23d883ef9..4b54912fb 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 487b7cecf..8e859d668 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 2f37773d1..81d9310c7 100644 --- a/ppd/hpcups/hp-deskjet_550c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_550c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5520_series.ppd.gz b/ppd/hpcups/hp-deskjet_5520_series.ppd.gz Binary files differindex 69c441a33..b5d9a7aa1 100644 --- a/ppd/hpcups/hp-deskjet_5520_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5520_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5550.ppd.gz b/ppd/hpcups/hp-deskjet_5550.ppd.gz Binary files differindex 057f39af9..3e37a3f77 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 38f5c6b6d..0399ba9b3 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 b6b719cdc..3358f8702 100644 --- a/ppd/hpcups/hp-deskjet_5552.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5552.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5570_series.ppd.gz b/ppd/hpcups/hp-deskjet_5570_series.ppd.gz Binary files differindex 72235de75..05c936676 100644 --- a/ppd/hpcups/hp-deskjet_5570_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5570_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5600.ppd.gz b/ppd/hpcups/hp-deskjet_5600.ppd.gz Binary files differindex 4332f5711..0d52496c3 100644 --- a/ppd/hpcups/hp-deskjet_5600.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5600.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5640_series.ppd.gz b/ppd/hpcups/hp-deskjet_5640_series.ppd.gz Binary files differindex 5b43c1827..d63eb900d 100644 --- a/ppd/hpcups/hp-deskjet_5640_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5640_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5650.ppd.gz b/ppd/hpcups/hp-deskjet_5650.ppd.gz Binary files differindex 266aa0a80..db0df0741 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 69f640765..e8ebfb856 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 350586a6d..811c62f6e 100644 --- a/ppd/hpcups/hp-deskjet_5700.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5700.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5730_series.ppd.gz b/ppd/hpcups/hp-deskjet_5730_series.ppd.gz Binary files differindex 79e1e4c2d..c6b7f4262 100644 --- a/ppd/hpcups/hp-deskjet_5730_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5730_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5800.ppd.gz b/ppd/hpcups/hp-deskjet_5800.ppd.gz Binary files differindex 7a38f80e9..c813bc7d8 100644 --- a/ppd/hpcups/hp-deskjet_5800.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5800.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5810_series.ppd.gz b/ppd/hpcups/hp-deskjet_5810_series.ppd.gz Binary files differindex a620b3445..6966e46f6 100644 --- a/ppd/hpcups/hp-deskjet_5810_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5810_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5820_series.ppd.gz b/ppd/hpcups/hp-deskjet_5820_series.ppd.gz Binary files differindex edcd4fea8..c3c196db0 100644 --- a/ppd/hpcups/hp-deskjet_5820_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5820_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5850.ppd.gz b/ppd/hpcups/hp-deskjet_5850.ppd.gz Binary files differindex a3eb579b2..08bbf3642 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 69e9449b8..f5fd1d95d 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 8e5be3503..31aac2966 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 e9e01be31..70359d651 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 f36599867..31210ba55 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 17500afcb..070b5927b 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 3db3827c1..c0ff21d96 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 9daef3480..c3337929a 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 92e7c78e7..2dd1efc2c 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 078ac9958..30b12bc8c 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 0366c08ed..986887b7e 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 3e0a67c0f..8bd5981a7 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 9a3cd076e..f937594dc 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 4a917fc79..b593b17f4 100644 --- a/ppd/hpcups/hp-deskjet_6500.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6500.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_6520_series.ppd.gz b/ppd/hpcups/hp-deskjet_6520_series.ppd.gz Binary files differindex 105b7d630..8b6d4cde1 100644 --- a/ppd/hpcups/hp-deskjet_6520_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6520_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_656c.ppd.gz b/ppd/hpcups/hp-deskjet_656c.ppd.gz Binary files differindex e6fb8994b..e234ea44f 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 cb5cc7460..1c99aada3 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 d84e3c9f0..65e964e5f 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 cf7c5a4c0..b51d8036d 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 41a6596a3..62e493cc2 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 435f05fe8..23f2ff3e7 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 294852620..c738a65f8 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 1ffa19e8e..d01f9ce6b 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 9d9d1cce4..395f808e8 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 9458e570e..ad5c93f2c 100644 --- a/ppd/hpcups/hp-deskjet_682.ppd.gz +++ b/ppd/hpcups/hp-deskjet_682.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_690c.ppd.gz b/ppd/hpcups/hp-deskjet_690c.ppd.gz Binary files differindex a35e1ef65..34d387894 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 324055f41..b97eed696 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 aecb7a653..671d7d483 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 f3f9e37a5..feefa3186 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 f717b0445..2d5b1e47c 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 358e7426e..87167453e 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 4baf6105f..da8286463 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 c5d17bad5..e26a80185 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 2a9eac356..2bf99339c 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 69c439854..20ce5fd54 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 237b97702..5dd0fc1f8 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 5c4f33b3e..eac41b414 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 fd67dbffb..6b78f1121 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 1da80abfe..70e3ca84e 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 b6f05e877..26344375b 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 25120dcf9..47dd793a0 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 f71369a62..088cde011 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 ab03d0f3a..23694b215 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 495789c02..643032c82 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 2a80f4561..3018f48b9 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 55fded908..4cbb29215 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 777d52cb4..ed3f534d8 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 c497c0ae9..22c96cfb2 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 97743510c..1711e1e63 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 41bb589c4..b6d9cacda 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 60a4f5afa..ba38cb40c 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 87daf988c..3d43e4510 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 e2f4692bd..54e04ccfb 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 fd904e291..566ded8d1 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 905f647c8..b8e1e4b3e 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 df51ed0cc..d44d68c81 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 bfd14a6e5..6b67d5c93 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 34a544a4a..b177c00e4 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 99a86e977..0d2f586f6 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 a2b1b7e7d..b729311e1 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 bffcd3451..7b1667ddf 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 3b4eb90ca..5cd3065d2 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 55c12066e..efca2a1d6 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 8f69bcef2..5937798e6 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 271a54fd3..f243fd605 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 bc3e1c792..8b2143c20 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 5537732e9..bd92d5a6a 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 3199d9367..95ab262e1 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 cc8f31d23..1d2390eb8 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 13ffd00a7..9394d39a9 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 f3f06901f..c24edce70 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 8b8ec2af5..1882bf9b0 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 1dbd742c8..5acb9b395 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 3eddb514a..431c09b57 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 7d7c6618d..30e39d7ae 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 d880da339..a527779be 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 8bc91ef2a..0d0e9aaaf 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 766fade65..3cc4fa0b5 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 635ee1273..3f728d511 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 75fccef8f..089b7e241 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 846036047..4a6f7c589 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 374e82043..e9865d868 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 7bf22a9b5..b6c7ec342 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 909b25438..3fea6ce4b 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 bbd352689..2298037d8 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 7135dee4c..f947bf373 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 42a539195..b679571e0 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 7582903f0..767e8806b 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 f32454376..1d8b4dfbc 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 65d5b3587..f331f9095 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 6bf951272..d0f45adc8 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 cca7e5545..994223682 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 af3728c4e..3dd006005 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 b52b4dfaf..a8a36a6d3 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_f4400_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4400_series.ppd.gz Binary files differindex 188f83223..21c256c24 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 5aea78c16..1c6de98ee 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 a73bc1530..3e8bcfbe4 100644 --- a/ppd/hpcups/hp-deskjet_f735.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f735.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_ink_adv_2010_k010.ppd.gz b/ppd/hpcups/hp-deskjet_ink_adv_2010_k010.ppd.gz Binary files differindex ee1d872d3..0d63ea2b4 100644 --- a/ppd/hpcups/hp-deskjet_ink_adv_2010_k010.ppd.gz +++ b/ppd/hpcups/hp-deskjet_ink_adv_2010_k010.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_ink_adv_2060_k110.ppd.gz b/ppd/hpcups/hp-deskjet_ink_adv_2060_k110.ppd.gz Binary files differindex 78280fc7b..3ddd58157 100644 --- a/ppd/hpcups/hp-deskjet_ink_adv_2060_k110.ppd.gz +++ b/ppd/hpcups/hp-deskjet_ink_adv_2060_k110.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_ink_advant_k109a-z.ppd.gz b/ppd/hpcups/hp-deskjet_ink_advant_k109a-z.ppd.gz Binary files differindex dfe59b44c..5287e7f88 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 3a8e46d6d..3e3db01b0 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-deskjet_plus_4100_series.ppd.gz b/ppd/hpcups/hp-deskjet_plus_4100_series.ppd.gz Binary files differindex b16850794..9e699c9ba 100644 --- a/ppd/hpcups/hp-deskjet_plus_4100_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_plus_4100_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_plus_6000_series.ppd.gz b/ppd/hpcups/hp-deskjet_plus_6000_series.ppd.gz Binary files differindex 8387dbb97..bcaa0669d 100644 --- a/ppd/hpcups/hp-deskjet_plus_6000_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_plus_6000_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_plus_6400_series.ppd.gz b/ppd/hpcups/hp-deskjet_plus_6400_series.ppd.gz Binary files differindex 205103212..81f40ec3a 100644 --- a/ppd/hpcups/hp-deskjet_plus_6400_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_plus_6400_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_100_d410_series.ppd.gz b/ppd/hpcups/hp-envy_100_d410_series.ppd.gz Binary files differindex fcd238939..9645ec209 100644 --- a/ppd/hpcups/hp-envy_100_d410_series.ppd.gz +++ b/ppd/hpcups/hp-envy_100_d410_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_110_series.ppd.gz b/ppd/hpcups/hp-envy_110_series.ppd.gz Binary files differindex f34cc6019..235cfea2a 100644 --- a/ppd/hpcups/hp-envy_110_series.ppd.gz +++ b/ppd/hpcups/hp-envy_110_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_120_series.ppd.gz b/ppd/hpcups/hp-envy_120_series.ppd.gz Binary files differindex d4ccc69e1..740c0b98a 100644 --- a/ppd/hpcups/hp-envy_120_series.ppd.gz +++ b/ppd/hpcups/hp-envy_120_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_4500_series.ppd.gz b/ppd/hpcups/hp-envy_4500_series.ppd.gz Binary files differindex 0e7318836..476652938 100644 --- a/ppd/hpcups/hp-envy_4500_series.ppd.gz +++ b/ppd/hpcups/hp-envy_4500_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_4510_series.ppd.gz b/ppd/hpcups/hp-envy_4510_series.ppd.gz Binary files differindex aa204c708..dfbb4e5a3 100644 --- a/ppd/hpcups/hp-envy_4510_series.ppd.gz +++ b/ppd/hpcups/hp-envy_4510_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_4520_series.ppd.gz b/ppd/hpcups/hp-envy_4520_series.ppd.gz Binary files differindex 4eac23bab..a6bbc4681 100644 --- a/ppd/hpcups/hp-envy_4520_series.ppd.gz +++ b/ppd/hpcups/hp-envy_4520_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_5000_series.ppd.gz b/ppd/hpcups/hp-envy_5000_series.ppd.gz Binary files differindex 2ca0804c0..251ec15bb 100644 --- a/ppd/hpcups/hp-envy_5000_series.ppd.gz +++ b/ppd/hpcups/hp-envy_5000_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_5530_series.ppd.gz b/ppd/hpcups/hp-envy_5530_series.ppd.gz Binary files differindex 03ab6e027..0d65d36ac 100644 --- a/ppd/hpcups/hp-envy_5530_series.ppd.gz +++ b/ppd/hpcups/hp-envy_5530_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_5540_series.ppd.gz b/ppd/hpcups/hp-envy_5540_series.ppd.gz Binary files differindex 9f266a027..5bc411ab5 100644 --- a/ppd/hpcups/hp-envy_5540_series.ppd.gz +++ b/ppd/hpcups/hp-envy_5540_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_5640_series.ppd.gz b/ppd/hpcups/hp-envy_5640_series.ppd.gz Binary files differindex ad5fe9b5e..f06f25b72 100644 --- a/ppd/hpcups/hp-envy_5640_series.ppd.gz +++ b/ppd/hpcups/hp-envy_5640_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_5660_series.ppd.gz b/ppd/hpcups/hp-envy_5660_series.ppd.gz Binary files differindex 795686260..69d25df04 100644 --- a/ppd/hpcups/hp-envy_5660_series.ppd.gz +++ b/ppd/hpcups/hp-envy_5660_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_6000_series.ppd.gz b/ppd/hpcups/hp-envy_6000_series.ppd.gz Binary files differindex c755ef234..92109012e 100644 --- a/ppd/hpcups/hp-envy_6000_series.ppd.gz +++ b/ppd/hpcups/hp-envy_6000_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_7640_series.ppd.gz b/ppd/hpcups/hp-envy_7640_series.ppd.gz Binary files differindex 95d172c27..52895d209 100644 --- a/ppd/hpcups/hp-envy_7640_series.ppd.gz +++ b/ppd/hpcups/hp-envy_7640_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_8000_series.ppd.gz b/ppd/hpcups/hp-envy_8000_series.ppd.gz Binary files differindex f0d3c4be5..1a561e329 100644 --- a/ppd/hpcups/hp-envy_8000_series.ppd.gz +++ b/ppd/hpcups/hp-envy_8000_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_photo_6200_series.ppd.gz b/ppd/hpcups/hp-envy_photo_6200_series.ppd.gz Binary files differindex bd19abf1e..9bb2bb1e4 100644 --- a/ppd/hpcups/hp-envy_photo_6200_series.ppd.gz +++ b/ppd/hpcups/hp-envy_photo_6200_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_photo_7100_series.ppd.gz b/ppd/hpcups/hp-envy_photo_7100_series.ppd.gz Binary files differindex f24a2b39d..f3c53fca9 100644 --- a/ppd/hpcups/hp-envy_photo_7100_series.ppd.gz +++ b/ppd/hpcups/hp-envy_photo_7100_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_photo_7800_series.ppd.gz b/ppd/hpcups/hp-envy_photo_7800_series.ppd.gz Binary files differindex 571e7e594..6966c8717 100644 --- a/ppd/hpcups/hp-envy_photo_7800_series.ppd.gz +++ b/ppd/hpcups/hp-envy_photo_7800_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_pro_6400_series.ppd.gz b/ppd/hpcups/hp-envy_pro_6400_series.ppd.gz Binary files differindex 1ca319742..0b641858a 100644 --- a/ppd/hpcups/hp-envy_pro_6400_series.ppd.gz +++ b/ppd/hpcups/hp-envy_pro_6400_series.ppd.gz diff --git a/ppd/hpcups/hp-ink_tank_110_series.ppd.gz b/ppd/hpcups/hp-ink_tank_110_series.ppd.gz Binary files differindex d7898ddc7..8e1fe6443 100644 --- a/ppd/hpcups/hp-ink_tank_110_series.ppd.gz +++ b/ppd/hpcups/hp-ink_tank_110_series.ppd.gz diff --git a/ppd/hpcups/hp-ink_tank_310_series.ppd.gz b/ppd/hpcups/hp-ink_tank_310_series.ppd.gz Binary files differindex a9a2b043e..71fd4c4a4 100644 --- a/ppd/hpcups/hp-ink_tank_310_series.ppd.gz +++ b/ppd/hpcups/hp-ink_tank_310_series.ppd.gz diff --git a/ppd/hpcups/hp-ink_tank_wireless_410_series.ppd.gz b/ppd/hpcups/hp-ink_tank_wireless_410_series.ppd.gz Binary files differindex 376c6f36b..ed1a6b844 100644 --- a/ppd/hpcups/hp-ink_tank_wireless_410_series.ppd.gz +++ b/ppd/hpcups/hp-ink_tank_wireless_410_series.ppd.gz diff --git a/ppd/hpcups/hp-laser_ns_1020.ppd.gz b/ppd/hpcups/hp-laser_ns_1020.ppd.gz Binary files differindex 03aae3a09..bc13acb2a 100644 --- a/ppd/hpcups/hp-laser_ns_1020.ppd.gz +++ b/ppd/hpcups/hp-laser_ns_1020.ppd.gz diff --git a/ppd/hpcups/hp-laser_ns_mfp_1005.ppd.gz b/ppd/hpcups/hp-laser_ns_mfp_1005.ppd.gz Binary files differindex 2791b253a..f197cb74e 100644 --- a/ppd/hpcups/hp-laser_ns_mfp_1005.ppd.gz +++ b/ppd/hpcups/hp-laser_ns_mfp_1005.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1000.ppd.gz b/ppd/hpcups/hp-laserjet_1000.ppd.gz Binary files differindex 508feedfa..bdde534cf 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 45fcb2da3..07a5f4692 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 45b76728a..be0cc29e7 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 5250786a4..98b7478dd 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 e5d99b664..340315104 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 fb8584071..006fcbf6b 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 773b72ac1..7765235d9 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 0332ea1df..40e3d6072 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_1022n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1022n-pcl3.ppd.gz Binary files differindex ecc867b8e..c2c54e430 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_1022nw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1022nw-pcl3.ppd.gz Binary files differindex 03b9fb1ed..b5dc690cb 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_1100.ppd.gz b/ppd/hpcups/hp-laserjet_1100.ppd.gz Binary files differindex 4dcd872f0..2a83b56f9 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 374745c23..f91071375 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 5180f7877..a1ae4a494 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 91dfaff7e..243afe725 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_series.ppd.gz b/ppd/hpcups/hp-laserjet_1160_series.ppd.gz Binary files differindex 5a5e21b98..533f631e3 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 392d3321d..30c0d416e 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 e270ec899..511e4ada6 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 1cd7595b4..3de578fbd 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 27deee00f..97fdca76e 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 719e5e57a..4893312be 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 50845fbce..c877d19ab 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 edd8061f0..eeabbe175 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 e040ba36c..4f1da54b7 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 f2ebac542..42e401685 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 cab3eaf7c..bdb67284c 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 07ad5c4a9..08bdd893c 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 855ffda58..4f8f972c0 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_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2100_series-pcl3.ppd.gz Binary files differindex 3fb855b21..36c77dc4d 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_series.ppd.gz b/ppd/hpcups/hp-laserjet_2200_series.ppd.gz Binary files differindex 483b1c761..36b5818e4 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_series.ppd.gz b/ppd/hpcups/hp-laserjet_2300_series.ppd.gz Binary files differindex d78d5fabf..e158fd21e 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 647d9c4d7..732ef3fe2 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 ef5201f6c..c955f7e89 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 5e9a65158..dd4a9bc2b 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 298a5532f..337eddbe5 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 3a3d6be51..45f64b6d6 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 1c39de20f..4fcca491e 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 7fde35647..7bef89617 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 b29e9746f..2f8055b38 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 e91a162f4..8f1d19cb9 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 9e3ef45bf..e3d99f134 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 0db50eaee..3ebd9a674 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 1537f5ed2..05359df51 100644 --- a/ppd/hpcups/hp-laserjet_3200.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3200.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 d1f9f363a..f3eedeed4 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 dcf8a0667..5e9d440ba 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 c042ef57e..05d4f25de 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 4a5a7d852..d9ef42280 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 0f6c48b81..c82cb9e13 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 c7ee0916c..5880e2693 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 ad800a209..546d76f62 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 6f1d39768..977309ee5 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 c523a7c63..75abd9dde 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 0866c9f16..27ae56853 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 1a688944a..38b159c81 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 259c85b0f..df30f0d3a 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 995caa878..78ebf67a6 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 bcb5341dd..4a1e47b50 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 ee7187fba..9f2f98457 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 59f4bb658..b7490a21b 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 b4165179a..f71dad5f7 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 a712e2de6..84f022c27 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 5341c8132..d83336966 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 a2d692cda..58a153256 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 0f1ca91f5..70b68b59a 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 fe9641a44..835c4582d 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_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5000_series-pcl3.ppd.gz Binary files differindex 75bcabfc4..7f246ef72 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 c6dc770e8..732713d57 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 531bcbcce..80f94c9ab 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 584400f77..39e99b198 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 04466f729..0a89b3fd5 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 670fe6554..95e5828e3 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 ce44bd9e8..61b6fe921 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 f662faa4f..1ce0bc907 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 d9205a717..639711265 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 20077726e..5c9d0513a 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 206b0f01e..c3cef9672 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 cfe9fac4d..92cf46d35 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 171015696..a300db39a 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_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_8000_series-pcl3.ppd.gz Binary files differindex f0a363e53..86c8b86d7 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 94f6c96da..8fc71264e 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 9d9d0e453..a9a49a60c 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 126585b96..a1ae60f08 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 9e54d3ece..22e1d18c6 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 0ca54edde..5030eda22 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 3a256b905..75b39927a 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 9b58cbc14..51749b761 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 af6c686bd..563faf29f 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 5eb3c6ed5..71f1a2d3e 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 1a25f66e3..769a51041 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 90a8aabdc..b03d6c641 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 5035c2bf6..0aaa3b34d 100644 --- a/ppd/hpcups/hp-laserjet_9065mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_9065mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1411fn-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1411fn-pcl3.ppd.gz Binary files differindex 9ea4645cf..cd7666532 100644 --- a/ppd/hpcups/hp-laserjet_cm1411fn-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cm1411fn-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1412fn-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1412fn-pcl3.ppd.gz Binary files differindex 36baa4d5b..55e3228ea 100644 --- a/ppd/hpcups/hp-laserjet_cm1412fn-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cm1412fn-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1413fn-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1413fn-pcl3.ppd.gz Binary files differindex bf6dca65c..12a512266 100644 --- a/ppd/hpcups/hp-laserjet_cm1413fn-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cm1413fn-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1415fn-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1415fn-pcl3.ppd.gz Binary files differindex 3a495e831..ab71044a1 100644 --- a/ppd/hpcups/hp-laserjet_cm1415fn-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cm1415fn-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1415fnw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1415fnw-pcl3.ppd.gz Binary files differindex 5df9e7ace..3472b4c92 100644 --- a/ppd/hpcups/hp-laserjet_cm1415fnw-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cm1415fnw-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1416fnw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1416fnw-pcl3.ppd.gz Binary files differindex e3291a829..6d4e8ff4a 100644 --- a/ppd/hpcups/hp-laserjet_cm1416fnw-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cm1416fnw-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1417fnw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1417fnw-pcl3.ppd.gz Binary files differindex 89c4b1a0e..09e3f25b5 100644 --- a/ppd/hpcups/hp-laserjet_cm1417fnw-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cm1417fnw-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz Binary files differindex 5de77074f..81e86fb45 100644 --- a/ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cp1025.ppd.gz b/ppd/hpcups/hp-laserjet_cp1025.ppd.gz Binary files differindex 72dcf7f43..e8a01c756 100644 --- a/ppd/hpcups/hp-laserjet_cp1025.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cp1025.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz b/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz Binary files differindex 6839ed222..ef4f9e7fd 100644 --- a/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1005.ppd.gz b/ppd/hpcups/hp-laserjet_m1005.ppd.gz Binary files differindex 87a821b91..b57d5e6c7 100644 --- a/ppd/hpcups/hp-laserjet_m1005.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1005.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m101-m106.ppd.gz b/ppd/hpcups/hp-laserjet_m101-m106.ppd.gz Binary files differindex fa7266611..3efc0efcd 100644 --- a/ppd/hpcups/hp-laserjet_m101-m106.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m101-m106.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 b66089756..50b1bfc8d 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 f155662c2..00473587b 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 d0c4caaf9..736cf5a37 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_m14-m17.ppd.gz b/ppd/hpcups/hp-laserjet_m14-m17.ppd.gz Binary files differindex 51a780d13..d2755920b 100644 --- a/ppd/hpcups/hp-laserjet_m14-m17.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m14-m17.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 782ac6fb4..38eaa5de7 100644 --- a/ppd/hpcups/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz Binary files differindex d18468e16..fe260bbc0 100644 --- a/ppd/hpcups/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz Binary files differindex 0539a5b0f..73f4ad630 100644 --- a/ppd/hpcups/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz Binary files differindex e23e61717..35a9b66a9 100644 --- a/ppd/hpcups/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m2727_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m2727_mfp-pcl3.ppd.gz Binary files differindex 1a0d0eefb..2b4ceaf6f 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 e824f4c31..3864ecf28 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 fe2008ee7..27ef19d03 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 af8fbe28a..29c24e833 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 cb20abe34..0d2c308f7 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 58d9d3063..2fdac4d44 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 dc1d5715b..f5022b9b6 100644 --- a/ppd/hpcups/hp-laserjet_m5035_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m5035_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz Binary files differindex 195fe67ee..11dd65414 100644 --- a/ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m9040_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m9040_mfp-pcl3.ppd.gz Binary files differindex cadb20258..4a9fc5e2a 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 328e575d2..beaf5438c 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 1b37110e7..2a229950f 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_mfp_m129-m134.ppd.gz b/ppd/hpcups/hp-laserjet_mfp_m129-m134.ppd.gz Binary files differindex 4fb90ef43..afdac7540 100644 --- a/ppd/hpcups/hp-laserjet_mfp_m129-m134.ppd.gz +++ b/ppd/hpcups/hp-laserjet_mfp_m129-m134.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_mfp_m232-m237.ppd.gz b/ppd/hpcups/hp-laserjet_mfp_m232-m237.ppd.gz Binary files differindex d0fe7bc44..922c3b15d 100644 --- a/ppd/hpcups/hp-laserjet_mfp_m232-m237.ppd.gz +++ b/ppd/hpcups/hp-laserjet_mfp_m232-m237.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_mfp_m28-m31.ppd.gz b/ppd/hpcups/hp-laserjet_mfp_m28-m31.ppd.gz Binary files differindex eb17b1730..6560b4392 100644 --- a/ppd/hpcups/hp-laserjet_mfp_m28-m31.ppd.gz +++ b/ppd/hpcups/hp-laserjet_mfp_m28-m31.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1005.ppd.gz b/ppd/hpcups/hp-laserjet_p1005.ppd.gz Binary files differindex 684904236..154ad0096 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 d9ed9c07d..0237a15bc 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 4f9d27360..88421b07a 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 c6bc35ca9..4fd8f37ba 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 e73acb84d..8357b20b4 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 0edb88c1d..28c01880b 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-zxs.ppd.gz b/ppd/hpcups/hp-laserjet_p1505n-zxs.ppd.gz Binary files differindex f03024c86..04f0453d4 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-zxs.ppd.gz b/ppd/hpcups/hp-laserjet_p2014-zxs.ppd.gz Binary files differindex 7cac8f2b4..7abe22602 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-zxs.ppd.gz b/ppd/hpcups/hp-laserjet_p2014n-zxs.ppd.gz Binary files differindex 73c900d0c..e73f06bad 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 166f0b04e..a7d3e10c1 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 ce5fb034a..90b0453fa 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 4465d6206..c05b9de6b 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 08478f4af..37581b032 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 c19ed5b5b..f40120c8a 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 fc658f50e..ca5f12317 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_p2035n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2035n-pcl3.ppd.gz Binary files differindex 14c2ed6d8..49f3757d4 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_p2055-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2055-pcl3.ppd.gz Binary files differindex 0524707b7..46e8c0f91 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 012e1fa0c..1c7458c3b 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 2ec4d31aa..14a20f2bc 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 799812fb1..4b5800dfd 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 f62cc06ce..ca10224f6 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 768218898..8cf1f495c 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 17255ac8d..79267ddf3 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 11fc61503..cbea138b7 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 50ff1784e..236d79ad1 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 3b75c1d5b..177ccec0f 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 98e8087e6..bd57669df 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 bfbf4242b..30545b0c9 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 fb4e3d433..42505e912 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 63c405ae4..85a8f7081 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 f11a63e2e..8a22acdfe 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 7b7c83472..f2ba9f361 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 3a1f24a09..b4eb48d75 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 3f9c29a88..aede65471 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 26dd157fd..46b7edb59 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 2513e7a50..0e69b17da 100644 --- a/ppd/hpcups/hp-laserjet_p4515xm.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4515xm.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m125a.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125a.ppd.gz Binary files differindex 639096dc7..b6beea5ac 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m125a.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125a.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m125nr.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125nr.ppd.gz Binary files differindex 5e8823192..ffc5067f5 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m125nr.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125nr.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m125nw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125nw.ppd.gz Binary files differindex 580211e07..51de0e8ea 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m125nw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m125r.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125r.ppd.gz Binary files differindex 76f534965..6319b8f6f 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m125r.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125r.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m125rnw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125rnw.ppd.gz Binary files differindex 6b8738ead..8d546ea60 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m125rnw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125rnw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m125s.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125s.ppd.gz Binary files differindex fea332d0b..35eb98770 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m125s.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125s.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m126a.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m126a.ppd.gz Binary files differindex 8dffb6207..cc9929c54 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m126a.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m126a.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m126nw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m126nw.ppd.gz Binary files differindex 4566f54cf..01e44a581 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m126nw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m126nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz Binary files differindex abadea754..140453212 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m127fp.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m127fp.ppd.gz Binary files differindex c136661ce..04a4312e7 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m127fp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m127fp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m127fs.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m127fs.ppd.gz Binary files differindex 4e698d86e..e575c36f8 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m127fs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m127fs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz Binary files differindex 661024df4..5b28553ae 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m128fn.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m128fn.ppd.gz Binary files differindex 6089c8e85..f908b5fcb 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m128fn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m128fn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m128fp.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m128fp.ppd.gz Binary files differindex be055d30c..30a05c9bf 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m128fp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m128fp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m128fw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m128fw.ppd.gz Binary files differindex cded37c8e..e35e37b4c 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m128fw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m128fw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m25a.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m25a.ppd.gz Binary files differindex 19056a9d1..05edb34bb 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m25a.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m25a.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m25nw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m25nw.ppd.gz Binary files differindex 2e9aa2b5f..ad34ffe68 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m25nw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m25nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m26a.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m26a.ppd.gz Binary files differindex 674c8f5d4..e365858bb 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m26a.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m26a.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m26nw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m26nw.ppd.gz Binary files differindex 8eaa3dde4..97ebcd550 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m26nw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m26nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m27c.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m27c.ppd.gz Binary files differindex 10ccf4eb6..3b26f1538 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m27c.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m27c.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m27cnw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m27cnw.ppd.gz Binary files differindex 68f5e6f54..949726d45 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m27cnw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m27cnw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz Binary files differindex bcf94116a..2658b7bbc 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz Binary files differindex 69ca7986f..c6b6015bb 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1137_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1137_mfp.ppd.gz Binary files differindex 1b084fd3a..2179254f6 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1137_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1137_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1138_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1138_mfp.ppd.gz Binary files differindex d36a48041..35a5fd453 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1138_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1138_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1139_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1139_mfp.ppd.gz Binary files differindex 3d5a3e978..9fbb14803 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1139_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1139_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz Binary files differindex 2752e9277..55b215734 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz Binary files differindex e08e2736c..6a18af74a 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1214nfh_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1214nfh_mfp.ppd.gz Binary files differindex 4538472c8..b5e101c9d 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1214nfh_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1214nfh_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1216nfh_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1216nfh_mfp.ppd.gz Binary files differindex 5a4d95ce7..3579bfc1e 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1216nfh_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1216nfh_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz Binary files differindex e0044ed70..4fd39fa6c 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1218nfg_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1218nfg_mfp.ppd.gz Binary files differindex f9fa467df..d5d42eccc 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1218nfg_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1218nfg_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1218nfs_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1218nfs_mfp.ppd.gz Binary files differindex 991899eda..613551ce9 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1218nfs_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1218nfs_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1219nf_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1219nf_mfp.ppd.gz Binary files differindex 74f668580..c766b64f7 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1219nf_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1219nf_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1219nfg_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1219nfg_mfp.ppd.gz Binary files differindex 8826c45bf..4abfe8a4e 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1219nfg_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1219nfg_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1219nfs_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1219nfs_mfp.ppd.gz Binary files differindex 25f0fbb0a..158c1ab70 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1219nfs_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1219nfs_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz Binary files differindex 4bfe4ace1..d27c0b7b8 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1106.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1106.ppd.gz Binary files differindex 63ef0b81a..e35579bf0 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1106.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1106.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1106w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1106w.ppd.gz Binary files differindex 22f1e220e..a480ad1fe 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1106w.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1106w.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1107.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1107.ppd.gz Binary files differindex 1741405b2..95b54b403 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1107.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1107.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1107w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1107w.ppd.gz Binary files differindex 3d564aba3..88eeb90aa 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1107w.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1107w.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1108.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1108.ppd.gz Binary files differindex cee9a60d3..3708b16ea 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1108.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1108.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1108w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1108w.ppd.gz Binary files differindex 5f78f78bb..e88e8b415 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1108w.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1108w.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1109.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1109.ppd.gz Binary files differindex 6c8ff8ed6..a9537d6db 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1109.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1109.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1109w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1109w.ppd.gz Binary files differindex 312110069..5ae621fb8 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1109w.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1109w.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz Binary files differindex 99ab67bc8..4a7dfe514 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1567.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1567.ppd.gz Binary files differindex 683caf352..e202cfe4e 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1567.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1567.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1568.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1568.ppd.gz Binary files differindex ebb5ba42a..189a563a4 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1568.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1568.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1569.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1569.ppd.gz Binary files differindex 4a943bf64..b2c9c3d65 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1569.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1569.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz Binary files differindex e3e3db31c..b36af50ab 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz Binary files differindex 917f7f682..d5819203b 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz Binary files differindex ba4af9988..da788c1aa 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz Binary files differindex 36b250a16..aad37100f 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz Binary files differindex 935b68ec4..b64d13fb3 100644 --- a/ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz diff --git a/ppd/hpcups/hp-mopier_240-pcl3.ppd.gz b/ppd/hpcups/hp-mopier_240-pcl3.ppd.gz Binary files differindex b9ff1a43c..91cfc3c86 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 ceb170b68..85793fb38 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-neverstop_laser_100x.ppd.gz b/ppd/hpcups/hp-neverstop_laser_100x.ppd.gz Binary files differindex 75249cd56..4039eff0d 100644 --- a/ppd/hpcups/hp-neverstop_laser_100x.ppd.gz +++ b/ppd/hpcups/hp-neverstop_laser_100x.ppd.gz diff --git a/ppd/hpcups/hp-neverstop_laser_mfp_120x.ppd.gz b/ppd/hpcups/hp-neverstop_laser_mfp_120x.ppd.gz Binary files differindex f8d390525..b204c2090 100644 --- a/ppd/hpcups/hp-neverstop_laser_mfp_120x.ppd.gz +++ b/ppd/hpcups/hp-neverstop_laser_mfp_120x.ppd.gz diff --git a/ppd/hpcups/hp-officejet.ppd.gz b/ppd/hpcups/hp-officejet.ppd.gz Binary files differindex 73273c0d4..4eefee9bf 100644 --- a/ppd/hpcups/hp-officejet.ppd.gz +++ b/ppd/hpcups/hp-officejet.ppd.gz diff --git a/ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz b/ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz Binary files differindex 6ceb42858..4832e463d 100644 --- a/ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz +++ b/ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz diff --git a/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz b/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz Binary files differindex 93ee33895..0bf6661ab 100644 --- a/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz +++ b/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz diff --git a/ppd/hpcups/hp-officejet_200_mobile_series.ppd.gz b/ppd/hpcups/hp-officejet_200_mobile_series.ppd.gz Binary files differindex 17cc552c6..4242991c4 100644 --- a/ppd/hpcups/hp-officejet_200_mobile_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_200_mobile_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_250_mobile_series.ppd.gz b/ppd/hpcups/hp-officejet_250_mobile_series.ppd.gz Binary files differindex b0f9fe129..7432fbc44 100644 --- a/ppd/hpcups/hp-officejet_250_mobile_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_250_mobile_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_2620_series.ppd.gz b/ppd/hpcups/hp-officejet_2620_series.ppd.gz Binary files differindex cb99c26e3..77db429fc 100644 --- a/ppd/hpcups/hp-officejet_2620_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_2620_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_3830_series.ppd.gz b/ppd/hpcups/hp-officejet_3830_series.ppd.gz Binary files differindex 239316d1a..92ad18018 100644 --- a/ppd/hpcups/hp-officejet_3830_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_3830_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4000_k210.ppd.gz b/ppd/hpcups/hp-officejet_4000_k210.ppd.gz Binary files differindex 803de8b2d..d699b11ee 100644 --- a/ppd/hpcups/hp-officejet_4000_k210.ppd.gz +++ b/ppd/hpcups/hp-officejet_4000_k210.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4100_series.ppd.gz b/ppd/hpcups/hp-officejet_4100_series.ppd.gz Binary files differindex 8b45fb60a..79ec4747c 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 48522071b..3827c0954 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 cca0dd542..8475bbc9b 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 8c9adfd49..6d327f225 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 44b8393b2..a9266422a 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 fc67a254e..a1decf1bf 100644 --- a/ppd/hpcups/hp-officejet_4300_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_4300_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4400_k410.ppd.gz b/ppd/hpcups/hp-officejet_4400_k410.ppd.gz Binary files differindex caee76ebc..b17c05499 100644 --- a/ppd/hpcups/hp-officejet_4400_k410.ppd.gz +++ b/ppd/hpcups/hp-officejet_4400_k410.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4500_g510a-f.ppd.gz b/ppd/hpcups/hp-officejet_4500_g510a-f.ppd.gz Binary files differindex 1d3903a3e..b2929874c 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 4c893fc38..393aaaabe 100644 --- a/ppd/hpcups/hp-officejet_4500_g510g-m.ppd.gz +++ b/ppd/hpcups/hp-officejet_4500_g510g-m.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4500_g510n-z.ppd.gz b/ppd/hpcups/hp-officejet_4500_g510n-z.ppd.gz Binary files differindex 7f91d832c..f3a03c2df 100644 --- a/ppd/hpcups/hp-officejet_4500_g510n-z.ppd.gz +++ b/ppd/hpcups/hp-officejet_4500_g510n-z.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4500_k710.ppd.gz b/ppd/hpcups/hp-officejet_4500_k710.ppd.gz Binary files differindex 1e997ea67..b0514a15a 100644 --- a/ppd/hpcups/hp-officejet_4500_k710.ppd.gz +++ b/ppd/hpcups/hp-officejet_4500_k710.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4610_series.ppd.gz b/ppd/hpcups/hp-officejet_4610_series.ppd.gz Binary files differindex a2e25e90a..9e8049a14 100644 --- a/ppd/hpcups/hp-officejet_4610_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_4610_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4620_series.ppd.gz b/ppd/hpcups/hp-officejet_4620_series.ppd.gz Binary files differindex 05d87bed3..232d56d9d 100644 --- a/ppd/hpcups/hp-officejet_4620_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_4620_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4630_series.ppd.gz b/ppd/hpcups/hp-officejet_4630_series.ppd.gz Binary files differindex d85b09755..61a1d105e 100644 --- a/ppd/hpcups/hp-officejet_4630_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_4630_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4650_series.ppd.gz b/ppd/hpcups/hp-officejet_4650_series.ppd.gz Binary files differindex c87440cdd..e9764f992 100644 --- a/ppd/hpcups/hp-officejet_4650_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_4650_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_5100_series.ppd.gz b/ppd/hpcups/hp-officejet_5100_series.ppd.gz Binary files differindex 256d0b8a6..36ac07f2f 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_5200_series.ppd.gz b/ppd/hpcups/hp-officejet_5200_series.ppd.gz Binary files differindex c12d096a9..368fcbe30 100644 --- a/ppd/hpcups/hp-officejet_5200_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_5200_series.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 673fa5d0e..d83550267 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 8d3a87ffc..b724dfe40 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_5740_series.ppd.gz b/ppd/hpcups/hp-officejet_5740_series.ppd.gz Binary files differindex c4b82e3be..60da1e09c 100644 --- a/ppd/hpcups/hp-officejet_5740_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_5740_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 a4c6efe9a..42183c079 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 6c41473a8..52ffa1263 100644 --- a/ppd/hpcups/hp-officejet_6000_e609n.ppd.gz +++ b/ppd/hpcups/hp-officejet_6000_e609n.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6100.ppd.gz b/ppd/hpcups/hp-officejet_6100.ppd.gz Binary files differindex 9798d4a88..bc555819e 100644 --- a/ppd/hpcups/hp-officejet_6100.ppd.gz +++ b/ppd/hpcups/hp-officejet_6100.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6100_series.ppd.gz b/ppd/hpcups/hp-officejet_6100_series.ppd.gz Binary files differindex 94178b51b..aad14902a 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 01ce9b7a9..eb7db909e 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 0334c0de6..c3b6a56c3 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 3016432d9..8cf3b6497 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 fc99515a3..b50f2211b 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 1f423e384..61b4e8784 100644 --- a/ppd/hpcups/hp-officejet_6500_e709n.ppd.gz +++ b/ppd/hpcups/hp-officejet_6500_e709n.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6500_e710a-f.ppd.gz b/ppd/hpcups/hp-officejet_6500_e710a-f.ppd.gz Binary files differindex 10b1c4363..ee89495ad 100644 --- a/ppd/hpcups/hp-officejet_6500_e710a-f.ppd.gz +++ b/ppd/hpcups/hp-officejet_6500_e710a-f.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6500_e710n-z.ppd.gz b/ppd/hpcups/hp-officejet_6500_e710n-z.ppd.gz Binary files differindex df881e777..e357f51fd 100644 --- a/ppd/hpcups/hp-officejet_6500_e710n-z.ppd.gz +++ b/ppd/hpcups/hp-officejet_6500_e710n-z.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6600.ppd.gz b/ppd/hpcups/hp-officejet_6600.ppd.gz Binary files differindex b77297a7f..8065ea083 100644 --- a/ppd/hpcups/hp-officejet_6600.ppd.gz +++ b/ppd/hpcups/hp-officejet_6600.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6700.ppd.gz b/ppd/hpcups/hp-officejet_6700.ppd.gz Binary files differindex 3362950f9..77890be90 100644 --- a/ppd/hpcups/hp-officejet_6700.ppd.gz +++ b/ppd/hpcups/hp-officejet_6700.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6800.ppd.gz b/ppd/hpcups/hp-officejet_6800.ppd.gz Binary files differindex be53e6882..9236e7ba4 100644 --- a/ppd/hpcups/hp-officejet_6800.ppd.gz +++ b/ppd/hpcups/hp-officejet_6800.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6950.ppd.gz b/ppd/hpcups/hp-officejet_6950.ppd.gz Binary files differindex 4517a9fbd..777c42a46 100644 --- a/ppd/hpcups/hp-officejet_6950.ppd.gz +++ b/ppd/hpcups/hp-officejet_6950.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6960.ppd.gz b/ppd/hpcups/hp-officejet_6960.ppd.gz Binary files differindex 27c32cc6f..fec69794d 100644 --- a/ppd/hpcups/hp-officejet_6960.ppd.gz +++ b/ppd/hpcups/hp-officejet_6960.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7000_e809a_series.ppd.gz b/ppd/hpcups/hp-officejet_7000_e809a_series.ppd.gz Binary files differindex 6ca8cf13e..b48c18f74 100644 --- a/ppd/hpcups/hp-officejet_7000_e809a_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7000_e809a_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7100_series.ppd.gz b/ppd/hpcups/hp-officejet_7100_series.ppd.gz Binary files differindex 2e5ee2b76..121c6f5e4 100644 --- a/ppd/hpcups/hp-officejet_7100_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7100_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7110_series.ppd.gz b/ppd/hpcups/hp-officejet_7110_series.ppd.gz Binary files differindex dc155755b..5b4e111bf 100644 --- a/ppd/hpcups/hp-officejet_7110_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7110_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7200_series.ppd.gz b/ppd/hpcups/hp-officejet_7200_series.ppd.gz Binary files differindex 3e389f3fd..bdf25f1df 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 43623eba3..fff1ff4fc 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 71d5334b4..793e09696 100644 --- a/ppd/hpcups/hp-officejet_7400_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7400_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7500_e910.ppd.gz b/ppd/hpcups/hp-officejet_7500_e910.ppd.gz Binary files differindex e0664a38c..37bfd45d9 100644 --- a/ppd/hpcups/hp-officejet_7500_e910.ppd.gz +++ b/ppd/hpcups/hp-officejet_7500_e910.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7510_series.ppd.gz b/ppd/hpcups/hp-officejet_7510_series.ppd.gz Binary files differindex c9d694377..681d04e5f 100644 --- a/ppd/hpcups/hp-officejet_7510_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7510_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7610_series.ppd.gz b/ppd/hpcups/hp-officejet_7610_series.ppd.gz Binary files differindex bc518cddc..abefa988b 100644 --- a/ppd/hpcups/hp-officejet_7610_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7610_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_8010_series.ppd.gz b/ppd/hpcups/hp-officejet_8010_series.ppd.gz Binary files differindex 04158ed5c..47aea7e68 100644 --- a/ppd/hpcups/hp-officejet_8010_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_8010_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_8020_series.ppd.gz b/ppd/hpcups/hp-officejet_8020_series.ppd.gz Binary files differindex 2f3f19f97..41c8847c2 100644 --- a/ppd/hpcups/hp-officejet_8020_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_8020_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_8040_series.ppd.gz b/ppd/hpcups/hp-officejet_8040_series.ppd.gz Binary files differindex 2a395f1a3..8994de905 100644 --- a/ppd/hpcups/hp-officejet_8040_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_8040_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_8700.ppd.gz b/ppd/hpcups/hp-officejet_8700.ppd.gz Binary files differindex 088824433..7b72f8105 100644 --- a/ppd/hpcups/hp-officejet_8700.ppd.gz +++ b/ppd/hpcups/hp-officejet_8700.ppd.gz diff --git a/ppd/hpcups/hp-officejet_9010_series.ppd.gz b/ppd/hpcups/hp-officejet_9010_series.ppd.gz Binary files differindex 97cabf080..c168cc3bd 100644 --- a/ppd/hpcups/hp-officejet_9010_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_9010_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 453e049b6..2327d9a62 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 a92bd44e0..afcc2d495 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 24b935e78..8e65601f2 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 3bb7e9de1..bcb67ebd1 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 165dc8d26..ec3ca1100 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 98fe511ca..39479cdcd 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 fb27f7195..7e8e7dc5f 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 d47b59d4b..5075f7aba 100644 --- a/ppd/hpcups/hp-officejet_h470.ppd.gz +++ b/ppd/hpcups/hp-officejet_h470.ppd.gz diff --git a/ppd/hpcups/hp-officejet_j3500_series.ppd.gz b/ppd/hpcups/hp-officejet_j3500_series.ppd.gz Binary files differindex 4e7cbde5f..611b56d14 100644 --- a/ppd/hpcups/hp-officejet_j3500_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_j3500_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_j3600_series.ppd.gz b/ppd/hpcups/hp-officejet_j3600_series.ppd.gz Binary files differindex 24423b49c..c48b25cb0 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 b9cc66022..12223db59 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 fa75456b4..cc53d1e8b 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 155852f07..a59a88598 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 7b3d8b75a..c75377b15 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 d09dbf560..39bf740ab 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 dca105222..a3d33d7e7 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 9d357fe6c..a8bf0445c 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 9f77c1f0e..e24e49e30 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 4d39c68ba..dc94a15ff 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 eb355b58a..fa24384f6 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 bb3dedea3..a97c86322 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 f00092c24..4e29128a7 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 652cae827..c8f3cf818 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 abbaaf147..fb4b8f0f2 100644 --- a/ppd/hpcups/hp-officejet_pro_1170c_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_1170c_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_3610.ppd.gz b/ppd/hpcups/hp-officejet_pro_3610.ppd.gz Binary files differindex f05152b2b..2b1ac7e46 100644 --- a/ppd/hpcups/hp-officejet_pro_3610.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_3610.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_3620.ppd.gz b/ppd/hpcups/hp-officejet_pro_3620.ppd.gz Binary files differindex e6fe5af73..462b7f703 100644 --- a/ppd/hpcups/hp-officejet_pro_3620.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_3620.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_6230.ppd.gz b/ppd/hpcups/hp-officejet_pro_6230.ppd.gz Binary files differindex 172eb7d77..ff06f3ebd 100644 --- a/ppd/hpcups/hp-officejet_pro_6230.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_6230.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_6830.ppd.gz b/ppd/hpcups/hp-officejet_pro_6830.ppd.gz Binary files differindex e055bb411..8c14e7d45 100644 --- a/ppd/hpcups/hp-officejet_pro_6830.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_6830.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_6960.ppd.gz b/ppd/hpcups/hp-officejet_pro_6960.ppd.gz Binary files differindex 120cc70a7..e3c9b7fc0 100644 --- a/ppd/hpcups/hp-officejet_pro_6960.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_6960.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_6970.ppd.gz b/ppd/hpcups/hp-officejet_pro_6970.ppd.gz Binary files differindex a2cd0d818..3812e6941 100644 --- a/ppd/hpcups/hp-officejet_pro_6970.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_6970.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_7720_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_7720_series.ppd.gz Binary files differindex 57a4cabc3..a55513e8f 100644 --- a/ppd/hpcups/hp-officejet_pro_7720_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_7720_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_7730_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_7730_series.ppd.gz Binary files differindex 68a7f406e..24e2ae372 100644 --- a/ppd/hpcups/hp-officejet_pro_7730_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_7730_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_7740_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_7740_series.ppd.gz Binary files differindex 5f5008511..15c534158 100644 --- a/ppd/hpcups/hp-officejet_pro_7740_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_7740_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 22778f68c..c58922eff 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_8020_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_8020_series.ppd.gz Binary files differindex a90f1b253..153d39b30 100644 --- a/ppd/hpcups/hp-officejet_pro_8020_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8020_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8030_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_8030_series.ppd.gz Binary files differindex ec1e3cb45..4f624eba1 100644 --- a/ppd/hpcups/hp-officejet_pro_8030_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8030_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8100.ppd.gz b/ppd/hpcups/hp-officejet_pro_8100.ppd.gz Binary files differindex 5505caaca..ba416d3ce 100644 --- a/ppd/hpcups/hp-officejet_pro_8100.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8100.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8500_a909a.ppd.gz b/ppd/hpcups/hp-officejet_pro_8500_a909a.ppd.gz Binary files differindex 4ce8057c9..0deac494d 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 838e49f95..8b44c402b 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 04085d228..59a346f81 100644 --- a/ppd/hpcups/hp-officejet_pro_8500_a909n.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8500_a909n.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8500_a910.ppd.gz b/ppd/hpcups/hp-officejet_pro_8500_a910.ppd.gz Binary files differindex c654750ef..40259a653 100644 --- a/ppd/hpcups/hp-officejet_pro_8500_a910.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8500_a910.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8600.ppd.gz b/ppd/hpcups/hp-officejet_pro_8600.ppd.gz Binary files differindex a0daf207d..62025b25b 100644 --- a/ppd/hpcups/hp-officejet_pro_8600.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8600.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8610.ppd.gz b/ppd/hpcups/hp-officejet_pro_8610.ppd.gz Binary files differindex b6b55b27d..7f7d9ff18 100644 --- a/ppd/hpcups/hp-officejet_pro_8610.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8610.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8620.ppd.gz b/ppd/hpcups/hp-officejet_pro_8620.ppd.gz Binary files differindex 1651595d7..4a53bfe5f 100644 --- a/ppd/hpcups/hp-officejet_pro_8620.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8620.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8630.ppd.gz b/ppd/hpcups/hp-officejet_pro_8630.ppd.gz Binary files differindex 2e39a114a..9b72d54c0 100644 --- a/ppd/hpcups/hp-officejet_pro_8630.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8630.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8640.ppd.gz b/ppd/hpcups/hp-officejet_pro_8640.ppd.gz Binary files differindex a4d0667ca..329804dba 100644 --- a/ppd/hpcups/hp-officejet_pro_8640.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8640.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8660.ppd.gz b/ppd/hpcups/hp-officejet_pro_8660.ppd.gz Binary files differindex f693fcae2..08a452669 100644 --- a/ppd/hpcups/hp-officejet_pro_8660.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8660.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8710.ppd.gz b/ppd/hpcups/hp-officejet_pro_8710.ppd.gz Binary files differindex 3712d46f4..cc616e458 100644 --- a/ppd/hpcups/hp-officejet_pro_8710.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8710.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8720.ppd.gz b/ppd/hpcups/hp-officejet_pro_8720.ppd.gz Binary files differindex e10c04cd0..ce0d59d0b 100644 --- a/ppd/hpcups/hp-officejet_pro_8720.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8720.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_9010_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_9010_series.ppd.gz Binary files differindex 13f6ef3fa..dd5a93162 100644 --- a/ppd/hpcups/hp-officejet_pro_9010_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_9010_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_9020_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_9020_series.ppd.gz Binary files differindex 96f873db9..75eda9d81 100644 --- a/ppd/hpcups/hp-officejet_pro_9020_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_9020_series.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 96dfe5c2c..cd5f01b6d 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 1848ad062..eab4ea67b 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 97cfded18..14f154e8a 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 e670be3b1..9ea4b48ba 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 2a738bbc9..9d524bdbe 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 46d24e6a2..cd64ec6d9 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 b3a90ea27..0b3c95ac8 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 5c7b0500b..236352724 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 a3ea11d9c..bd404ea1c 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 41f7c38db..1f531da1c 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 7f90a2998..d01a32c92 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 604c6e9b6..406e82eb7 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 cc5e8498a..734a92c98 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 96ff33071..ffb778f31 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 ac6cbeb01..ab2579e7b 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 25388d77d..bf4b46af8 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 435910329..4037213d4 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 779f89f8a..9cf995909 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 1761808f3..b83281df0 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 45356049e..11fa1e312 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 fba3e2757..96ceb7e96 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 4e2ffeb37..e67740f84 100644 --- a/ppd/hpcups/hp-officejet_series_350.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_350.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_520.ppd.gz b/ppd/hpcups/hp-officejet_series_520.ppd.gz Binary files differindex f20cc1d0b..1e9115e5a 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 281fa9a0a..4353d1928 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 20d1bca0d..4524d59f5 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 5d1360399..308e1a753 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 710a3d36b..4349255e8 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 08caedeb6..63f82c8d7 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 859631f2c..68e571760 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 14b920505..827fd757b 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 b0ba268dc..64e379f76 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 753eb0137..7541d5f74 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 47456265b..20f37480c 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 20ad3b90c..75ad067f2 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 ed70589cf..aad09cab9 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 8759c6891..151a50b57 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 ee2edbb04..4b0bb1b1f 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 c5bc59065..8c152825b 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 7a6d7c427..d98129fc6 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 2e8c548b9..07147d39b 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 22fca0975..9802b725c 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 f391d70a6..98ee508a0 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 a36817e5b..f838c6498 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 c5349cd67..3d43a0573 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 cb2f4ce22..281a2e455 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 d8d6b5b66..9243ae27d 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 02516c021..27eb43dab 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 917ba3286..13343dbf9 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 4ce7ef49c..ae27d86e5 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 185487c10..19e2a7af4 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 d1f6018a3..fa1141250 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 893560aa2..4cbf278c1 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 5f1474e6a..f4e06e421 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 55f59e857..de25eb588 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 fa5a1248a..152e3baab 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 49185b048..989f2046d 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 c692ae6d2..70921747d 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 bb732cbe2..1ac32f53c 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 a26aadf32..6cb647be8 100644 --- a/ppd/hpcups/hp-photosmart_470_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_470_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_5510_series.ppd.gz b/ppd/hpcups/hp-photosmart_5510_series.ppd.gz Binary files differindex e4d078002..e469d4433 100644 --- a/ppd/hpcups/hp-photosmart_5510_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_5510_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_5510d_series.ppd.gz b/ppd/hpcups/hp-photosmart_5510d_series.ppd.gz Binary files differindex a2a5422a3..5eb231e97 100644 --- a/ppd/hpcups/hp-photosmart_5510d_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_5510d_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_5520_series.ppd.gz b/ppd/hpcups/hp-photosmart_5520_series.ppd.gz Binary files differindex 55a040d56..6ad4dd253 100644 --- a/ppd/hpcups/hp-photosmart_5520_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_5520_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_6510_series.ppd.gz b/ppd/hpcups/hp-photosmart_6510_series.ppd.gz Binary files differindex 46de0ac31..ef4f69d8b 100644 --- a/ppd/hpcups/hp-photosmart_6510_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_6510_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_6520_series.ppd.gz b/ppd/hpcups/hp-photosmart_6520_series.ppd.gz Binary files differindex 3b8ff8428..0b2a00248 100644 --- a/ppd/hpcups/hp-photosmart_6520_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_6520_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7200_series.ppd.gz b/ppd/hpcups/hp-photosmart_7200_series.ppd.gz Binary files differindex c788b3fbc..076c85e47 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 5fc37dc08..ca0f0afc2 100644 --- a/ppd/hpcups/hp-photosmart_7345.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7345.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 e69d615c5..becac561a 100644 --- a/ppd/hpcups/hp-photosmart_7400_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7400_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7510_series.ppd.gz b/ppd/hpcups/hp-photosmart_7510_series.ppd.gz Binary files differindex 285269578..2fbd16b5c 100644 --- a/ppd/hpcups/hp-photosmart_7510_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7510_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7520_series.ppd.gz b/ppd/hpcups/hp-photosmart_7520_series.ppd.gz Binary files differindex 51bd4d616..3e493b68d 100644 --- a/ppd/hpcups/hp-photosmart_7520_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7520_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7550.ppd.gz b/ppd/hpcups/hp-photosmart_7550.ppd.gz Binary files differindex 8d7c24387..f9d0fda2c 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 ba042926b..04f106f54 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 719ffbfff..dd2c758ee 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 6d6c126a2..56217df2e 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 0925eca41..7440dad50 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 36dfc86e8..1fb6e822d 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 abc601065..f30723449 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 c9a1129a4..0c23b05c3 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 ea1e43338..98be8993e 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 5fe6a2c71..5d87e0514 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 c1b083383..52e4ea32f 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 b62039f7e..30eda9070 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 bcf946e25..c3415cdac 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 a15f84dc7..d5cfdcee7 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 7411c4ad0..1e5878ea9 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 a0ce47e7b..6cbe85450 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 8d641852e..8652c2998 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 db74a7b9b..9cfa1ea55 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 eda940969..22c7faf0e 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 352eb22de..f3dd2445c 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 86c119db5..562ac6524 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 ddb6d9e48..c5a08c4a3 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 11b35fe3a..ab62f699d 100644 --- a/ppd/hpcups/hp-photosmart_a820_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a820_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_b010_series.ppd.gz b/ppd/hpcups/hp-photosmart_b010_series.ppd.gz Binary files differindex 34614b613..881c418cb 100644 --- a/ppd/hpcups/hp-photosmart_b010_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_b010_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_b109a_series.ppd.gz b/ppd/hpcups/hp-photosmart_b109a_series.ppd.gz Binary files differindex faf1d214a..221b62ee3 100644 --- a/ppd/hpcups/hp-photosmart_b109a_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_b109a_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_b110_series.ppd.gz b/ppd/hpcups/hp-photosmart_b110_series.ppd.gz Binary files differindex f7b8dc521..e12633d85 100644 --- a/ppd/hpcups/hp-photosmart_b110_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_b110_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_b8500_series.ppd.gz b/ppd/hpcups/hp-photosmart_b8500_series.ppd.gz Binary files differindex 8f83b31dc..3a3ecdffd 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 2ee65bedc..b6f952001 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 0e2ad35ad..bb23f6947 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 5d0b48f66..b6d972748 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 688e1844a..b68178891 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 9e2f2b0fb..0773f0042 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 2e81b6c4c..8b7312d40 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 530723de2..a64b056d5 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 9c914eac1..d83a8bde9 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 0b5c0564e..eed7a6be3 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 b026e8954..502376564 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 a8e00ee70..812c80ac3 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 7773b9402..4ffea0ee5 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 3f5d43ad1..66941dc9c 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 bcf3fa21c..c83b61691 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 70bd4d884..078022220 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 cd434cbb4..99b9fbb00 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 bc9c15695..beb7cec92 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 8798c84d8..22ec3d763 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 dcd7b44a2..4e1e6d13f 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 a316aef81..7c24d7868 100644 --- a/ppd/hpcups/hp-photosmart_c8100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c8100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d110_series.ppd.gz b/ppd/hpcups/hp-photosmart_d110_series.ppd.gz Binary files differindex cd3b053ea..604dca017 100644 --- a/ppd/hpcups/hp-photosmart_d110_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d110_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d5060_series.ppd.gz b/ppd/hpcups/hp-photosmart_d5060_series.ppd.gz Binary files differindex 81f4d12e4..086a30d54 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 dd785ac2e..b9fd21e80 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 2b961cb47..c3561fe98 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 4462b2dff..25e763a26 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 dbefbcf8a..4ad09227f 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 855c222e8..0bd339ca2 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 ca8521fd2..1c444ace1 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 0d6169310..d6e8485aa 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 88f35dc3f..9caa74330 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 faad28889..63bebc2bf 100644 --- a/ppd/hpcups/hp-photosmart_d7500_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d7500_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_estn_c510_series.ppd.gz b/ppd/hpcups/hp-photosmart_estn_c510_series.ppd.gz Binary files differindex 86df7c337..5d11f7f34 100644 --- a/ppd/hpcups/hp-photosmart_estn_c510_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_estn_c510_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_ink_adv_k510.ppd.gz b/ppd/hpcups/hp-photosmart_ink_adv_k510.ppd.gz Binary files differindex 6381e6f69..745e3cc6c 100644 --- a/ppd/hpcups/hp-photosmart_ink_adv_k510.ppd.gz +++ b/ppd/hpcups/hp-photosmart_ink_adv_k510.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_p1000.ppd.gz b/ppd/hpcups/hp-photosmart_p1000.ppd.gz Binary files differindex fb70b8a84..783d061bf 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 33823d7d3..87ebeae37 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 b56d3f734..fe27bc9a1 100644 --- a/ppd/hpcups/hp-photosmart_plus_b209a-m.ppd.gz +++ b/ppd/hpcups/hp-photosmart_plus_b209a-m.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_plus_b210_series.ppd.gz b/ppd/hpcups/hp-photosmart_plus_b210_series.ppd.gz Binary files differindex c9f7d90e6..b17de1392 100644 --- a/ppd/hpcups/hp-photosmart_plus_b210_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_plus_b210_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_prem-web_c309n-s.ppd.gz b/ppd/hpcups/hp-photosmart_prem-web_c309n-s.ppd.gz Binary files differindex 1eff221de..401a52e2b 100644 --- a/ppd/hpcups/hp-photosmart_prem-web_c309n-s.ppd.gz +++ b/ppd/hpcups/hp-photosmart_prem-web_c309n-s.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_prem_c310_series.ppd.gz b/ppd/hpcups/hp-photosmart_prem_c310_series.ppd.gz Binary files differindex ef7318a60..fb5fd7315 100644 --- a/ppd/hpcups/hp-photosmart_prem_c310_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_prem_c310_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_prem_c410_series.ppd.gz b/ppd/hpcups/hp-photosmart_prem_c410_series.ppd.gz Binary files differindex 44a614609..0edd8bbb1 100644 --- a/ppd/hpcups/hp-photosmart_prem_c410_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_prem_c410_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_premium_c309g-m.ppd.gz b/ppd/hpcups/hp-photosmart_premium_c309g-m.ppd.gz Binary files differindex 2d137eb4e..6348c59de 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 8644e3d62..7358d3f2c 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 d4f0dca1c..2f8112915 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 408df1c9b..181b5f62d 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 a26f7ebda..e1553765c 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 61a56ad51..4c33761c6 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 7715a237e..aab059262 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 2352c3d32..0eb9a2e1a 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 e69e6b362..e22c7f91c 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 355452c06..75acb0428 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 62389f8d9..149643edf 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 7ceb77306..97cab2aa8 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 0222126bd..0f2a2a8e7 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_1600_series.ppd.gz b/ppd/hpcups/hp-psc_1600_series.ppd.gz Binary files differindex 544e97464..ca5a2ce1a 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 ec4917bce..95b7670c9 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 90d67f3fe..f48101f88 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 b627be357..280cdc63d 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 12856cb7e..0f9d28ac4 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 ee030ef97..cc6524eb0 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 58f7f57a0..64c9f7738 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 3665954de..600a6af31 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 b06a993d4..44997d8df 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 9fef5195e..29f6a8cd8 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 348eb884c..723c4e822 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 d89ef2773..01439b45b 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 4aaa36f7c..be917dde2 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 49488c434..02cae166d 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 26d9fd70f..155ff1c4c 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 e86fa5e04..d0d5b9606 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 eaa44f151..c587f9afa 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 57cb2107c..84f5fb80a 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 a9daf4a92..bc736043d 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 24882dfd8..837528be1 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 57097c392..5b2535308 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 1249946d7..254c3a725 100644 --- a/ppd/hpcups/hp-psc_950xi.ppd.gz +++ b/ppd/hpcups/hp-psc_950xi.ppd.gz diff --git a/ppd/hpcups/hp-smart_tank_350_series.ppd.gz b/ppd/hpcups/hp-smart_tank_350_series.ppd.gz Binary files differindex a6c01d662..1a76de916 100644 --- a/ppd/hpcups/hp-smart_tank_350_series.ppd.gz +++ b/ppd/hpcups/hp-smart_tank_350_series.ppd.gz diff --git a/ppd/hpcups/hp-smart_tank_500_series.ppd.gz b/ppd/hpcups/hp-smart_tank_500_series.ppd.gz Binary files differindex a10ba59ed..e054be495 100644 --- a/ppd/hpcups/hp-smart_tank_500_series.ppd.gz +++ b/ppd/hpcups/hp-smart_tank_500_series.ppd.gz diff --git a/ppd/hpcups/hp-smart_tank_510_series.ppd.gz b/ppd/hpcups/hp-smart_tank_510_series.ppd.gz Binary files differindex 3c42f5b41..17e7800cd 100644 --- a/ppd/hpcups/hp-smart_tank_510_series.ppd.gz +++ b/ppd/hpcups/hp-smart_tank_510_series.ppd.gz diff --git a/ppd/hpcups/hp-smart_tank_530_series.ppd.gz b/ppd/hpcups/hp-smart_tank_530_series.ppd.gz Binary files differindex 7548c56eb..a8d9bd2bf 100644 --- a/ppd/hpcups/hp-smart_tank_530_series.ppd.gz +++ b/ppd/hpcups/hp-smart_tank_530_series.ppd.gz diff --git a/ppd/hpcups/hp-smart_tank_610_series.ppd.gz b/ppd/hpcups/hp-smart_tank_610_series.ppd.gz Binary files differindex e91a6180a..a5b51629e 100644 --- a/ppd/hpcups/hp-smart_tank_610_series.ppd.gz +++ b/ppd/hpcups/hp-smart_tank_610_series.ppd.gz diff --git a/ppd/hpcups/hp-smart_tank_plus_550_series.ppd.gz b/ppd/hpcups/hp-smart_tank_plus_550_series.ppd.gz Binary files differindex 00f1c8928..827e80499 100644 --- a/ppd/hpcups/hp-smart_tank_plus_550_series.ppd.gz +++ b/ppd/hpcups/hp-smart_tank_plus_550_series.ppd.gz diff --git a/ppd/hpcups/hp-smart_tank_plus_570_series.ppd.gz b/ppd/hpcups/hp-smart_tank_plus_570_series.ppd.gz Binary files differindex 7549857bf..3e7a7ad18 100644 --- a/ppd/hpcups/hp-smart_tank_plus_570_series.ppd.gz +++ b/ppd/hpcups/hp-smart_tank_plus_570_series.ppd.gz diff --git a/ppd/hpcups/hp-smart_tank_plus_650_series.ppd.gz b/ppd/hpcups/hp-smart_tank_plus_650_series.ppd.gz Binary files differindex 2a485fce3..44179f30c 100644 --- a/ppd/hpcups/hp-smart_tank_plus_650_series.ppd.gz +++ b/ppd/hpcups/hp-smart_tank_plus_650_series.ppd.gz diff --git a/ppd/hpcups/hp-smart_tank_wireless_450_series.ppd.gz b/ppd/hpcups/hp-smart_tank_wireless_450_series.ppd.gz Binary files differindex e0ea47782..2c47a1502 100644 --- a/ppd/hpcups/hp-smart_tank_wireless_450_series.ppd.gz +++ b/ppd/hpcups/hp-smart_tank_wireless_450_series.ppd.gz diff --git a/ppd/hpcups/hp-tango.ppd.gz b/ppd/hpcups/hp-tango.ppd.gz Binary files differindex a57df6474..8efd85f9b 100644 --- a/ppd/hpcups/hp-tango.ppd.gz +++ b/ppd/hpcups/hp-tango.ppd.gz diff --git a/prnt/cupsext/cupsext.c b/prnt/cupsext/cupsext.c index 88e27c07d..01e7e5e7c 100644 --- a/prnt/cupsext/cupsext.c +++ b/prnt/cupsext/cupsext.c @@ -867,13 +867,14 @@ PyObject * getStatusAttributes( PyObject * self, PyObject * args ) int index = 0; int valueindex = 0; char * device_uri; + char * printer_name; - if ( !PyArg_ParseTuple( args, "z", &device_uri) ) + if ( !PyArg_ParseTuple( args, "zz", &device_uri,&printer_name) ) { goto abort; } - response = getDeviceStatusAttributes(device_uri, &attr_count); + response = getDeviceStatusAttributes(device_uri,printer_name, &attr_count); if(!response) goto abort; diff --git a/prnt/drv/hpcups.drv.in b/prnt/drv/hpcups.drv.in index a64b6d6b2..ab7d79298 100644 --- a/prnt/drv/hpcups.drv.in +++ b/prnt/drv/hpcups.drv.in @@ -6509,8 +6509,6 @@ Manufacturer "HP" "<</cupsInteger0 65/PageSize[498.72 708.48]/ImagingBBox null>>setpagedevice" CustomMedia "B5/B5 182x257" 515.76 728.4 8.4 8.4 8.4 41.04 "<</cupsInteger0 45/PageSize[515.76 728.4]/ImagingBBox null>>setpagedevice" "<</cupsInteger0 45/PageSize[515.76 728.4]/ImagingBBox null>>setpagedevice" - CustomMedia "Custom/Custom1" 612 1008 8.4 8.4 8.4 41.04 "<</cupsInteger0 101/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 101/PageSize[612 1008]/ImagingBBox null>>setpagedevice" CustomMedia "Env10/#10 Envelope 4.1x9.5in" 296.88 684 8.4 8.4 8.4 41.04 "<</cupsInteger0 81/PageSize[296.88 684]/ImagingBBox null>>setpagedevice" "<</cupsInteger0 81/PageSize[296.88 684]/ImagingBBox null>>setpagedevice" CustomMedia "EnvA2/A2 Envelope 111x146in" 314.88 414 8.4 8.4 8.4 41.04 "<</cupsInteger0 109/PageSize[314.88 414]/ImagingBBox null>>setpagedevice" @@ -6651,8 +6649,6 @@ Manufacturer "HP" "<</cupsInteger0 65/PageSize[498.72 708.48]/ImagingBBox null>>setpagedevice" CustomMedia "B5/B5 182x257" 515.76 728.4 8.4 8.4 8.4 36 "<</cupsInteger0 45/PageSize[515.76 728.4]/ImagingBBox null>>setpagedevice" "<</cupsInteger0 45/PageSize[515.76 728.4]/ImagingBBox null>>setpagedevice" - CustomMedia "Custom/Custom1" 612 1008 8.4 8.4 8.4 36 "<</cupsInteger0 101/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 101/PageSize[612 1008]/ImagingBBox null>>setpagedevice" CustomMedia "Env10/#10 Envelope 4.1x9.5in" 296.88 684 8.4 8.4 8.4 36 "<</cupsInteger0 81/PageSize[296.88 684]/ImagingBBox null>>setpagedevice" "<</cupsInteger0 81/PageSize[296.88 684]/ImagingBBox null>>setpagedevice" CustomMedia "EnvA2/A2 Envelope 111x146in" 314.88 414 8.4 8.4 8.4 36 "<</cupsInteger0 109/PageSize[314.88 414]/ImagingBBox null>>setpagedevice" @@ -6790,8 +6786,6 @@ Manufacturer "HP" "<</cupsInteger0 65/PageSize[498.72 708.48]/ImagingBBox null>>setpagedevice" CustomMedia "B5/B5 182x257" 515.76 728.4 8.4 8.4 8.4 36 "<</cupsInteger0 45/PageSize[515.76 728.4]/ImagingBBox null>>setpagedevice" "<</cupsInteger0 45/PageSize[515.76 728.4]/ImagingBBox null>>setpagedevice" - CustomMedia "Custom/Custom1" 612 1008 8.4 8.4 8.4 36 "<</cupsInteger0 101/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 101/PageSize[612 1008]/ImagingBBox null>>setpagedevice" CustomMedia "Env10/#10 Envelope 4.1x9.5in" 296.88 684 8.4 8.4 8.4 36 "<</cupsInteger0 81/PageSize[296.88 684]/ImagingBBox null>>setpagedevice" "<</cupsInteger0 81/PageSize[296.88 684]/ImagingBBox null>>setpagedevice" CustomMedia "EnvA2/A2 Envelope 111x146in" 314.88 414 8.4 8.4 8.4 36 "<</cupsInteger0 109/PageSize[314.88 414]/ImagingBBox null>>setpagedevice" @@ -18895,7 +18889,7 @@ Group "RLT/HP Real Life Technologies" } { ModelName "HP LaserJet p2035" - Attribute "NickName" "" "HP LaserJet p2035 pcl3, hpcups $Version" + Attribute "NickName" "" "HP LaserJet p2035 pcl3, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet p2035;DES:hp laserjet p2035;" PCFileName "hp-laserjet_p2035-pcl3.ppd" @@ -18903,7 +18897,7 @@ Group "RLT/HP Real Life Technologies" } { ModelName "HP LaserJet p2035n" - Attribute "NickName" "" "HP LaserJet p2035n pcl3, hpcups $Version" + Attribute "NickName" "" "HP LaserJet p2035n pcl3, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035n hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet p2035n;DES:hp laserjet p2035n;" PCFileName "hp-laserjet_p2035n-pcl3.ppd" @@ -22046,7 +22040,7 @@ Group "RLT/HP Real Life Technologies" // <%LJZjsMono:Normal%> { ModelName "HP LaserJet 1000" - Attribute "NickName" "" "HP LaserJet 1000, hpcups $Version" + Attribute "NickName" "" "HP LaserJet 1000, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1000 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet 1000;DES:hp laserjet 1000;" PCFileName "hp-laserjet_1000.ppd" @@ -22054,7 +22048,7 @@ Group "RLT/HP Real Life Technologies" } { ModelName "HP LaserJet 1005 Series" - Attribute "NickName" "" "HP LaserJet 1005 Series, hpcups $Version" + Attribute "NickName" "" "HP LaserJet 1005 Series, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1005 Series hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet 1005 series;DES:hp laserjet 1005 series;" PCFileName "hp-laserjet_1005_series.ppd" @@ -22062,7 +22056,7 @@ Group "RLT/HP Real Life Technologies" } { ModelName "HP LaserJet 1018" - Attribute "NickName" "" "HP LaserJet 1018, hpcups $Version" + Attribute "NickName" "" "HP LaserJet 1018, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1018 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet 1018;DES:hp laserjet 1018;" PCFileName "hp-laserjet_1018.ppd" @@ -22071,7 +22065,7 @@ Group "RLT/HP Real Life Technologies" } { ModelName "HP LaserJet 1020" - Attribute "NickName" "" "HP LaserJet 1020, hpcups $Version" + Attribute "NickName" "" "HP LaserJet 1020, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1020 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet 1020;DES:hp laserjet 1020;" PCFileName "hp-laserjet_1020.ppd" @@ -22080,7 +22074,7 @@ Group "RLT/HP Real Life Technologies" } { ModelName "HP LaserJet m1120 MFP" - Attribute "NickName" "" "HP LaserJet m1120 MFP, hpcups $Version" + Attribute "NickName" "" "HP LaserJet m1120 MFP, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1120 MFP hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1120 mfp;DES:hp laserjet m1120 mfp;" PCFileName "hp-laserjet_m1120_mfp.ppd" @@ -22088,7 +22082,7 @@ Group "RLT/HP Real Life Technologies" } { ModelName "HP LaserJet m1120n MFP" - Attribute "NickName" "" "HP LaserJet m1120n MFP, hpcups $Version" + Attribute "NickName" "" "HP LaserJet m1120n MFP, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1120n MFP hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1120n mfp;DES:hp laserjet m1120n mfp;" PCFileName "hp-laserjet_m1120n_mfp.ppd" @@ -22096,7 +22090,7 @@ Group "RLT/HP Real Life Technologies" } { ModelName "HP LaserJet m1319f MFP" - Attribute "NickName" "" "HP LaserJet m1319f MFP, hpcups $Version" + Attribute "NickName" "" "HP LaserJet m1319f MFP, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1319f MFP hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1319f mfp;DES:hp laserjet m1319f mfp;" PCFileName "hp-laserjet_m1319f_mfp.ppd" @@ -22261,7 +22255,7 @@ Group "RLT/HP Real Life Technologies" } { ModelName "HP LaserJet Professional m1217nfw MFP" - Attribute "NickName" "" "HP LaserJet Professional m1217nfw MFP, hpcups $Version" + Attribute "NickName" "" "HP LaserJet Professional m1217nfw MFP, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LJ Pro m1217nfw MFP hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet professional m1217nfw mfp;DES:hp laserjet professional m1217nfw mfp;" PCFileName "hp-laserjet_professional_m1217nfw_mfp.ppd" @@ -22307,7 +22301,7 @@ Group "RLT/HP Real Life Technologies" } { ModelName "HP LaserJet Professional p1102" - Attribute "NickName" "" "HP LaserJet Professional p1102, hpcups $Version" + Attribute "NickName" "" "HP LaserJet Professional p1102, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LJ Pro p1102 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet professional p1102;DES:hp laserjet professional p1102;" PCFileName "hp-laserjet_professional_p1102.ppd" @@ -22380,7 +22374,7 @@ Group "RLT/HP Real Life Technologies" } { ModelName "HP LaserJet Professional p1566" - Attribute "NickName" "" "HP LaserJet Professional p1566, hpcups $Version" + Attribute "NickName" "" "HP LaserJet Professional p1566, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LJ Pro p1566 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet professional p1566;DES:hp laserjet professional p1566;" PCFileName "hp-laserjet_professional_p1566.ppd" @@ -22693,7 +22687,7 @@ Group "RLT/HP Real Life Technologies" // <%LJZjsColor:Normal%> { ModelName "HP Color LaserJet 1600" - Attribute "NickName" "" "HP Color LaserJet 1600, hpcups $Version" + Attribute "NickName" "" "HP Color LaserJet 1600, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 1600 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color laserjet 1600;DES:hp color laserjet 1600;" PCFileName "hp-color_laserjet_1600.ppd" @@ -22701,7 +22695,7 @@ Group "RLT/HP Real Life Technologies" } { ModelName "HP Color LaserJet 2600n" - Attribute "NickName" "" "HP Color LaserJet 2600n, hpcups $Version" + Attribute "NickName" "" "HP Color LaserJet 2600n, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 2600n hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color laserjet 2600n;DES:hp color laserjet 2600n;" PCFileName "hp-color_laserjet_2600n.ppd" @@ -22709,7 +22703,7 @@ Group "RLT/HP Real Life Technologies" } { ModelName "HP Color LaserJet cp1215" - Attribute "NickName" "" "HP Color LaserJet cp1215, hpcups $Version" + Attribute "NickName" "" "HP Color LaserJet cp1215, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cp1215 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color laserjet cp1215;DES:hp color laserjet cp1215;" PCFileName "hp-color_laserjet_cp1215.ppd" @@ -22742,7 +22736,7 @@ Group "RLT/HP Real Life Technologies" } { ModelName "HP LaserJet cp1025nw" - Attribute "NickName" "" "HP LaserJet cp1025nw, hpcups $Version" + Attribute "NickName" "" "HP LaserJet cp1025nw, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet cp1025nw hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet cp1025nw;DES:hp laserjet cp1025nw;" PCFileName "hp-laserjet_cp1025nw.ppd" @@ -22929,18 +22923,8 @@ Group "RLT/HP Real Life Technologies" Attribute "ShortNickName" "" "HP LaserJet MFP m232-m237 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet mfp m232-m237;DES:hp laserjet mfp m232-m237;" PCFileName "hp-laserjet_mfp_m232-m237.ppd" - Attribute "Product" "" "(HP LaserJet MFP m233d)" - Attribute "Product" "" "(HP LaserJet MFP m236d)" Attribute "Product" "" "(HP LaserJet MFP m234dw)" - Attribute "Product" "" "(HP LaserJet MFP m236dw)" - Attribute "Product" "" "(HP LaserJet MFP m233dw)" - Attribute "Product" "" "(HP LaserJet MFP m234sdn)" - Attribute "Product" "" "(HP LaserJet MFP m233sdn)" - Attribute "Product" "" "(HP LaserJet MFP m236sdn)" - Attribute "Product" "" "(HP LaserJet MFP m232sdn)" - Attribute "Product" "" "(HP LaserJet MFP m234sdw)" - Attribute "Product" "" "(HP LaserJet MFP m236sdw)" - Attribute "Product" "" "(HP LaserJet MFP m233sdw)" + Attribute "Product" "" "(HP LaserJet MFP m234dwe)" } { ModelName "HP LaserJet MFP m28-m31" @@ -23045,7 +23029,7 @@ Group "RLT/HP Real Life Technologies" } { ModelName "HP LaserJet Pro MFP m127fw" - Attribute "NickName" "" "HP LaserJet Pro MFP m127fw, hpcups $Version" + Attribute "NickName" "" "HP LaserJet Pro MFP m127fw, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LJ Pro MFP m127fw hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet pro mfp m127fw;DES:hp laserjet pro mfp m127fw;" PCFileName "hp-laserjet_pro_mfp_m127fw.ppd" @@ -23259,7 +23243,7 @@ Group "RLT/HP Real Life Technologies" // <%Hbpl1:Color%> { ModelName "HP Color LaserJet Pro MFP m176n" - Attribute "NickName" "" "HP Color LaserJet Pro MFP m176n, hpcups $Version" + Attribute "NickName" "" "HP Color LaserJet Pro MFP m176n, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP CJ LJ Pro MFP m176n hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color laserjet pro mfp m176n;DES:hp color laserjet pro mfp m176n;" PCFileName "hp-color_laserjet_pro_mfp_m176n.ppd" @@ -23549,7 +23533,7 @@ Group "RLT/HP Real Life Technologies" // <%LJm1005:Normal%> { ModelName "HP LaserJet m1005" - Attribute "NickName" "" "HP LaserJet m1005, hpcups $Version" + Attribute "NickName" "" "HP LaserJet m1005, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1005 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1005;DES:hp laserjet m1005;" PCFileName "hp-laserjet_m1005.ppd" @@ -23557,7 +23541,7 @@ Group "RLT/HP Real Life Technologies" } { ModelName "HP LaserJet p1505" - Attribute "NickName" "" "HP LaserJet p1505, hpcups $Version" + Attribute "NickName" "" "HP LaserJet p1505, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1505 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet p1505;DES:hp laserjet p1505;" PCFileName "hp-laserjet_p1505.ppd" @@ -23699,7 +23683,7 @@ Group "RLT/HP Real Life Technologies" // <%LJP1XXX:Normal%> { ModelName "HP LaserJet p1005" - Attribute "NickName" "" "HP LaserJet p1005, hpcups $Version" + Attribute "NickName" "" "HP LaserJet p1005, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1005 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet p1005;DES:hp laserjet p1005;" PCFileName "hp-laserjet_p1005.ppd" @@ -23707,7 +23691,7 @@ Group "RLT/HP Real Life Technologies" } { ModelName "HP LaserJet p1006" - Attribute "NickName" "" "HP LaserJet p1006, hpcups $Version" + Attribute "NickName" "" "HP LaserJet p1006, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1006 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet p1006;DES:hp laserjet p1006;" PCFileName "hp-laserjet_p1006.ppd" @@ -23715,7 +23699,7 @@ Group "RLT/HP Real Life Technologies" } { ModelName "HP LaserJet p1007" - Attribute "NickName" "" "HP LaserJet p1007, hpcups $Version" + Attribute "NickName" "" "HP LaserJet p1007, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1007 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet p1007;DES:hp laserjet p1007;" PCFileName "hp-laserjet_p1007.ppd" @@ -23723,7 +23707,7 @@ Group "RLT/HP Real Life Technologies" } { ModelName "HP LaserJet p1008" - Attribute "NickName" "" "HP LaserJet p1008, hpcups $Version" + Attribute "NickName" "" "HP LaserJet p1008, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1008 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet p1008;DES:hp laserjet p1008;" PCFileName "hp-laserjet_p1008.ppd" diff --git a/prnt/drv/hpcups.drv.in.template b/prnt/drv/hpcups.drv.in.template index 5895d95a3..c4bab7c35 100644 --- a/prnt/drv/hpcups.drv.in.template +++ b/prnt/drv/hpcups.drv.in.template @@ -4276,8 +4276,6 @@ Manufacturer "HP" "<</cupsInteger0 65/PageSize[498.72 708.48]/ImagingBBox null>>setpagedevice" CustomMedia "B5/B5 182x257" 515.76 728.4 8.4 8.4 8.4 41.04 "<</cupsInteger0 45/PageSize[515.76 728.4]/ImagingBBox null>>setpagedevice" "<</cupsInteger0 45/PageSize[515.76 728.4]/ImagingBBox null>>setpagedevice" - CustomMedia "Custom/Custom1" 612 1008 8.4 8.4 8.4 41.04 "<</cupsInteger0 101/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 101/PageSize[612 1008]/ImagingBBox null>>setpagedevice" CustomMedia "Env10/#10 Envelope 4.1x9.5in" 296.88 684 8.4 8.4 8.4 41.04 "<</cupsInteger0 81/PageSize[296.88 684]/ImagingBBox null>>setpagedevice" "<</cupsInteger0 81/PageSize[296.88 684]/ImagingBBox null>>setpagedevice" CustomMedia "EnvA2/A2 Envelope 111x146in" 314.88 414 8.4 8.4 8.4 41.04 "<</cupsInteger0 109/PageSize[314.88 414]/ImagingBBox null>>setpagedevice" @@ -4395,8 +4393,6 @@ Manufacturer "HP" "<</cupsInteger0 65/PageSize[498.72 708.48]/ImagingBBox null>>setpagedevice" CustomMedia "B5/B5 182x257" 515.76 728.4 8.4 8.4 8.4 36 "<</cupsInteger0 45/PageSize[515.76 728.4]/ImagingBBox null>>setpagedevice" "<</cupsInteger0 45/PageSize[515.76 728.4]/ImagingBBox null>>setpagedevice" - CustomMedia "Custom/Custom1" 612 1008 8.4 8.4 8.4 36 "<</cupsInteger0 101/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 101/PageSize[612 1008]/ImagingBBox null>>setpagedevice" CustomMedia "Env10/#10 Envelope 4.1x9.5in" 296.88 684 8.4 8.4 8.4 36 "<</cupsInteger0 81/PageSize[296.88 684]/ImagingBBox null>>setpagedevice" "<</cupsInteger0 81/PageSize[296.88 684]/ImagingBBox null>>setpagedevice" CustomMedia "EnvA2/A2 Envelope 111x146in" 314.88 414 8.4 8.4 8.4 36 "<</cupsInteger0 109/PageSize[314.88 414]/ImagingBBox null>>setpagedevice" @@ -4525,8 +4521,6 @@ Manufacturer "HP" "<</cupsInteger0 65/PageSize[498.72 708.48]/ImagingBBox null>>setpagedevice" CustomMedia "B5/B5 182x257" 515.76 728.4 8.4 8.4 8.4 36 "<</cupsInteger0 45/PageSize[515.76 728.4]/ImagingBBox null>>setpagedevice" "<</cupsInteger0 45/PageSize[515.76 728.4]/ImagingBBox null>>setpagedevice" - CustomMedia "Custom/Custom1" 612 1008 8.4 8.4 8.4 36 "<</cupsInteger0 101/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 101/PageSize[612 1008]/ImagingBBox null>>setpagedevice" CustomMedia "Env10/#10 Envelope 4.1x9.5in" 296.88 684 8.4 8.4 8.4 36 "<</cupsInteger0 81/PageSize[296.88 684]/ImagingBBox null>>setpagedevice" "<</cupsInteger0 81/PageSize[296.88 684]/ImagingBBox null>>setpagedevice" CustomMedia "EnvA2/A2 Envelope 111x146in" 314.88 414 8.4 8.4 8.4 36 "<</cupsInteger0 109/PageSize[314.88 414]/ImagingBBox null>>setpagedevice" diff --git a/prnt/drv/hpijs.drv.in b/prnt/drv/hpijs.drv.in index 57c340746..00f388e5f 100644 --- a/prnt/drv/hpijs.drv.in +++ b/prnt/drv/hpijs.drv.in @@ -6918,7 +6918,7 @@ t=0" } { ModelName "HP LaserJet p2035 hpijs" - Attribute "NickName" "" "HP LaserJet p2035 hpijs pcl3, $Version" + Attribute "NickName" "" "HP LaserJet p2035 hpijs pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet p2035;DES:hp laserjet p2035;" PCFileName "hp-laserjet_p2035-pcl3-hpijs.ppd" @@ -6926,7 +6926,7 @@ t=0" } { ModelName "HP LaserJet p2035n hpijs" - Attribute "NickName" "" "HP LaserJet p2035n hpijs pcl3, $Version" + Attribute "NickName" "" "HP LaserJet p2035n hpijs pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035n hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet p2035n;DES:hp laserjet p2035n;" PCFileName "hp-laserjet_p2035n-pcl3-hpijs.ppd" @@ -10966,7 +10966,7 @@ Transparency" // <%LJZjsMono:Normal%> { ModelName "HP LaserJet 1000 hpijs" - Attribute "NickName" "" "HP LaserJet 1000 hpijs, $Version" + Attribute "NickName" "" "HP LaserJet 1000 hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1000 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet 1000;DES:hp laserjet 1000;" PCFileName "hp-laserjet_1000-hpijs.ppd" @@ -10974,7 +10974,7 @@ Transparency" } { ModelName "HP LaserJet 1005 Series hpijs" - Attribute "NickName" "" "HP LaserJet 1005 Series hpijs, $Version" + Attribute "NickName" "" "HP LaserJet 1005 Series hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1005 Series hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet 1005 series;DES:hp laserjet 1005 series;" PCFileName "hp-laserjet_1005_series-hpijs.ppd" @@ -10982,7 +10982,7 @@ Transparency" } { ModelName "HP LaserJet 1018 hpijs" - Attribute "NickName" "" "HP LaserJet 1018 hpijs, $Version" + Attribute "NickName" "" "HP LaserJet 1018 hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1018 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet 1018;DES:hp laserjet 1018;" PCFileName "hp-laserjet_1018-hpijs.ppd" @@ -10991,7 +10991,7 @@ Transparency" } { ModelName "HP LaserJet 1020 hpijs" - Attribute "NickName" "" "HP LaserJet 1020 hpijs, $Version" + Attribute "NickName" "" "HP LaserJet 1020 hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1020 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet 1020;DES:hp laserjet 1020;" PCFileName "hp-laserjet_1020-hpijs.ppd" @@ -11000,7 +11000,7 @@ Transparency" } { ModelName "HP LaserJet m1120 MFP hpijs" - Attribute "NickName" "" "HP LaserJet m1120 MFP hpijs, $Version" + Attribute "NickName" "" "HP LaserJet m1120 MFP hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1120 MFP hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1120 mfp;DES:hp laserjet m1120 mfp;" PCFileName "hp-laserjet_m1120_mfp-hpijs.ppd" @@ -11008,7 +11008,7 @@ Transparency" } { ModelName "HP LaserJet m1120n MFP hpijs" - Attribute "NickName" "" "HP LaserJet m1120n MFP hpijs, $Version" + Attribute "NickName" "" "HP LaserJet m1120n MFP hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1120n MFP hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1120n mfp;DES:hp laserjet m1120n mfp;" PCFileName "hp-laserjet_m1120n_mfp-hpijs.ppd" @@ -11016,7 +11016,7 @@ Transparency" } { ModelName "HP LaserJet m1319f MFP hpijs" - Attribute "NickName" "" "HP LaserJet m1319f MFP hpijs, $Version" + Attribute "NickName" "" "HP LaserJet m1319f MFP hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1319f MFP hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1319f mfp;DES:hp laserjet m1319f mfp;" PCFileName "hp-laserjet_m1319f_mfp-hpijs.ppd" @@ -11219,7 +11219,7 @@ Transparency" } { ModelName "HP LaserJet Professional m1217nfw MFP hpijs" - Attribute "NickName" "" "HP LaserJet Professional m1217nfw MFP hpijs, $Version" + Attribute "NickName" "" "HP LaserJet Professional m1217nfw MFP hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LJ Pro m1217nfw MFP hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet professional m1217nfw mfp;DES:hp laserjet professional m1217nfw mfp;" PCFileName "hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd" @@ -11265,7 +11265,7 @@ Transparency" } { ModelName "HP LaserJet Professional p1102 hpijs" - Attribute "NickName" "" "HP LaserJet Professional p1102 hpijs, $Version" + Attribute "NickName" "" "HP LaserJet Professional p1102 hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LJ Pro p1102 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet professional p1102;DES:hp laserjet professional p1102;" PCFileName "hp-laserjet_professional_p1102-hpijs.ppd" @@ -11338,7 +11338,7 @@ Transparency" } { ModelName "HP LaserJet Professional p1566 hpijs" - Attribute "NickName" "" "HP LaserJet Professional p1566 hpijs, $Version" + Attribute "NickName" "" "HP LaserJet Professional p1566 hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LJ Pro p1566 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet professional p1566;DES:hp laserjet professional p1566;" PCFileName "hp-laserjet_professional_p1566-hpijs.ppd" @@ -11852,7 +11852,7 @@ Transparency" // <%LJm1005:Normal%> { ModelName "HP LaserJet m1005 hpijs" - Attribute "NickName" "" "HP LaserJet m1005 hpijs, $Version" + Attribute "NickName" "" "HP LaserJet m1005 hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1005 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1005;DES:hp laserjet m1005;" PCFileName "hp-laserjet_m1005-hpijs.ppd" @@ -11860,7 +11860,7 @@ Transparency" } { ModelName "HP LaserJet p1505 hpijs" - Attribute "NickName" "" "HP LaserJet p1505 hpijs, $Version" + Attribute "NickName" "" "HP LaserJet p1505 hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1505 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet p1505;DES:hp laserjet p1505;" PCFileName "hp-laserjet_p1505-hpijs.ppd" @@ -12025,7 +12025,7 @@ Transparency" // <%LJZjsColor:Normal%> { ModelName "HP Color LaserJet 1600 hpijs" - Attribute "NickName" "" "HP Color LaserJet 1600 hpijs, $Version" + Attribute "NickName" "" "HP Color LaserJet 1600 hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 1600 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color laserjet 1600;DES:hp color laserjet 1600;" PCFileName "hp-color_laserjet_1600-hpijs.ppd" @@ -12033,7 +12033,7 @@ Transparency" } { ModelName "HP Color LaserJet 2600n hpijs" - Attribute "NickName" "" "HP Color LaserJet 2600n hpijs, $Version" + Attribute "NickName" "" "HP Color LaserJet 2600n hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 2600n hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color laserjet 2600n;DES:hp color laserjet 2600n;" PCFileName "hp-color_laserjet_2600n-hpijs.ppd" @@ -12041,7 +12041,7 @@ Transparency" } { ModelName "HP Color LaserJet cp1215 hpijs" - Attribute "NickName" "" "HP Color LaserJet cp1215 hpijs, $Version" + Attribute "NickName" "" "HP Color LaserJet cp1215 hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cp1215 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color laserjet cp1215;DES:hp color laserjet cp1215;" PCFileName "hp-color_laserjet_cp1215-hpijs.ppd" @@ -12069,7 +12069,7 @@ Transparency" } { ModelName "HP LaserJet cp1025nw hpijs" - Attribute "NickName" "" "HP LaserJet cp1025nw hpijs, $Version" + Attribute "NickName" "" "HP LaserJet cp1025nw hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet cp1025nw hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet cp1025nw;DES:hp laserjet cp1025nw;" PCFileName "hp-laserjet_cp1025nw-hpijs.ppd" @@ -12279,18 +12279,8 @@ Transparency" Attribute "ShortNickName" "" "HP LaserJet MFP m232-m237 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet mfp m232-m237;DES:hp laserjet mfp m232-m237;" PCFileName "hp-laserjet_mfp_m232-m237-hpijs.ppd" - Attribute "Product" "" "(HP LaserJet MFP m233d)" - Attribute "Product" "" "(HP LaserJet MFP m236d)" Attribute "Product" "" "(HP LaserJet MFP m234dw)" - Attribute "Product" "" "(HP LaserJet MFP m236dw)" - Attribute "Product" "" "(HP LaserJet MFP m233dw)" - Attribute "Product" "" "(HP LaserJet MFP m234sdn)" - Attribute "Product" "" "(HP LaserJet MFP m233sdn)" - Attribute "Product" "" "(HP LaserJet MFP m236sdn)" - Attribute "Product" "" "(HP LaserJet MFP m232sdn)" - Attribute "Product" "" "(HP LaserJet MFP m234sdw)" - Attribute "Product" "" "(HP LaserJet MFP m236sdw)" - Attribute "Product" "" "(HP LaserJet MFP m233sdw)" + Attribute "Product" "" "(HP LaserJet MFP m234dwe)" } { ModelName "HP LaserJet MFP m28-m31 hpijs" @@ -12395,7 +12385,7 @@ Transparency" } { ModelName "HP LaserJet Pro MFP m127fw hpijs" - Attribute "NickName" "" "HP LaserJet Pro MFP m127fw hpijs, $Version" + Attribute "NickName" "" "HP LaserJet Pro MFP m127fw hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LJ Pro MFP m127fw hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet pro mfp m127fw;DES:hp laserjet pro mfp m127fw;" PCFileName "hp-laserjet_pro_mfp_m127fw-hpijs.ppd" @@ -12500,7 +12490,7 @@ Transparency" // <%Hbpl1:Color%> { ModelName "HP Color LaserJet Pro MFP m176n hpijs" - Attribute "NickName" "" "HP Color LaserJet Pro MFP m176n hpijs, $Version" + Attribute "NickName" "" "HP Color LaserJet Pro MFP m176n hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP CJ LJ Pro MFP m176n hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color laserjet pro mfp m176n;DES:hp color laserjet pro mfp m176n;" PCFileName "hp-color_laserjet_pro_mfp_m176n-hpijs.ppd" @@ -12640,7 +12630,7 @@ Transparency" // <%LJP1XXX:Normal%> { ModelName "HP LaserJet p1005 hpijs" - Attribute "NickName" "" "HP LaserJet p1005 hpijs, $Version" + Attribute "NickName" "" "HP LaserJet p1005 hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1005 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet p1005;DES:hp laserjet p1005;" PCFileName "hp-laserjet_p1005-hpijs.ppd" @@ -12648,7 +12638,7 @@ Transparency" } { ModelName "HP LaserJet p1006 hpijs" - Attribute "NickName" "" "HP LaserJet p1006 hpijs, $Version" + Attribute "NickName" "" "HP LaserJet p1006 hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1006 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet p1006;DES:hp laserjet p1006;" PCFileName "hp-laserjet_p1006-hpijs.ppd" @@ -12656,7 +12646,7 @@ Transparency" } { ModelName "HP LaserJet p1007 hpijs" - Attribute "NickName" "" "HP LaserJet p1007 hpijs, $Version" + Attribute "NickName" "" "HP LaserJet p1007 hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1007 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet p1007;DES:hp laserjet p1007;" PCFileName "hp-laserjet_p1007-hpijs.ppd" @@ -12664,7 +12654,7 @@ Transparency" } { ModelName "HP LaserJet p1008 hpijs" - Attribute "NickName" "" "HP LaserJet p1008 hpijs, $Version" + Attribute "NickName" "" "HP LaserJet p1008 hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1008 hpijs" Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet p1008;DES:hp laserjet p1008;" PCFileName "hp-laserjet_p1008-hpijs.ppd" 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 8ec852eaf..b3016ec7b 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 2b73b9ea1..dcf5c20d2 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 3e7a3501e..c5a626874 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 37aad1463..0153ba57c 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 009eb1220..bbe8df592 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 b22a17035..a991692cc 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 d28b93fd6..099ecdf9d 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 42821ae95..046a2f79b 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_designjet_xl_3600-ps.ppd.gz b/prnt/ps/hp-color_designjet_xl_3600-ps.ppd.gz Binary files differindex 732e302a1..d1d63328a 100644 --- a/prnt/ps/hp-color_designjet_xl_3600-ps.ppd.gz +++ b/prnt/ps/hp-color_designjet_xl_3600-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 c500da002..08ec556f9 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 dc099e555..08bd945b0 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 3310437c7..67a110fcc 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 f290b1fbc..51addface 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 03733abc1..dad3514ff 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 77fe09748..41546a75d 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 2ff2576be..f4c2ada59 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 2ec44a316..4118b7fe8 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 88832988f..477a6109d 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 3ad41dc5d..9af91ca5e 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 20c07597c..e29e1b42a 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 d7cfd22dc..c52552bfe 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 2f7e1ca9d..894a40a38 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 eaca5d173..c80f2d947 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 26931baa5..4cdcaffab 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 4201ff1c4..0460f0e3f 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 9b542ef1f..3faf57b8d 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 8587acef4..fa3c7700c 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 3db66a240..b45309736 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 8aeeff8aa..03168fa1a 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 11ded9263..ff2b516a8 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 798b8bb31..f3eb48dad 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 31b58deba..4d72cb9e0 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 edd22d766..17c837e89 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 45ae407c5..e007108f0 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 05891037c..5d8ff2ec8 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 5d43c5c2e..0f4d303eb 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 a801b0dca..2ddd1b5f3 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 d6a0debc0..fd8144f58 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 29ff1a504..ac48c0a79 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 79f8ff39c..299780357 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 8247c1707..35abe768b 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_E65150_E65160-ps.ppd.gz b/prnt/ps/hp-color_laserjet_E65150_E65160-ps.ppd.gz Binary files differindex b71a9bc8a..fbfd44a8e 100644 --- a/prnt/ps/hp-color_laserjet_E65150_E65160-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_E65150_E65160-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 b6a3a02f7..90d1e8cde 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 502ea7c93..d093c7b81 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 5da02b2da..f909fea18 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 cfde018cd..fd92e8ae3 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 1a1a020ed..81f9a9ff0 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 92b68f999..0c1633575 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 168f902c5..800d5c703 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 e3f119a73..8da90a3ed 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 818a191c1..e314acb5d 100644 --- a/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz Binary files differindex 4584c2ac7..0e322c611 100644 --- a/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz Binary files differindex 87be75224..157ab50f5 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 e7159010c..fb88224b4 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 06e81ec52..5c2f86c42 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 cfe316bc9..420dd887f 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 01a12e95d..37fb298aa 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 e864cc721..6293c6eff 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 20cb17674..e31a240dd 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 12ffbade7..de8b13bb2 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 16f2f223d..9d3b1ccc8 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 48d5f6e38..e89ec026f 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 11093da12..86940dff6 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 9c3d2ef71..e88935b32 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 1f5096158..692d128ae 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 94cad789a..afb3cf452 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 18ea284a2..005b33b09 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 6f9d7e3ab..b2ea4b721 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 89391ac54..2a78c44c6 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 4c9940d08..86f314031 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 a6c1d86ee..98146eb86 100644 --- a/prnt/ps/hp-color_laserjet_cp5225n-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp5225n-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz Binary files differindex 30d5cd927..a6dd41ed9 100644 --- a/prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp6015-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp6015-ps.ppd.gz Binary files differindex ac0582256..ee4b1509e 100644 --- a/prnt/ps/hp-color_laserjet_cp6015-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp6015-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_e55040-ps.ppd.gz b/prnt/ps/hp-color_laserjet_e55040-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..d27806743 --- /dev/null +++ b/prnt/ps/hp-color_laserjet_e55040-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_e65050_e65060-ps.ppd.gz b/prnt/ps/hp-color_laserjet_e65050_e65060-ps.ppd.gz Binary files differindex ed0db46a3..e41619b2f 100644 --- a/prnt/ps/hp-color_laserjet_e65050_e65060-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_e65050_e65060-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_e67550_e67560-ps.ppd.gz b/prnt/ps/hp-color_laserjet_e67550_e67560-ps.ppd.gz Binary files differindex e9605b7f9..8c7ea122a 100644 --- a/prnt/ps/hp-color_laserjet_e67550_e67560-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_e67550_e67560-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_e67650_e67660-ps.ppd.gz b/prnt/ps/hp-color_laserjet_e67650_e67660-ps.ppd.gz Binary files differindex 12768d5ec..e04eae7ae 100644 --- a/prnt/ps/hp-color_laserjet_e67650_e67660-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_e67650_e67660-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_e75245-ps.ppd.gz b/prnt/ps/hp-color_laserjet_e75245-ps.ppd.gz Binary files differindex edd3948c0..10be42a72 100644 --- a/prnt/ps/hp-color_laserjet_e75245-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_e75245-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_e85055-ps.ppd.gz b/prnt/ps/hp-color_laserjet_e85055-ps.ppd.gz Binary files differindex 9ce59d4b2..026d8fe62 100644 --- a/prnt/ps/hp-color_laserjet_e85055-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_e85055-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_flow_e57540-ps.ppd.gz b/prnt/ps/hp-color_laserjet_flow_e57540-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..b27c61858 --- /dev/null +++ b/prnt/ps/hp-color_laserjet_flow_e57540-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz b/prnt/ps/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz Binary files differindex d7c5d295f..e80cc0494 100644 --- a/prnt/ps/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz b/prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz Binary files differindex e9f06c299..17e1ff7bd 100644 --- a/prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_flowmfp_m578-ps.ppd.gz b/prnt/ps/hp-color_laserjet_flowmfp_m578-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..49afafa8a --- /dev/null +++ b/prnt/ps/hp-color_laserjet_flowmfp_m578-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_flowmfp_m776-ps.ppd.gz b/prnt/ps/hp-color_laserjet_flowmfp_m776-ps.ppd.gz Binary files differindex 71fc80047..0b84e755e 100644 --- a/prnt/ps/hp-color_laserjet_flowmfp_m776-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_flowmfp_m776-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m153-m154-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m153-m154-ps.ppd.gz Binary files differindex 8299d16ec..6596c5b8c 100644 --- a/prnt/ps/hp-color_laserjet_m153-m154-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m153-m154-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m155-m156-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m155-m156-ps.ppd.gz Binary files differindex 938ba2804..f6c1616cc 100644 --- a/prnt/ps/hp-color_laserjet_m155-m156-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m155-m156-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m182-m185-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m182-m185-ps.ppd.gz Binary files differindex e5cc785ee..3f9ed5033 100644 --- a/prnt/ps/hp-color_laserjet_m182-m185-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m182-m185-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m253-m254-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m253-m254-ps.ppd.gz Binary files differindex 37c24b1c8..44ccbaf6a 100644 --- a/prnt/ps/hp-color_laserjet_m253-m254-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m253-m254-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m255-m256-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m255-m256-ps.ppd.gz Binary files differindex fc20f78a9..69a5a6752 100644 --- a/prnt/ps/hp-color_laserjet_m255-m256-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m255-m256-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m282-m285-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m282-m285-ps.ppd.gz Binary files differindex d78380703..fa7ff393c 100644 --- a/prnt/ps/hp-color_laserjet_m282-m285-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m282-m285-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m452-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m452-ps.ppd.gz Binary files differindex 3ca57fc5f..f56893f3f 100644 --- a/prnt/ps/hp-color_laserjet_m452-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m452-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m452d-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m452d-ps.ppd.gz Binary files differindex a45f882cf..809551686 100644 --- a/prnt/ps/hp-color_laserjet_m452d-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m452d-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m552-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m552-ps.ppd.gz Binary files differindex 91a60280b..ec723c37d 100644 --- a/prnt/ps/hp-color_laserjet_m552-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m552-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m553-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m553-ps.ppd.gz Binary files differindex 93c3d52c0..66986ba91 100644 --- a/prnt/ps/hp-color_laserjet_m553-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m553-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m554-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m554-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..6bb181a50 --- /dev/null +++ b/prnt/ps/hp-color_laserjet_m554-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m555-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m555-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..998d5ee5e --- /dev/null +++ b/prnt/ps/hp-color_laserjet_m555-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m651-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m651-ps.ppd.gz Binary files differindex 466d55343..9534ad6a3 100644 --- a/prnt/ps/hp-color_laserjet_m651-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m651-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m652_m653-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m652_m653-ps.ppd.gz Binary files differindex 5aa0007ec..7b4f2aee7 100644 --- a/prnt/ps/hp-color_laserjet_m652_m653-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m652_m653-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m750-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m750-ps.ppd.gz Binary files differindex 33261b4dc..bfd783d48 100644 --- a/prnt/ps/hp-color_laserjet_m750-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m750-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m751-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m751-ps.ppd.gz Binary files differindex 29b0c91eb..4c72e1f92 100644 --- a/prnt/ps/hp-color_laserjet_m751-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m751-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz Binary files differindex 1e000ead5..89ba9147f 100644 --- a/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m856-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m856-ps.ppd.gz Binary files differindex 10e20ffe7..02817c398 100644 --- a/prnt/ps/hp-color_laserjet_m856-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m856-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_e57540-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_e57540-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..492f49e45 --- /dev/null +++ b/prnt/ps/hp-color_laserjet_mfp_e57540-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_e77422-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_e77422-ps.ppd.gz Binary files differindex 537c0e470..7f9d58ffc 100644 --- a/prnt/ps/hp-color_laserjet_mfp_e77422-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_mfp_e77422-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_e77428-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_e77428-ps.ppd.gz Binary files differindex e7f488f03..1ec51e0b7 100644 --- a/prnt/ps/hp-color_laserjet_mfp_e77428-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_mfp_e77428-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_e78223-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_e78223-ps.ppd.gz Binary files differindex e24568827..dfe1298b3 100644 --- a/prnt/ps/hp-color_laserjet_mfp_e78223-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_mfp_e78223-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_e78228-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_e78228-ps.ppd.gz Binary files differindex 585be9c63..08632e71d 100644 --- a/prnt/ps/hp-color_laserjet_mfp_e78228-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_mfp_e78228-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_e78323-25-30-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_e78323-25-30-ps.ppd.gz Binary files differindex 9163844d9..fcdcdc81b 100644 --- a/prnt/ps/hp-color_laserjet_mfp_e78323-25-30-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_mfp_e78323-25-30-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz Binary files differindex a730341c9..0d585603f 100644 --- a/prnt/ps/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_m274-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m274-ps.ppd.gz Binary files differindex d28488c18..26294bc2f 100644 --- a/prnt/ps/hp-color_laserjet_mfp_m274-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_mfp_m274-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz Binary files differindex c2db9cbf0..7f2155785 100644 --- a/prnt/ps/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_m577-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m577-ps.ppd.gz Binary files differindex 85ee9d406..dbf7c4589 100644 --- a/prnt/ps/hp-color_laserjet_mfp_m577-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_mfp_m577-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_m578-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m578-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..f78837d53 --- /dev/null +++ b/prnt/ps/hp-color_laserjet_mfp_m578-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_m680-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m680-ps.ppd.gz Binary files differindex 063285af3..fd533b456 100644 --- a/prnt/ps/hp-color_laserjet_mfp_m680-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_mfp_m680-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_m681_m682-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m681_m682-ps.ppd.gz Binary files differindex 4246a0ecc..669c37c34 100644 --- a/prnt/ps/hp-color_laserjet_mfp_m681_m682-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_mfp_m681_m682-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_m776-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m776-ps.ppd.gz Binary files differindex 20253c7ba..4ae8eca9c 100644 --- a/prnt/ps/hp-color_laserjet_mfp_m776-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_mfp_m776-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_pro_m252-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_m252-ps.ppd.gz Binary files differindex 4d4ab4beb..800282f5c 100644 --- a/prnt/ps/hp-color_laserjet_pro_m252-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_pro_m252-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_pro_m453-4-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_m453-4-ps.ppd.gz Binary files differindex 624594e91..b1784dfa1 100644 --- a/prnt/ps/hp-color_laserjet_pro_m453-4-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_pro_m453-4-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_pro_m478f-9f-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_m478f-9f-ps.ppd.gz Binary files differindex 3f6d3ae4c..1b61df138 100644 --- a/prnt/ps/hp-color_laserjet_pro_m478f-9f-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_pro_m478f-9f-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_pro_m479-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_m479-ps.ppd.gz Binary files differindex 079847381..44df16879 100644 --- a/prnt/ps/hp-color_laserjet_pro_m479-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_pro_m479-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz Binary files differindex 93ab9072f..a935a2f40 100644 --- a/prnt/ps/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_pro_mfp_m377-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_mfp_m377-ps.ppd.gz Binary files differindex b6a890a8a..6b3543ce1 100644 --- a/prnt/ps/hp-color_laserjet_pro_mfp_m377-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_pro_mfp_m377-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz Binary files differindex b29ddf419..88d7de3f0 100644 --- a/prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz Binary files differindex c9d3147f1..db0383d2b 100644 --- a/prnt/ps/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz Binary files differindex cb31c59fb..cf4e5385a 100644 --- a/prnt/ps/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_4000ps.ppd.gz b/prnt/ps/hp-designjet_4000ps.ppd.gz Binary files differindex 50625d14c..8126234d3 100644 --- a/prnt/ps/hp-designjet_4000ps.ppd.gz +++ b/prnt/ps/hp-designjet_4000ps.ppd.gz diff --git a/prnt/ps/hp-designjet_4020ps-ps.ppd.gz b/prnt/ps/hp-designjet_4020ps-ps.ppd.gz Binary files differindex 385f85a62..feab7bbd8 100644 --- a/prnt/ps/hp-designjet_4020ps-ps.ppd.gz +++ b/prnt/ps/hp-designjet_4020ps-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_4500mfp.ppd.gz b/prnt/ps/hp-designjet_4500mfp.ppd.gz Binary files differindex 55056204f..6e0f07384 100644 --- a/prnt/ps/hp-designjet_4500mfp.ppd.gz +++ b/prnt/ps/hp-designjet_4500mfp.ppd.gz diff --git a/prnt/ps/hp-designjet_4500ps.ppd.gz b/prnt/ps/hp-designjet_4500ps.ppd.gz Binary files differindex 86766ddd3..7cfadf757 100644 --- a/prnt/ps/hp-designjet_4500ps.ppd.gz +++ b/prnt/ps/hp-designjet_4500ps.ppd.gz diff --git a/prnt/ps/hp-designjet_4520mfp-ps.ppd.gz b/prnt/ps/hp-designjet_4520mfp-ps.ppd.gz Binary files differindex 080588a91..b116aee26 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 37ab03837..573bbed08 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_Z6_24in-ps.ppd.gz b/prnt/ps/hp-designjet_Z6_24in-ps.ppd.gz Binary files differindex ef1a1e783..64509f73b 100644 --- a/prnt/ps/hp-designjet_Z6_24in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_Z6_24in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_Z6_44in-ps.ppd.gz b/prnt/ps/hp-designjet_Z6_44in-ps.ppd.gz Binary files differindex edc45ad30..f5aa9d69b 100644 --- a/prnt/ps/hp-designjet_Z6_44in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_Z6_44in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_Z6dr_44in-ps.ppd.gz b/prnt/ps/hp-designjet_Z6dr_44in-ps.ppd.gz Binary files differindex 0a3001561..8d848e5fc 100644 --- a/prnt/ps/hp-designjet_Z6dr_44in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_Z6dr_44in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_Z9_24in-ps.ppd.gz b/prnt/ps/hp-designjet_Z9_24in-ps.ppd.gz Binary files differindex f06f68e10..d800d553c 100644 --- a/prnt/ps/hp-designjet_Z9_24in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_Z9_24in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_Z9_44in-ps.ppd.gz b/prnt/ps/hp-designjet_Z9_44in-ps.ppd.gz Binary files differindex 183fc4678..6e7824977 100644 --- a/prnt/ps/hp-designjet_Z9_44in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_Z9_44in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_Z9dr_44in-ps.ppd.gz b/prnt/ps/hp-designjet_Z9dr_44in-ps.ppd.gz Binary files differindex df6f80d39..419e556bb 100644 --- a/prnt/ps/hp-designjet_Z9dr_44in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_Z9dr_44in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_d5800-ps.ppd.gz b/prnt/ps/hp-designjet_d5800-ps.ppd.gz Binary files differindex 620d1f2c0..b3f178209 100644 --- a/prnt/ps/hp-designjet_d5800-ps.ppd.gz +++ b/prnt/ps/hp-designjet_d5800-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1100ps_24in-ps.ppd.gz b/prnt/ps/hp-designjet_t1100ps_24in-ps.ppd.gz Binary files differindex c233fde7d..d1e3789fa 100644 --- a/prnt/ps/hp-designjet_t1100ps_24in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1100ps_24in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz b/prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz Binary files differindex a97f473fb..b44856551 100644 --- a/prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz b/prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz Binary files differindex b783fbfd6..9194688f3 100644 --- a/prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz b/prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz Binary files differindex 61bdbcc9f..85287eab9 100644 --- a/prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz Binary files differindex ed68a602d..f7b5e7554 100644 --- a/prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1300_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t1300_postscript-ps.ppd.gz Binary files differindex 5a50b3f45..c9bb7901b 100644 --- a/prnt/ps/hp-designjet_t1300_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1300_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1500-postscript.ppd.gz b/prnt/ps/hp-designjet_t1500-postscript.ppd.gz Binary files differindex 575c992f7..7bc0d37ca 100644 --- a/prnt/ps/hp-designjet_t1500-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_t1500-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_t1530-postscript.ppd.gz b/prnt/ps/hp-designjet_t1530-postscript.ppd.gz Binary files differindex d4bf00dd8..c14957aed 100644 --- a/prnt/ps/hp-designjet_t1530-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_t1530-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_t1600_printer-ps.ppd.gz b/prnt/ps/hp-designjet_t1600_printer-ps.ppd.gz Binary files differindex ac19275fd..b5df98b2b 100644 --- a/prnt/ps/hp-designjet_t1600_printer-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1600_printer-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1600dr-ps.ppd.gz b/prnt/ps/hp-designjet_t1600dr-ps.ppd.gz Binary files differindex e944bf821..2f0c07bdd 100644 --- a/prnt/ps/hp-designjet_t1600dr-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1600dr-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1700_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t1700_postscript-ps.ppd.gz Binary files differindex d18ed0435..b53dd4f00 100644 --- a/prnt/ps/hp-designjet_t1700_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1700_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1700dr_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t1700dr_postscript-ps.ppd.gz Binary files differindex 7e54120c9..7813f8d9e 100644 --- a/prnt/ps/hp-designjet_t1700dr_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1700dr_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1708_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t1708_postscript-ps.ppd.gz Binary files differindex b279805e8..261495e62 100644 --- a/prnt/ps/hp-designjet_t1708_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1708_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1708dr_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t1708dr_postscript-ps.ppd.gz Binary files differindex e653ac404..674666929 100644 --- a/prnt/ps/hp-designjet_t1708dr_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1708dr_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t2300_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t2300_postscript-ps.ppd.gz Binary files differindex 8b9fd3889..7fbb3c911 100644 --- a/prnt/ps/hp-designjet_t2300_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t2300_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t2500-postscript.ppd.gz b/prnt/ps/hp-designjet_t2500-postscript.ppd.gz Binary files differindex 29b01ebb2..c0080c54e 100644 --- a/prnt/ps/hp-designjet_t2500-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_t2500-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_t2530-postscript.ppd.gz b/prnt/ps/hp-designjet_t2530-postscript.ppd.gz Binary files differindex 376cb2ede..5d9cf5b6a 100644 --- a/prnt/ps/hp-designjet_t2530-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_t2530-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_t2600-ps.ppd.gz b/prnt/ps/hp-designjet_t2600-ps.ppd.gz Binary files differindex 38e1db1dc..60ad06e3c 100644 --- a/prnt/ps/hp-designjet_t2600-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t2600-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t2600dr-ps.ppd.gz b/prnt/ps/hp-designjet_t2600dr-ps.ppd.gz Binary files differindex 0c5985503..a8a50e5d6 100644 --- a/prnt/ps/hp-designjet_t2600dr-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t2600dr-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t3500-ps.ppd.gz b/prnt/ps/hp-designjet_t3500-ps.ppd.gz Binary files differindex 4174ceaab..42bcf4578 100644 --- a/prnt/ps/hp-designjet_t3500-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t3500-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t7100ps-ps.ppd.gz b/prnt/ps/hp-designjet_t7100ps-ps.ppd.gz Binary files differindex 864e08e2b..5c423d5fc 100644 --- a/prnt/ps/hp-designjet_t7100ps-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t7100ps-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t7100ps_monochrome-ps.ppd.gz b/prnt/ps/hp-designjet_t7100ps_monochrome-ps.ppd.gz Binary files differindex 140ca97d1..46c1e3a6f 100644 --- a/prnt/ps/hp-designjet_t7100ps_monochrome-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t7100ps_monochrome-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t7200-ps.ppd.gz b/prnt/ps/hp-designjet_t7200-ps.ppd.gz Binary files differindex 10a6f2215..79b862feb 100644 --- a/prnt/ps/hp-designjet_t7200-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t7200-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t770_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t770_postscript-ps.ppd.gz Binary files differindex 135ed9778..5438595b0 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 309e2c01d..eb0cd3a7c 100644 --- a/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t790ps_24in-ps.ppd.gz b/prnt/ps/hp-designjet_t790ps_24in-ps.ppd.gz Binary files differindex a6cdc347a..2cdd9585d 100644 --- a/prnt/ps/hp-designjet_t790ps_24in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t790ps_24in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t790ps_44in-ps.ppd.gz b/prnt/ps/hp-designjet_t790ps_44in-ps.ppd.gz Binary files differindex f7f6fbf34..dd6813f4a 100644 --- a/prnt/ps/hp-designjet_t790ps_44in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t790ps_44in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t795ps_44in-ps.ppd.gz b/prnt/ps/hp-designjet_t795ps_44in-ps.ppd.gz Binary files differindex f77e9722d..ed34d0107 100644 --- a/prnt/ps/hp-designjet_t795ps_44in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t795ps_44in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t920-postscript.ppd.gz b/prnt/ps/hp-designjet_t920-postscript.ppd.gz Binary files differindex cd4fc9cf7..f34124497 100644 --- a/prnt/ps/hp-designjet_t920-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_t920-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_t930-postscript.ppd.gz b/prnt/ps/hp-designjet_t930-postscript.ppd.gz Binary files differindex cc6ecef75..0302749bb 100644 --- a/prnt/ps/hp-designjet_t930-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_t930-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_z2600_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_z2600_postscript-ps.ppd.gz Binary files differindex 03ba3e9c9..b7286eba6 100644 --- a/prnt/ps/hp-designjet_z2600_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z2600_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz Binary files differindex 3d28651c6..e8b9bd209 100644 --- a/prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z5400-postscript.ppd.gz b/prnt/ps/hp-designjet_z5400-postscript.ppd.gz Binary files differindex b080151f9..a13b40db3 100644 --- a/prnt/ps/hp-designjet_z5400-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_z5400-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_z5600_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_z5600_postscript-ps.ppd.gz Binary files differindex a3229fc2b..0ee193a10 100644 --- a/prnt/ps/hp-designjet_z5600_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z5600_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz b/prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz Binary files differindex 77ef74a56..f593b95aa 100644 --- a/prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz b/prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz Binary files differindex e8aedfdb8..aa80e7a6a 100644 --- a/prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z6200_42in_photo-ps.ppd.gz b/prnt/ps/hp-designjet_z6200_42in_photo-ps.ppd.gz Binary files differindex 86f650b10..8f3118e7f 100644 --- a/prnt/ps/hp-designjet_z6200_42in_photo-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z6200_42in_photo-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z6200_60in_photo-ps.ppd.gz b/prnt/ps/hp-designjet_z6200_60in_photo-ps.ppd.gz Binary files differindex fd1095836..c1ccded03 100644 --- a/prnt/ps/hp-designjet_z6200_60in_photo-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z6200_60in_photo-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z6600-postscript.ppd.gz b/prnt/ps/hp-designjet_z6600-postscript.ppd.gz Binary files differindex 1fa55ec03..08bbecee5 100644 --- a/prnt/ps/hp-designjet_z6600-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_z6600-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_z6610ps_60in-ps.ppd.gz b/prnt/ps/hp-designjet_z6610ps_60in-ps.ppd.gz Binary files differindex d4ecf8521..e1f0515ff 100644 --- a/prnt/ps/hp-designjet_z6610ps_60in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z6610ps_60in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz b/prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz Binary files differindex 2032a837d..6702eeda4 100644 --- a/prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz b/prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz Binary files differindex f08c8b75b..84b4a2c78 100644 --- a/prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z6810ps_60in-ps.ppd.gz b/prnt/ps/hp-designjet_z6810ps_60in-ps.ppd.gz Binary files differindex f3f9eb802..b1b5a11eb 100644 --- a/prnt/ps/hp-designjet_z6810ps_60in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z6810ps_60in-ps.ppd.gz diff --git a/prnt/ps/hp-laserJet_m610_m611_m612-ps.ppd.gz b/prnt/ps/hp-laserJet_m610_m611_m612-ps.ppd.gz Binary files differindex 0622e99a7..efbb128da 100644 --- a/prnt/ps/hp-laserJet_m610_m611_m612-ps.ppd.gz +++ b/prnt/ps/hp-laserJet_m610_m611_m612-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz b/prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz Binary files differindex bb296cbb4..bbcc887f2 100644 --- a/prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1200-ps.ppd.gz b/prnt/ps/hp-laserjet_1200-ps.ppd.gz Binary files differindex 4e76468d3..8befc56cb 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 3589d8f07..5ae8adcc5 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 bd4a14bd8..a6dcad5f5 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 92c8a3462..2087a4bf5 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 1dbfdb9b5..6ac8905cc 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 c6e5bf0a5..a8eedabd8 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 161cd001c..4b556fc92 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 ebace88e7..c97edacd1 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 2babf48eb..5e908e460 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 df3118e51..b9f69ff90 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 b45719d01..3b6ae4bef 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 09f986128..56bfeaa24 100644 --- a/prnt/ps/hp-laserjet_1320tn-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1320tn-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_200_color_m251-ps.ppd.gz b/prnt/ps/hp-laserjet_200_color_m251-ps.ppd.gz Binary files differindex 4c8fd4c45..2ba1175e8 100644 --- a/prnt/ps/hp-laserjet_200_color_m251-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_200_color_m251-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz b/prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz Binary files differindex cf39244d9..519b25407 100644 --- a/prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz b/prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz Binary files differindex 3407cf0bb..aef8784da 100644 --- a/prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_2100-ps.ppd.gz b/prnt/ps/hp-laserjet_2100-ps.ppd.gz Binary files differindex 51a8157b7..95180c0e9 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 8ede0fc5f..ac0970281 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 fd625b3f5..f29732663 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 8c972e43a..91aedaf6a 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 64cdb330a..b99c1bc93 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 4378abff0..b69d20597 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 455e60222..3bad96a9a 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 bcf19bb98..ce01dc882 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 ed98ed000..f2762d484 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 fae446f95..6787aa78e 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 2423bf808..c1702a6b6 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 1f626ba3e..30be51d0f 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 749f6a371..4784300e5 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 2c8fcd2ee..1cde04260 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 e858835f5..347957712 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 406612811..d158d8af0 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 3daa7abe7..d2d122e6e 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 da69eb22d..752bc5391 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 14b7947e8..97d695139 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 2a26b5566..3fe0e7888 100644 --- a/prnt/ps/hp-laserjet_4000_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4000_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_400_m401-ps.ppd.gz b/prnt/ps/hp-laserjet_400_m401-ps.ppd.gz Binary files differindex 467f62720..2e82a7666 100644 --- a/prnt/ps/hp-laserjet_400_m401-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_400_m401-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_400_m401dne-ps.ppd.gz b/prnt/ps/hp-laserjet_400_m401dne-ps.ppd.gz Binary files differindex e5042433a..1abce3ed3 100644 --- a/prnt/ps/hp-laserjet_400_m401dne-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_400_m401dne-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_400_mfp_m425-ps.ppd.gz b/prnt/ps/hp-laserjet_400_mfp_m425-ps.ppd.gz Binary files differindex ba55236f7..bde620bdb 100644 --- a/prnt/ps/hp-laserjet_400_mfp_m425-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_400_mfp_m425-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4050_series-ps.ppd.gz b/prnt/ps/hp-laserjet_4050_series-ps.ppd.gz Binary files differindex 6debca385..e983e2544 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 5bdeb7127..ff87851c0 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 8746675f2..54374688f 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 ef1258b8b..77d8b974e 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 317161bea..6ede8c39f 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 f40498778..8f7a51fd6 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 802d3e56d..e35059739 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 350eb7fc7..6dac9f4b4 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 682581bb4..cabc1e276 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 bd96679d8..eec6ae6ca 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 6128270fc..e1ed45115 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 68a932dbe..badb138c5 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 f11124c69..9abf44b04 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 75a2c7458..7c20880df 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 6b92e3e01..d322b29ab 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 28cd7bf9f..7ba529340 100644 --- a/prnt/ps/hp-laserjet_5000_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5000_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_500_color_m551-ps.ppd.gz b/prnt/ps/hp-laserjet_500_color_m551-ps.ppd.gz Binary files differindex 0161ca818..bca19a845 100644 --- a/prnt/ps/hp-laserjet_500_color_m551-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_500_color_m551-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_500_color_mfp_m570-ps.ppd.gz b/prnt/ps/hp-laserjet_500_color_mfp_m570-ps.ppd.gz Binary files differindex 34a039348..9bbf334ef 100644 --- a/prnt/ps/hp-laserjet_500_color_mfp_m570-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_500_color_mfp_m570-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz b/prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz Binary files differindex 59570942f..3a7a616c5 100644 --- a/prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz b/prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz Binary files differindex 92c77803d..3f3dc546e 100644 --- a/prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5100_series-ps.ppd.gz b/prnt/ps/hp-laserjet_5100_series-ps.ppd.gz Binary files differindex 92f387696..999eb6c7f 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 2bfdac17c..c188738e6 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 8aa1ba770..75739e488 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 95da7e75a..da47fcb30 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 fda474690..9d1e3168d 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 5426305c0..8105a8115 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 55af3a616..2f6fd77f5 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 ed1bba65f..ebcb12e60 100644 --- a/prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz b/prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz Binary files differindex 4d1d2a5a9..a3e6d3598 100644 --- a/prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_6mp-ps.ppd.gz b/prnt/ps/hp-laserjet_6mp-ps.ppd.gz Binary files differindex b5e8d3efc..00b529b75 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 4671bdd2c..685b22c3f 100644 --- a/prnt/ps/hp-laserjet_6p-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_6p-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_700_color_mfp_m775-ps.ppd.gz b/prnt/ps/hp-laserjet_700_color_mfp_m775-ps.ppd.gz Binary files differindex c4532589a..3f50de27e 100644 --- a/prnt/ps/hp-laserjet_700_color_mfp_m775-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_700_color_mfp_m775-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_700_m712-ps.ppd.gz b/prnt/ps/hp-laserjet_700_m712-ps.ppd.gz Binary files differindex 8e72d1d80..8358b6bac 100644 --- a/prnt/ps/hp-laserjet_700_m712-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_700_m712-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_8000-ps.ppd.gz b/prnt/ps/hp-laserjet_8000-ps.ppd.gz Binary files differindex 90ef89ba2..e9b12e656 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 9ac24e29e..955ededc7 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 9ba51084b..14a4a6be6 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 fc8ca24cd..ee73490b0 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 6c178bc5e..3ffb2c01b 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 1cafd19fc..e93571407 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 e7cae18b7..08e176e8b 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 d699ed818..fb95520e9 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 1b23d7a38..124f62075 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 f1bfdc259..f18fceb7b 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 2cdfed1a7..6e3969011 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 3f2839e94..7e3c7676e 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 e6473c5c3..e0808dfc6 100644 --- a/prnt/ps/hp-laserjet_9065mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_9065mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz b/prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz Binary files differindex 4f4c72a8d..961cad6bc 100644 --- a/prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz b/prnt/ps/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz Binary files differindex 32e6a7da4..527ca09e0 100644 --- a/prnt/ps/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz b/prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz Binary files differindex 80b49e6c9..2aeddba26 100644 --- a/prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_e50145-ps.ppd.gz b/prnt/ps/hp-laserjet_e50145-ps.ppd.gz Binary files differindex 7ae463105..0289b1986 100644 --- a/prnt/ps/hp-laserjet_e50145-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_e50145-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_e60055-e60075-ps.ppd.gz b/prnt/ps/hp-laserjet_e60055-e60075-ps.ppd.gz Binary files differindex 0e78213d7..350f839fe 100644 --- a/prnt/ps/hp-laserjet_e60055-e60075-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_e60055-e60075-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_e60155-ps.ppd.gz b/prnt/ps/hp-laserjet_e60155-ps.ppd.gz Binary files differindex 08aa1a2ea..ecb416c3f 100644 --- a/prnt/ps/hp-laserjet_e60155-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_e60155-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_e60165-ps.ppd.gz b/prnt/ps/hp-laserjet_e60165-ps.ppd.gz Binary files differindex 0620b0850..8e4d40639 100644 --- a/prnt/ps/hp-laserjet_e60165-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_e60165-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_e60175-ps.ppd.gz b/prnt/ps/hp-laserjet_e60175-ps.ppd.gz Binary files differindex 767e76261..4ef686048 100644 --- a/prnt/ps/hp-laserjet_e60175-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_e60175-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_e62555-e62575-ps.ppd.gz b/prnt/ps/hp-laserjet_e62555-e62575-ps.ppd.gz Binary files differindex 5e68d8570..76d200af2 100644 --- a/prnt/ps/hp-laserjet_e62555-e62575-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_e62555-e62575-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_e62655-e62675-ps.ppd.gz b/prnt/ps/hp-laserjet_e62655-e62675-ps.ppd.gz Binary files differindex 88aaaad76..455f0de16 100644 --- a/prnt/ps/hp-laserjet_e62655-e62675-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_e62655-e62675-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_flow_mfp_e52645-ps.ppd.gz b/prnt/ps/hp-laserjet_flow_mfp_e52645-ps.ppd.gz Binary files differindex 37ea9ad2a..47f024aaf 100644 --- a/prnt/ps/hp-laserjet_flow_mfp_e52645-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_flow_mfp_e52645-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_flow_mfp_m525-ps.ppd.gz b/prnt/ps/hp-laserjet_flow_mfp_m525-ps.ppd.gz Binary files differindex 5ba0890ae..5edbe8247 100644 --- a/prnt/ps/hp-laserjet_flow_mfp_m525-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_flow_mfp_m525-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_flow_mfp_m528-ps.ppd.gz b/prnt/ps/hp-laserjet_flow_mfp_m528-ps.ppd.gz Binary files differindex 89e8a2fca..2b52e8829 100644 --- a/prnt/ps/hp-laserjet_flow_mfp_m528-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_flow_mfp_m528-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz b/prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz Binary files differindex 2d0f484bf..3c611d014 100644 --- a/prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz b/prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz Binary files differindex f95ff4c7d..e26015156 100644 --- a/prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m1522_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m1522_mfp-ps.ppd.gz Binary files differindex 5885f8619..31f12aed0 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 675e77f1a..98488efcb 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 0dcac1d9c..e14750348 100644 --- a/prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz b/prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz Binary files differindex 31edb37b5..3dcfa4c11 100644 --- a/prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m2727_mfp_series-ps.ppd.gz b/prnt/ps/hp-laserjet_m2727_mfp_series-ps.ppd.gz Binary files differindex 5cbfbc503..ef9d998b1 100644 --- a/prnt/ps/hp-laserjet_m2727_mfp_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m2727_mfp_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz Binary files differindex 12d4203dc..feac96e71 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 79a8a41fc..7b89d9481 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 404e1350c..1916c8ae8 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 7a229122a..db9320535 100644 --- a/prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz Binary files differindex 28488e72c..d6268a05f 100644 --- a/prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m5025_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m5025_mfp-ps.ppd.gz Binary files differindex 6670f8210..ae12359a8 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 74c533303..581d24a0a 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_m506-ps.ppd.gz b/prnt/ps/hp-laserjet_m506-ps.ppd.gz Binary files differindex 786641e4d..a89bd4cb4 100644 --- a/prnt/ps/hp-laserjet_m506-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m506-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m507-ps.ppd.gz b/prnt/ps/hp-laserjet_m507-ps.ppd.gz Binary files differindex 9fdda429b..85d1cc3a4 100644 --- a/prnt/ps/hp-laserjet_m507-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m507-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m604_m605_m606-ps.ppd.gz b/prnt/ps/hp-laserjet_m604_m605_m606-ps.ppd.gz Binary files differindex 743980a3d..a4aecfbd2 100644 --- a/prnt/ps/hp-laserjet_m604_m605_m606-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m604_m605_m606-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m607_m608_m609-ps.ppd.gz b/prnt/ps/hp-laserjet_m607_m608_m609-ps.ppd.gz Binary files differindex 879866391..c63d26639 100644 --- a/prnt/ps/hp-laserjet_m607_m608_m609-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m607_m608_m609-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m806-ps.ppd.gz b/prnt/ps/hp-laserjet_m806-ps.ppd.gz Binary files differindex 7ba6856fc..ff98b9ec3 100644 --- a/prnt/ps/hp-laserjet_m806-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m806-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m9040_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m9040_mfp-ps.ppd.gz Binary files differindex efb59b812..17a09e062 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 ec46fad20..cb0069494 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 6e8e0ecb7..46eee7f6a 100644 --- a/prnt/ps/hp-laserjet_m9059_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m9059_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_e72425-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_e72425-ps.ppd.gz Binary files differindex 545d1fc8b..cf583386e 100644 --- a/prnt/ps/hp-laserjet_mfp_e72425-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_e72425-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_e72430-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_e72430-ps.ppd.gz Binary files differindex 49faaa88d..6943dcac0 100644 --- a/prnt/ps/hp-laserjet_mfp_e72430-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_e72430-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz Binary files differindex 96b2249e0..6b9d43a99 100644 --- a/prnt/ps/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_e77822-25-30-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_e77822-25-30-ps.ppd.gz Binary files differindex de04be4ec..59d21e2bd 100644 --- a/prnt/ps/hp-laserjet_mfp_e77822-25-30-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_e77822-25-30-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_e82540-50-60-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_e82540-50-60-ps.ppd.gz Binary files differindex 2c94e2115..5da2f48c0 100644 --- a/prnt/ps/hp-laserjet_mfp_e82540-50-60-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_e82540-50-60-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_e87640-50-60-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_e87640-50-60-ps.ppd.gz Binary files differindex f1f3d03a4..cc4639688 100644 --- a/prnt/ps/hp-laserjet_mfp_e87640-50-60-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_e87640-50-60-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_m426_m427-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m426_m427-ps.ppd.gz Binary files differindex d4862bba4..79494e204 100644 --- a/prnt/ps/hp-laserjet_mfp_m426_m427-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_m426_m427-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz Binary files differindex f97ba2bc8..f3f38afa0 100644 --- a/prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_m527-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m527-ps.ppd.gz Binary files differindex 0ce037434..9b8116a36 100644 --- a/prnt/ps/hp-laserjet_mfp_m527-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_m527-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_m630-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m630-ps.ppd.gz Binary files differindex b60344c23..06f0146c1 100644 --- a/prnt/ps/hp-laserjet_mfp_m630-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_m630-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_m631_m632_m633-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m631_m632_m633-ps.ppd.gz Binary files differindex 264ecfd73..db5c9574b 100644 --- a/prnt/ps/hp-laserjet_mfp_m631_m632_m633-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_m631_m632_m633-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_m634_m635_m636-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m634_m635_m636-ps.ppd.gz Binary files differindex ae1cc6a8f..85e54da1c 100644 --- a/prnt/ps/hp-laserjet_mfp_m634_m635_m636-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_m634_m635_m636-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz Binary files differindex fdaff6fe8..85282d018 100644 --- a/prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz Binary files differindex fcac6b0c3..2749249fc 100644 --- a/prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz Binary files differindex 352b8db5e..1fdeef892 100644 --- a/prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p3004-ps.ppd.gz b/prnt/ps/hp-laserjet_p3004-ps.ppd.gz Binary files differindex 40cb36c86..e8d5d75b7 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 2b6ce40bf..a2da5043f 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 f1bc2c961..d5069a670 100644 --- a/prnt/ps/hp-laserjet_p3010_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p3010_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4010_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p4010_series-ps.ppd.gz Binary files differindex be80460ed..f5d2d0505 100644 --- a/prnt/ps/hp-laserjet_p4010_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4010_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m118-m119-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m118-m119-ps.ppd.gz Binary files differindex 8be69d5fd..c509609b4 100644 --- a/prnt/ps/hp-laserjet_pro_m118-m119-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m118-m119-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m148-m149-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m148-m149-ps.ppd.gz Binary files differindex 8b1c4afce..f9cba513e 100644 --- a/prnt/ps/hp-laserjet_pro_m148-m149-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m148-m149-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m148f-m149f-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m148f-m149f-ps.ppd.gz Binary files differindex b5b8a18b9..76ea2719c 100644 --- a/prnt/ps/hp-laserjet_pro_m148f-m149f-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m148f-m149f-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz Binary files differindex 767e618c0..9dde38168 100644 --- a/prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m203_m206-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m203_m206-ps.ppd.gz Binary files differindex 5806c17cb..696bebaf8 100644 --- a/prnt/ps/hp-laserjet_pro_m203_m206-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m203_m206-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m304-m305-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m304-m305-ps.ppd.gz Binary files differindex 8e3f42f5b..1b6d1c7f0 100644 --- a/prnt/ps/hp-laserjet_pro_m304-m305-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m304-m305-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m402_m403-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m402_m403-ps.ppd.gz Binary files differindex e0987fd65..90d45fad1 100644 --- a/prnt/ps/hp-laserjet_pro_m402_m403-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m402_m403-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m402_m403d-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m402_m403d-ps.ppd.gz Binary files differindex 3e82bd476..9d95088e0 100644 --- a/prnt/ps/hp-laserjet_pro_m402_m403d-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m402_m403d-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m404-m405-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m404-m405-ps.ppd.gz Binary files differindex d5c927dee..37b51d2f6 100644 --- a/prnt/ps/hp-laserjet_pro_m404-m405-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m404-m405-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m428-m429-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m428-m429-ps.ppd.gz Binary files differindex 8246eb830..6b8ec827e 100644 --- a/prnt/ps/hp-laserjet_pro_m428-m429-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m428-m429-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m428f-m429f-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m428f-m429f-ps.ppd.gz Binary files differindex e7717c3ce..bb968f105 100644 --- a/prnt/ps/hp-laserjet_pro_m428f-m429f-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m428f-m429f-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m501dn-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m501dn-ps.ppd.gz Binary files differindex 53bed60cb..a85cb78ed 100644 --- a/prnt/ps/hp-laserjet_pro_m501dn-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m501dn-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m501n-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m501n-ps.ppd.gz Binary files differindex ec0f85923..aa78851df 100644 --- a/prnt/ps/hp-laserjet_pro_m501n-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m501n-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz Binary files differindex 0d0dd88d4..9e0b0bccc 100644 --- a/prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz Binary files differindex dac1582a7..07402ae4a 100644 --- a/prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz Binary files differindex 1c9bc6b87..f52639707 100644 --- a/prnt/ps/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_mfp_m227-m231-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_mfp_m227-m231-ps.ppd.gz Binary files differindex 76f18c600..dbe36cb9f 100644 --- a/prnt/ps/hp-laserjet_pro_mfp_m227-m231-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_mfp_m227-m231-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_mfp_m329-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_mfp_m329-ps.ppd.gz Binary files differindex 2566acfe8..ca01941ec 100644 --- a/prnt/ps/hp-laserjet_pro_mfp_m329-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_mfp_m329-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz Binary files differindex c9e75ef3d..b7062be3a 100644 --- a/prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz diff --git a/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz b/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz Binary files differindex 50fcefc52..6f5a40c69 100644 --- a/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz +++ b/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz diff --git a/prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz b/prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz Binary files differindex 1bb3c22a1..7321e8978 100644 --- a/prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz +++ b/prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz diff --git a/prnt/ps/hp-mopier_240-ps.ppd.gz b/prnt/ps/hp-mopier_240-ps.ppd.gz Binary files differindex b1a7d320d..6e35d7ead 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 f542596b3..e719c7f68 100644 --- a/prnt/ps/hp-mopier_320-ps.ppd.gz +++ b/prnt/ps/hp-mopier_320-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_color_mfp_x585.ppd.gz b/prnt/ps/hp-officejet_color_mfp_x585.ppd.gz Binary files differindex 4fd96a5b0..c08f80563 100644 --- a/prnt/ps/hp-officejet_color_mfp_x585.ppd.gz +++ b/prnt/ps/hp-officejet_color_mfp_x585.ppd.gz diff --git a/prnt/ps/hp-officejet_color_x555-ps.ppd.gz b/prnt/ps/hp-officejet_color_x555-ps.ppd.gz Binary files differindex 874e1280a..e8dfe3ee7 100644 --- a/prnt/ps/hp-officejet_color_x555-ps.ppd.gz +++ b/prnt/ps/hp-officejet_color_x555-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz b/prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz Binary files differindex 5ca098fd7..ff574993d 100644 --- a/prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz b/prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz Binary files differindex 34c6e04df..f109a3986 100644 --- a/prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz b/prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz Binary files differindex dc4239530..acee045c8 100644 --- a/prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz b/prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz Binary files differindex 8bad8e95b..6cb54130e 100644 --- a/prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_551_series-ps.ppd.gz b/prnt/ps/hp-officejet_pro_551_series-ps.ppd.gz Binary files differindex 38faf963e..30464a43e 100644 --- a/prnt/ps/hp-officejet_pro_551_series-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_551_series-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz b/prnt/ps/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz Binary files differindex 691160d79..72d383a02 100644 --- a/prnt/ps/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_8210-ps.ppd.gz b/prnt/ps/hp-officejet_pro_8210-ps.ppd.gz Binary files differindex 9b52ec148..afd8e8ea6 100644 --- a/prnt/ps/hp-officejet_pro_8210-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_8210-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_8730-ps.ppd.gz b/prnt/ps/hp-officejet_pro_8730-ps.ppd.gz Binary files differindex 181b9342b..9b84e0f3e 100644 --- a/prnt/ps/hp-officejet_pro_8730-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_8730-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_8732-ps.ppd.gz b/prnt/ps/hp-officejet_pro_8732-ps.ppd.gz Binary files differindex e2d39df7e..408d37978 100644 --- a/prnt/ps/hp-officejet_pro_8732-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_8732-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_8740-ps.ppd.gz b/prnt/ps/hp-officejet_pro_8740-ps.ppd.gz Binary files differindex b280add00..d785bb784 100644 --- a/prnt/ps/hp-officejet_pro_8740-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_8740-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_352_printer-ps.ppd.gz b/prnt/ps/hp-pagewide_352_printer-ps.ppd.gz Binary files differindex ad292014c..55d3f087c 100644 --- a/prnt/ps/hp-pagewide_352_printer-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_352_printer-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_377_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_377_mfp-ps.ppd.gz Binary files differindex 4e138f400..c7f0e349a 100644 --- a/prnt/ps/hp-pagewide_377_mfp-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_377_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_P77440_P77940-60-ps.ppd.gz b/prnt/ps/hp-pagewide_P77440_P77940-60-ps.ppd.gz Binary files differindex e5750303f..8a6a0da94 100644 --- a/prnt/ps/hp-pagewide_P77440_P77940-60-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_P77440_P77940-60-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_556-ps.ppd.gz b/prnt/ps/hp-pagewide_color_556-ps.ppd.gz Binary files differindex 3032f9227..4730818ca 100644 --- a/prnt/ps/hp-pagewide_color_556-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_556-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_755-ps.ppd.gz b/prnt/ps/hp-pagewide_color_755-ps.ppd.gz Binary files differindex 13bcbce7a..4b3ccd22d 100644 --- a/prnt/ps/hp-pagewide_color_755-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_755-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_765-ps.ppd.gz b/prnt/ps/hp-pagewide_color_765-ps.ppd.gz Binary files differindex 98490ed72..fcd16650c 100644 --- a/prnt/ps/hp-pagewide_color_765-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_765-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_P75250-ps.ppd.gz b/prnt/ps/hp-pagewide_color_P75250-ps.ppd.gz Binary files differindex 17928bc1c..375453ac1 100644 --- a/prnt/ps/hp-pagewide_color_P75250-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_P75250-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_e55650-ps.ppd.gz b/prnt/ps/hp-pagewide_color_e55650-ps.ppd.gz Binary files differindex 06ccaa2a0..c5d2a8799 100644 --- a/prnt/ps/hp-pagewide_color_e55650-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_e55650-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_e75160-ps.ppd.gz b/prnt/ps/hp-pagewide_color_e75160-ps.ppd.gz Binary files differindex fa61e59d1..573ffa42f 100644 --- a/prnt/ps/hp-pagewide_color_e75160-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_e75160-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_e77650-e77660-ps.ppd.gz b/prnt/ps/hp-pagewide_color_e77650-e77660-ps.ppd.gz Binary files differindex 245116aa3..9a68d7f64 100644 --- a/prnt/ps/hp-pagewide_color_e77650-e77660-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_e77650-e77660-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_flow_mfp_586-ps.ppd.gz b/prnt/ps/hp-pagewide_color_flow_mfp_586-ps.ppd.gz Binary files differindex ee3a636d0..085256577 100644 --- a/prnt/ps/hp-pagewide_color_flow_mfp_586-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_flow_mfp_586-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_mfp_586-ps.ppd.gz b/prnt/ps/hp-pagewide_color_mfp_586-ps.ppd.gz Binary files differindex b5c52424d..5f1b462bf 100644 --- a/prnt/ps/hp-pagewide_color_mfp_586-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_mfp_586-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_mfp_774-779-ps.ppd.gz b/prnt/ps/hp-pagewide_color_mfp_774-779-ps.ppd.gz Binary files differindex a60e2a152..0195cf924 100644 --- a/prnt/ps/hp-pagewide_color_mfp_774-779-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_mfp_774-779-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_mfp_780-785-ps.ppd.gz b/prnt/ps/hp-pagewide_color_mfp_780-785-ps.ppd.gz Binary files differindex 8f72dc89d..6234a49c4 100644 --- a/prnt/ps/hp-pagewide_color_mfp_780-785-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_mfp_780-785-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_mfp_e58650-ps.ppd.gz b/prnt/ps/hp-pagewide_color_mfp_e58650-ps.ppd.gz Binary files differindex 5d8ac429e..22f9bcd04 100644 --- a/prnt/ps/hp-pagewide_color_mfp_e58650-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_mfp_e58650-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_mfp_p57750-ps.ppd.gz b/prnt/ps/hp-pagewide_mfp_p57750-ps.ppd.gz Binary files differindex b22a950f0..9bf4a6e02 100644 --- a/prnt/ps/hp-pagewide_mfp_p57750-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_mfp_p57750-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_mfp_p77740-60zs-ps.ppd.gz b/prnt/ps/hp-pagewide_mfp_p77740-60zs-ps.ppd.gz Binary files differindex 56d6c7c95..e4e6277b5 100644 --- a/prnt/ps/hp-pagewide_mfp_p77740-60zs-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_mfp_p77740-60zs-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_p55250-ps.ppd.gz b/prnt/ps/hp-pagewide_p55250-ps.ppd.gz Binary files differindex 42d1cebf5..d6e7603b0 100644 --- a/prnt/ps/hp-pagewide_p55250-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_p55250-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_p75050-60-ps.ppd.gz b/prnt/ps/hp-pagewide_p75050-60-ps.ppd.gz Binary files differindex 63dc4a41b..6f46caeda 100644 --- a/prnt/ps/hp-pagewide_p75050-60-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_p75050-60-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_pro_452_printer-ps.ppd.gz b/prnt/ps/hp-pagewide_pro_452_printer-ps.ppd.gz Binary files differindex fcc3973ac..fcdaffcdb 100644 --- a/prnt/ps/hp-pagewide_pro_452_printer-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_pro_452_printer-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_pro_477_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_pro_477_mfp-ps.ppd.gz Binary files differindex 101e0ba2a..398bcc636 100644 --- a/prnt/ps/hp-pagewide_pro_477_mfp-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_pro_477_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_pro_552_printer-ps.ppd.gz b/prnt/ps/hp-pagewide_pro_552_printer-ps.ppd.gz Binary files differindex 94eac32f9..afa22d015 100644 --- a/prnt/ps/hp-pagewide_pro_552_printer-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_pro_552_printer-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_pro_577_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_pro_577_mfp-ps.ppd.gz Binary files differindex 698584d48..7dc00451e 100644 --- a/prnt/ps/hp-pagewide_pro_577_mfp-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_pro_577_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_pro_750-ps.ppd.gz b/prnt/ps/hp-pagewide_pro_750-ps.ppd.gz Binary files differindex bafc79db8..6e072eeeb 100644 --- a/prnt/ps/hp-pagewide_pro_750-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_pro_750-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_pro_mfp_772-777-ps.ppd.gz b/prnt/ps/hp-pagewide_pro_mfp_772-777-ps.ppd.gz Binary files differindex 8d08476ac..701246cc5 100644 --- a/prnt/ps/hp-pagewide_pro_mfp_772-777-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_pro_mfp_772-777-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_3900ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_3900ps_mfp-ps.ppd.gz Binary files differindex f9445a594..821357282 100644 --- a/prnt/ps/hp-pagewide_xl_3900ps_mfp-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_3900ps_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_4000ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4000ps-ps.ppd.gz Binary files differindex 2d58c2c74..b1d31a938 100644 --- a/prnt/ps/hp-pagewide_xl_4000ps-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_4000ps-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_4000ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4000ps_mfp-ps.ppd.gz Binary files differindex 1bf5ca508..98091f2dc 100644 --- a/prnt/ps/hp-pagewide_xl_4000ps_mfp-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_4000ps_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_4100ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4100ps-ps.ppd.gz Binary files differindex 9205da09e..b39a0113c 100644 --- a/prnt/ps/hp-pagewide_xl_4100ps-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_4100ps-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_4100ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4100ps_mfp-ps.ppd.gz Binary files differindex cecd84ae5..be8a8ca17 100644 --- a/prnt/ps/hp-pagewide_xl_4100ps_mfp-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_4100ps_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_4500ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4500ps-ps.ppd.gz Binary files differindex 9b67c8632..364f65504 100644 --- a/prnt/ps/hp-pagewide_xl_4500ps-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_4500ps-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz Binary files differindex 2055b7ac7..314c726a3 100644 --- a/prnt/ps/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_4600ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4600ps-ps.ppd.gz Binary files differindex 52361f87d..a476bfa97 100644 --- a/prnt/ps/hp-pagewide_xl_4600ps-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_4600ps-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_4600ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4600ps_mfp-ps.ppd.gz Binary files differindex ff00941ce..d47d62283 100644 --- a/prnt/ps/hp-pagewide_xl_4600ps_mfp-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_4600ps_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_5000ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_5000ps-ps.ppd.gz Binary files differindex 4e4a00720..fac51df79 100644 --- a/prnt/ps/hp-pagewide_xl_5000ps-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_5000ps-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_5000ps_blueprinter-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_5000ps_blueprinter-ps.ppd.gz Binary files differindex bb3a31c59..67aad15ff 100644 --- a/prnt/ps/hp-pagewide_xl_5000ps_blueprinter-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_5000ps_blueprinter-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz Binary files differindex d6132da80..b65aa8c73 100644 --- a/prnt/ps/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_5100ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_5100ps-ps.ppd.gz Binary files differindex 9c8e3aef8..07f3aca2e 100644 --- a/prnt/ps/hp-pagewide_xl_5100ps-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_5100ps-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_5100ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_5100ps_mfp-ps.ppd.gz Binary files differindex efaa57ad3..feeed5ae2 100644 --- a/prnt/ps/hp-pagewide_xl_5100ps_mfp-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_5100ps_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_5100ps_mfp_blueprinter-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_5100ps_mfp_blueprinter-ps.ppd.gz Binary files differindex aed1fe1a6..e91324186 100644 --- a/prnt/ps/hp-pagewide_xl_5100ps_mfp_blueprinter-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_5100ps_mfp_blueprinter-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_6000ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_6000ps-ps.ppd.gz Binary files differindex a3973c41d..5141fc239 100644 --- a/prnt/ps/hp-pagewide_xl_6000ps-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_6000ps-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_6000ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_6000ps_mfp-ps.ppd.gz Binary files differindex ddb56d36c..daacc7691 100644 --- a/prnt/ps/hp-pagewide_xl_6000ps_mfp-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_6000ps_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_8000ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_8000ps-ps.ppd.gz Binary files differindex fed1ada59..e2d8d3477 100644 --- a/prnt/ps/hp-pagewide_xl_8000ps-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_8000ps-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_8000ps_blueprinter-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_8000ps_blueprinter-ps.ppd.gz Binary files differindex 5c2276c12..700142064 100644 --- a/prnt/ps/hp-pagewide_xl_8000ps_blueprinter-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_8000ps_blueprinter-ps.ppd.gz diff --git a/prnt/ps/hp-postscript-inkjet.ppd.gz b/prnt/ps/hp-postscript-inkjet.ppd.gz Binary files differindex 0345c503a..f543763bd 100644 --- a/prnt/ps/hp-postscript-inkjet.ppd.gz +++ b/prnt/ps/hp-postscript-inkjet.ppd.gz diff --git a/prnt/ps/hp-postscript-laserjet-pro.ppd.gz b/prnt/ps/hp-postscript-laserjet-pro.ppd.gz Binary files differindex 5aa4f03f0..3c27fb769 100644 --- a/prnt/ps/hp-postscript-laserjet-pro.ppd.gz +++ b/prnt/ps/hp-postscript-laserjet-pro.ppd.gz diff --git a/prnt/ps/hp-postscript-laserjet.ppd.gz b/prnt/ps/hp-postscript-laserjet.ppd.gz Binary files differindex 8b1f2774b..baed49b36 100644 --- a/prnt/ps/hp-postscript-laserjet.ppd.gz +++ b/prnt/ps/hp-postscript-laserjet.ppd.gz diff --git a/protocol/discovery/avahiDiscovery.c b/protocol/discovery/avahiDiscovery.c new file mode 100644 index 000000000..8d325ffc0 --- /dev/null +++ b/protocol/discovery/avahiDiscovery.c @@ -0,0 +1,521 @@ +/* + * This file is derived from avahi_client_browse.c, part of avahi. + * + * avahi is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of the + * License, or (at your option) any later version. + * + * avahi is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General + * Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with avahi; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA. + */ + +#include "avahiDiscovery.h" +#include <errno.h> +#include <dbus/dbus.h> + +DBusConnection *conn; + +char* aUriBuf=NULL; +char ipAddressBuff[MAX_IP_ADDR_LEN]={'\0'}; +static int aBytesRead = 0; +static AvahiSimplePoll *aSimplePoll = NULL; +static int aMemAllocated = 0; + +/* +This function will fill the dictionary arguments for the dbus function call +*/ +static void addDictWithStringValue(DBusMessageIter *iter, + const char *key, const char *str) +{ + DBusMessageIter dict, entry, value; + + dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, + DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING + DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING + DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict); + dbus_message_iter_open_container(&dict, DBUS_TYPE_DICT_ENTRY, + NULL, &entry); + + dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key); + + dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, + DBUS_TYPE_STRING_AS_STRING, &value); + dbus_message_iter_append_basic(&value, DBUS_TYPE_STRING, &str); + dbus_message_iter_close_container(&entry, &value); + + dbus_message_iter_close_container(&dict, &entry); + dbus_message_iter_close_container(iter, &dict); +} +/* +This function will form the empty dictionary for the dbus function call +*/ +static void addEmptyStringDict(DBusMessageIter *iter) +{ + DBusMessageIter dict; + + dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, + DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING + DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_STRING_AS_STRING + DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict); + + dbus_message_iter_close_container(iter, &dict); +} +/* +This function will fill the arguments for the dbus function call +*/ +static void addArgumentsForAuthentication(DBusConnection *conn, DBusMessageIter *iter) +{ + const char *busname = dbus_bus_get_unique_name(conn); + const char *kind = SYSTEM_BUS_NAME; + const char *action = ACTION_ID; + + const char *cancel = ""; + dbus_uint32_t flags = 1; + DBusMessageIter subject; + + dbus_message_iter_open_container(iter, DBUS_TYPE_STRUCT, + NULL, &subject); + dbus_message_iter_append_basic(&subject, DBUS_TYPE_STRING, &kind); + addDictWithStringValue(&subject, "name", busname); + dbus_message_iter_close_container(iter, &subject); + + dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &action); + addEmptyStringDict(iter); + dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &flags); + dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &cancel); +} +/* +This function will start the avahi service if the process authorized by polkit +*/ +static bool systemdStartAvahiService() +{ + DBusMessage *msg, *response; + DBusError err; + + dbus_error_init(&err); + + const char *aAvahiUnitName = AVAHI_SERVICE_NAME; + const char *aAvahiUnitMode = AVHHI_SERVICE_MODE_REPLACE; + + msg = dbus_message_new_method_call(SYSTEMD_DBUS_NAME, SYSTEMD_DBUS_PATH, SYSTEMD_DBUS_INTF, SYSTEMD_START_SERVICE_METHOD); + if(!msg) + { + BUG("failed to create dbus message\n"); + return false; + } + dbus_message_append_args(msg, DBUS_TYPE_STRING, &aAvahiUnitName, DBUS_TYPE_STRING, &aAvahiUnitMode, DBUS_TYPE_INVALID); + + response = dbus_connection_send_with_reply_and_block(conn, msg,SYSTEMD_SERVICE_TIMEOUT, &err); + + if(dbus_error_is_set(&err)) + { + dbus_message_unref(msg); + BUG("failed to start service : %s\n", err.message); + return false; + } + + dbus_message_unref(msg); + dbus_message_unref(response); + return true; +} +/* +This function will involk polkit based authorization using dbus +*/ +static bool checkAuthorizationForAvahiService() +{ + DBusMessage *msg, *reply; + DBusMessageIter iter; + DBusError err; + bool authorized = false; + conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL); + if (!conn) + { + BUG("Can't get on system bus"); + return authorized; + } + msg = dbus_message_new_method_call(POLKIT_AUTH_DBUS, POLKIT_AUTH_PATH, + POLKIT_AUTH_INTF, POLKIT_AUTH_METHOD_CALL); + if (!msg) + { + BUG("Can't allocate new method call\n"); + return authorized; + } + dbus_message_iter_init_append(msg, &iter); + addArgumentsForAuthentication(conn, &iter); + dbus_error_init(&err); + reply = dbus_connection_send_with_reply_and_block(conn, msg, DBUS_TIMEOUT_INFINITE, &err); + dbus_message_unref(msg); + if (!reply) + { + if (dbus_error_is_set(&err)) + { + BUG("%s\n", err.message); + dbus_error_free(&err); + } + else + { + BUG("Can't check authorization\n"); + } + return authorized; + } + //verify the response with dbus response signature + if (dbus_message_has_signature(reply, "(bba{ss})")) + { + DBusMessageIter result; + dbus_bool_t respAuthorized; + //iterate the dbus response + dbus_message_iter_init(reply, &iter); + dbus_message_iter_recurse(&iter, &result); + //get the authorization status + dbus_message_iter_get_basic(&result, &respAuthorized); + DBG("Authorized %d \n", respAuthorized); + if(respAuthorized) + { + authorized = true; + } + } + else + { + BUG("dbus response signature mismatch\n"); + } + dbus_message_unref(reply); + return authorized; +} + +/* +This function will get the value for the given key if found in the string list. +Returns true if found the value ,otherwise returns false +Parameters: + iStrList - INPUT - Avahi device (scanner) string list. + ikey - INPUT - Key to find in the stringlist. + oKeyValue - OUTPUT - Value of the given key. + aMdlStrLen - OUTPUT - size of oKeyValue. +Note: + Possible value in iStrList (avahi response for a device) + "duplex=F" "is=platen" "cs=binary,color,grayscale" "rs=eSCL" "representation=images/printer.png" + "UUID=6fcbd42d-b117-5352-ab4c-35acfabefc34" "note=" "adminurl=http://HPE4E749F6A0F7.local." + "ty=HP DeskJet 2700 series" "pdl=application/octet-stream,application/pdf,image/jpeg" + "mopria-certified-scan=1.2" "vers=2.63" "txtvers=1" +*/ + +static bool getHPScannerModel(AvahiStringList *iStrList, const char *ikey,char **oKeyValue,size_t *aMdlStrLen) +{ + AvahiStringList *aStrList = NULL; + bool aValueFound = false; + char *aKey = NULL; + aStrList = avahi_string_list_find(iStrList, ikey); + /* + aStrList will be Null ,if given key is not found, + avahi_string_list_get_pair will return zero if key found, + also need to process the response form HP scanner only. + */ + if( ( aStrList != NULL ) && ( avahi_string_list_get_pair(aStrList, &aKey, oKeyValue, aMdlStrLen) == 0 ) + && ( *oKeyValue != NULL ) && ( strncmp(MFG_HP,*oKeyValue,MFG_HP_LEN) == 0 )) + { + size_t aIndex = 0; + for(aIndex = 0; aIndex<(*aMdlStrLen); aIndex++) + { + if(isspace((*oKeyValue)[aIndex])) + { + (*oKeyValue)[aIndex] = '_'; + } + (*oKeyValue)[aIndex] = tolower((*oKeyValue)[aIndex]); + } + DBG("oKeyValue is %s\n", *oKeyValue); + aValueFound = true; + } + if( aKey != NULL ) + avahi_free( (void *)aKey ); + return aValueFound; +} + +/* +This function will gets called whenever a service has been resolved successfully or timed out +*/ +static void resolve_callback( + AvahiServiceResolver *r, + AVAHI_GCC_UNUSED AvahiIfIndex interface, + AVAHI_GCC_UNUSED AvahiProtocol protocol, + AvahiResolverEvent event, + const char *name, + const char *type, + const char *domain, + const char *host_name, + const AvahiAddress *address, + uint16_t port, + AvahiStringList *txt, + AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED void* userdata) { + assert(r); + switch (event) { + case AVAHI_RESOLVER_FAILURE: + BUG( "(Resolver) Failed to resolve service '%s' of type '%s' in domain '%s': %s\n", name, type, domain, avahi_strerror(avahi_client_errno(avahi_service_resolver_get_client(r)))); + break; + + case AVAHI_RESOLVER_FOUND: { + char aIPAddress[AVAHI_ADDRESS_STR_MAX]={'\0'}; + char *aMdlStr = NULL; + size_t aMdlStrLen = 0 ; + DBG( "Service '%s' of type '%s' in domain '%s':\n", name, type, domain); + avahi_address_snprint(aIPAddress, AVAHI_ADDRESS_STR_MAX, address); + DBG("avahi_address_snprint : \n %s \n",aIPAddress); + if( getHPScannerModel(txt,TYPE_NAME,&aMdlStr,&aMdlStrLen) == true ) + { + DBG("aMdlStr name is %s \n",aMdlStr); + DBG("aMdlStrLen is %zu \n",aMdlStrLen); + char aTempUri[MAX_URI_LEN] = {'\0'}; + snprintf( aTempUri, MAX_URI_LEN, "hp:/net/%s?ip=%s&queue=false", aMdlStr+HP_SKIP_MFG_NAME_SIZE, aIPAddress); + if(aUriBuf == NULL) + { + aUriBuf = (char *)calloc(HP_MAX_SCAN_BUFF,sizeof(char)); + if(aUriBuf == NULL) + { + BUG("Unable to alloacate the memeory\n"); + exit(0); + } + aMemAllocated = HP_MAX_SCAN_BUFF ; + } + //Check whether buffer has enough space to add new URI and check for duplicate URIs. + if( !strstr(aUriBuf, aTempUri) ) + { + if ( (aBytesRead + MAX_URI_LEN) > aMemAllocated ) + { + aUriBuf = realloc(aUriBuf, ( MAX_URI_LEN * sizeof(char) ) ); + aMemAllocated = aMemAllocated + HP_EXT_SCAN_BUFF; + } + aBytesRead += snprintf(aUriBuf + aBytesRead, MAX_URI_LEN,"%s;", aTempUri); + } + } + if( aMdlStr != NULL ) + avahi_free( (void *)aMdlStr ); + break; + } + } + //avahi_service_resolver_free(r); +} +/* Called whenever a new services becomes available on the LAN or is removed from the LAN */ +static void browse_callback( + AvahiServiceBrowser *b, + AvahiIfIndex interface, + AvahiProtocol protocol, + AvahiBrowserEvent event, + const char *name, + const char *type, + const char *domain, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, + void* userdata) { + + AvahiClient *c = (AvahiClient *)userdata; + assert(b); + switch (event) { + + case AVAHI_BROWSER_CACHE_EXHAUSTED: + case AVAHI_BROWSER_REMOVE: + break; + + case AVAHI_BROWSER_FAILURE: + + BUG( "(Browser) %s\n", avahi_strerror(avahi_client_errno(avahi_service_browser_get_client(b)))); + avahi_simple_poll_quit(aSimplePoll); + return; + + case AVAHI_BROWSER_NEW: + BUG( "(Browser) NEW: service '%s' of type '%s' in domain '%s'\n", name, type, domain); + + /* We ignore the returned resolver object. In the callback + function we free it. If the server is terminated before + the callback function is called the server will free + the resolver for us. */ + + if (!(avahi_service_resolver_new(c, interface, protocol, name, type, domain, AVAHI_PROTO_INET, (AvahiLookupFlags)0, resolve_callback, c))) + BUG( "Failed to resolve service '%s': %s\n", name, avahi_strerror(avahi_client_errno(c))); + + break; + + case AVAHI_BROWSER_ALL_FOR_NOW: + avahi_simple_poll_quit(aSimplePoll); + break; + } +} +/* Called whenever the client or server state changes */ +static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UNUSED void * userdata) { + assert(c); + if (state == AVAHI_CLIENT_FAILURE) { + BUG( "Server connection failure: %s\n", avahi_strerror(avahi_client_errno(c))); + avahi_simple_poll_quit(aSimplePoll); + } +} +/* +This function will gets called whenever a host name has been resolved successfully or timed out +*/ +static void host_name_resolver_callback( + AvahiHostNameResolver *r, + AVAHI_GCC_UNUSED AvahiIfIndex interface, + AVAHI_GCC_UNUSED AvahiProtocol protocol, + AvahiResolverEvent event, + const char *name, + const AvahiAddress *a, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED void *userdata) { + + assert(r); + + switch (event) { + case AVAHI_RESOLVER_FOUND: { + avahi_address_snprint(ipAddressBuff, sizeof(ipAddressBuff), a); + DBG("%s\t%s\n", name, ipAddressBuff); + avahi_simple_poll_quit(aSimplePoll); + break; + } + case AVAHI_RESOLVER_FAILURE: + BUG( "Failed to resolve host name '%s'\n", name); + avahi_simple_poll_quit(aSimplePoll); + break; + } + avahi_host_name_resolver_free(r); +} +/* +This function will register the callbacks for the avahi calls. +Parameters: + iCommandType - INPUT - Lookup / Probe scanner. + iHostName - INPUT - Host name of the scanner. +Note: + iHostName will be empty for command type AVAHI_NET_DISCOVERY +*/ +static void avahi_setup(const int iCommandType, const char* iHostName) +{ + + AvahiClient *client = NULL; + AvahiServiceBrowser *sb = NULL; + int error = 0; + if (!(aSimplePoll = avahi_simple_poll_new())) + { + BUG( "Failed to create simple poll object.\n"); + goto fail; + } + + if (!(client = avahi_client_new(avahi_simple_poll_get(aSimplePoll), AVAHI_CLIENT_IGNORE_USER_CONFIG, client_callback, NULL, &error))) + { + //if Daemon connection failed or daemon not running, + //call systemctl for authorization once it authorized start the service + if ( ( ( error == AVAHI_ERR_NO_DAEMON ) || (error == AVAHI_ERR_DISCONNECTED) ) + && checkAuthorizationForAvahiService() && systemdStartAvahiService() ) + { + if (!(client = avahi_client_new(avahi_simple_poll_get(aSimplePoll), AVAHI_CLIENT_IGNORE_USER_CONFIG, client_callback, NULL, &error))) + { + BUG( "Failed to create client object: %s\n", avahi_strerror(error)); + goto fail; + } + } + else + { + BUG( "Failed to create client object: %s\n", avahi_strerror(error)); + goto fail; + } + } + + if ( iCommandType == AVAHI_NET_DISCOVERY ) /* Probe network scanner */ + { + /* Create the service browser */ + if (!(sb = avahi_service_browser_new(client, AVAHI_IF_UNSPEC, AVAHI_PROTO_INET, "_uscan._tcp", NULL, (AvahiLookupFlags)0, browse_callback, client))) + { + //if Daemon connection failed or daemon not running, + //call systemctl for authorization once it authorized start the service + if ( ( ( error == AVAHI_ERR_NO_DAEMON ) || (error == AVAHI_ERR_DISCONNECTED) ) + && checkAuthorizationForAvahiService() && systemdStartAvahiService() ) + { + if (!(sb = avahi_service_browser_new(client, AVAHI_IF_UNSPEC, AVAHI_PROTO_INET, "_uscan._tcp", NULL, (AvahiLookupFlags)0, browse_callback, client))) + { + BUG( "Failed to create service browser: %s\n", avahi_strerror(avahi_client_errno(client))); + goto fail; + } + } + else + { + BUG( "Failed to create service browser: %s\n", avahi_strerror(avahi_client_errno(client))); + goto fail; + } + } + + /* Create the service browser */ + if (!(sb = avahi_service_browser_new(client, AVAHI_IF_UNSPEC, AVAHI_PROTO_INET, "_scanner._tcp", NULL, (AvahiLookupFlags)0, browse_callback, client))) + { + BUG( "Failed to create service browser: %s\n", avahi_strerror(avahi_client_errno(client))); + goto fail; + } + } + else if ( iCommandType == AVAHI_HOST_LOOKUP ) /* Find the IP (IPV4) address of given host name */ + { + if ( !(avahi_host_name_resolver_new(client, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, iHostName, AVAHI_PROTO_INET, (AvahiLookupFlags)0, + host_name_resolver_callback, NULL) ) ) + { + BUG( "Failed to create host name resolver: %s\n", avahi_strerror(avahi_client_errno(client))); + goto fail; + } + } + avahi_simple_poll_loop(aSimplePoll); +fail: + if (client) + avahi_client_free(client); + if (aSimplePoll) + avahi_simple_poll_free(aSimplePoll); +} +/* +This function will return URIs of the scanner found in +the network. +Parameters: + oUrisBuf - OUTPUT - Buffer to hold URIs of Scanner + iBufsize - INPUT - Size of output buffer. +Note: + URIs will be splited useing ';' delimiter +*/ +int avahi_probe_nw_scanners() +{ + int aRet = AVAHI_STATUS_ERROR; + avahi_setup(AVAHI_NET_DISCOVERY,""); + //size_t aStrLen = strlen(aUriBuf); + if(aBytesRead > 0) + { + aRet = AVAHI_STATUS_OK; + } + return aRet; +} +/* +This function will return the IP address of given hostname +Parameters: + iHostName - INPUT - Hostname of the scanner + oIP - OUTPUT - IP Address of given host name +Note: + Output IP address will be in IPV4 format +*/ +int avahi_lookup(const char *iHostName) +{ + int aRet = AVAHI_STATUS_ERROR; + char aUpdatedHostname[MAX_NAME_LENGTH] = {0}; + int aHostNameLen = strlen(iHostName); + size_t aStrLen = 0; + //DNS host name size is 256 inclusive of '.local' + //So the incoming host name length should be less than or equal to 250 + if ( aHostNameLen <= ( MAX_NAME_LENGTH - APPEND_LOCAL_LEN ) ) + { + //Host name should be appended with .local + snprintf(aUpdatedHostname,MAX_NAME_LENGTH,"%s.local", iHostName); + avahi_setup(AVAHI_HOST_LOOKUP,aUpdatedHostname); + aStrLen = strlen(ipAddressBuff); + if ( (aStrLen <= MAX_IP_ADDR_LEN) && (aStrLen > 0) ) + { + //strncpy(oIP,ipAddressBuff,aStrLen); + DBG("IP address is %s \n",ipAddressBuff); + aRet = AVAHI_STATUS_OK; + } + } + return aRet; +} diff --git a/protocol/discovery/avahiDiscovery.h b/protocol/discovery/avahiDiscovery.h new file mode 100644 index 000000000..2bc3ce292 --- /dev/null +++ b/protocol/discovery/avahiDiscovery.h @@ -0,0 +1,88 @@ +#ifndef _DISCOVERY_AVAHI_H +#define _DISCOVERY_AVAHI_H + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <stdio.h> +#include <assert.h> +#include <stdlib.h> +#include <time.h> +#include <string.h> +#include <ctype.h> +#include <stdbool.h> +#include <syslog.h> +#include <stdarg.h> + +#include <avahi-client/client.h> +#include <avahi-client/lookup.h> +#include <avahi-common/simple-watch.h> +#include <avahi-common/malloc.h> +#include <avahi-common/error.h> + +#ifndef DBUS_TIMEOUT_INFINITE +#define DBUS_TIMEOUT_INFINITE ((int) 0x7fffffff) +#endif + +#define NULL_CHAR_SIZE 1 +#define HP_PLAIN_URI_LEN 24 +#define HP_SKIP_MFG_NAME_SIZE 3 +#define MFG_HP "HP" +#define MFG_HP_LEN 2 +#define MFG_NAME "usb_MFG" +#define MDL_NAME "mdl" +#define TYPE_NAME "ty" +#define HPMUD_LINE_SIZE 256 +#define MAX_URI_LEN 512 +#define HP_MAX_SCAN_BUFF 16384 +#define HP_EXT_SCAN_BUFF 8192 +#define MAX_NAME_LENGTH 256 +#define AVAHI_NET_DISCOVERY 1 +#define AVAHI_HOST_LOOKUP 2 +#define MAX_IP_ADDR_LEN 16 +#define APPEND_LOCAL_LEN 6 + +//Error Codes +#define AVAHI_STATUS_OK 0 +#define AVAHI_STATUS_ERROR 1 +#define AVAHI_STATUS_TIMEOUT 2 +#define SYSTEMD_SERVICE_TIMEOUT 10000 + +#define POLKIT_AUTH_DBUS "org.freedesktop.PolicyKit1" +#define POLKIT_AUTH_INTF "org.freedesktop.PolicyKit1.Authority" +#define POLKIT_AUTH_PATH "/org/freedesktop/PolicyKit1/Authority" +#define POLKIT_AUTH_METHOD_CALL "CheckAuthorization" + +#define ACTION_ID "org.freedesktop.systemd1.manage-units" +#define SYSTEM_BUS_NAME "system-bus-name" +#define AVAHI_SERVICE_NAME "avahi-daemon.service" +#define AVHHI_SERVICE_MODE_REPLACE "replace" + +#define SYSTEMD_DBUS_NAME "org.freedesktop.systemd1" +#define SYSTEMD_DBUS_PATH "/org/freedesktop/systemd1" +#define SYSTEMD_DBUS_INTF "org.freedesktop.systemd1.Manager" +#define SYSTEMD_START_SERVICE_METHOD "StartUnit" + +extern char* aUriBuf; +extern char ipAddressBuff[MAX_IP_ADDR_LEN]; + +//#define MDNS_DEBUG + +#define _STRINGIZE(x) #x +#define STRINGIZE(x) _STRINGIZE(x) + +#define BUG(args...) syslog(LOG_ERR, __FILE__ " " STRINGIZE(__LINE__) ": " args) +#ifdef AVAHI_DEBUG + #define DBG(args...) syslog(LOG_INFO, __FILE__ " " STRINGIZE(__LINE__) ": " args) +#else + #define DBG(args...) +#endif + +/*Function Prototypes*/ + +int avahi_probe_nw_scanners(); +int avahi_lookup(const char* hostname); + +#endif // _DISCOVERY_AVAHI_H + diff --git a/protocol/discovery/mdns.c b/protocol/discovery/mdns.c deleted file mode 100644 index abca295af..000000000 --- a/protocol/discovery/mdns.c +++ /dev/null @@ -1,496 +0,0 @@ -/***************************************************************************** - mdns.c - mDNS related calls - - (c) 2015 Copyright HP Development Company, LP - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - of the Software, and to permit persons to whom the Software is furnished to do - so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - Client/Server generic message format (see messaging-protocol.doc): - - Author: Sanjay Kumar - \*****************************************************************************/ - -//#include <stdio.h> -#include <string.h> -#include <syslog.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <netdb.h> -#include <arpa/inet.h> -#include "mdns.h" - -/* Convert "www.google.com" to "3www6google3com". */ -static int mdns_convert_name_to_dns(const char *name, int name_size, char *dns_name) -{ - int i, x = 0; - char *p = dns_name; - - if (name == 0 || name[0] == 0) - return 0; - - for (i = 0; i < name_size && name[i]; i++) - { - if (name[i] == '.') - { - *p++ = i - x; /* length */ - for (; x < i; x++) - *p++ = name[x]; - x++; - } - } - - if (i) - { - *p++ = i - x; /* length */ - for (; x < i; x++) - *p++ = name[x]; - x++; - } - - p[x++] = 0; - - return x; /* return length DOES include null termination */ -} - - -static int mdns_open_socket(int *psocket) -{ - int stat = MDNS_STATUS_ERROR; - int udp_socket = -1, yes = 1; - char loop = 0, ttl = 255; - struct sockaddr_in recv_addr , addr; - struct ip_mreq mreq; - - DBG("mdns_open_socket entry.\n"); - - if ((udp_socket = socket(AF_INET, SOCK_DGRAM, 0)) == -1) - { - BUG("unable to create udp socket: %m\n"); - goto bugout; - } - - /* Get rid of "address already in use" error message. */ - if (setsockopt(udp_socket, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) == -1) - { - BUG("unable to setsockopt: %m\n"); - goto bugout; - } - - /* Bind the socket to port and IP equal to INADDR_ANY. */ - bzero(&recv_addr, sizeof(recv_addr)); - recv_addr.sin_family = AF_INET; - recv_addr.sin_addr.s_addr = htonl(INADDR_ANY); - recv_addr.sin_port = htons(5353); - if (bind(udp_socket, (struct sockaddr *) &recv_addr, sizeof(recv_addr)) == -1) - { - BUG("unable to bind udp socket: %m\n"); - goto bugout; - } - - /* Set multicast loopback off. */ - if (setsockopt(udp_socket, IPPROTO_IP, IP_MULTICAST_LOOP, &loop, sizeof(loop)) == -1) - { - BUG("unable to setsockopt: %m\n"); - goto bugout; - } - - /* Set ttl to 255. Required by mdns. */ - if (setsockopt(udp_socket, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl))== -1) - { - BUG("unable to setsockopt: %m\n"); - goto bugout; - } - - /* Join the .local multicast group */ - mreq.imr_multiaddr.s_addr = inet_addr("224.0.0.251"); - mreq.imr_interface.s_addr = htonl(INADDR_ANY); - if (setsockopt(udp_socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(struct ip_mreq)) == -1) { - BUG("unable to add to multicast group: %m\n"); - close(udp_socket); - goto bugout; - } - - *psocket = udp_socket; - DBG("pSocket = [%d]: %m\n", *psocket); - stat = MDNS_STATUS_OK; - -bugout: - return stat; -} - -static void mdns_create_query_packet(char* fqdn, int query_type, char* querybuf, int *length) -{ - int n = 0; - char header[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; - // ID/FLAGS/QDCNT/ANCNT/NSCNT/ARCNT - - DBG("mdns_create_query_packet.\n"); - memcpy(querybuf, header, sizeof(header)); - n = sizeof(header); - - n += mdns_convert_name_to_dns(fqdn, strlen(fqdn), querybuf + n); - querybuf[n++] = 0x00; - querybuf[n++] = query_type; - querybuf[n++] = 0x00; - querybuf[n++] = QCLASS_IN; - - //DBG_DUMP(dnsquery, n); - *length = n; -} - -static int mdns_send_query(int udp_socket, char *fqdn, int query_type) -{ - char querybuf[256] = {0,}; - int length = 0; - int stat = MDNS_STATUS_OK; - struct sockaddr_in send_addr; - - DBG("mdns_send_query entry. send socket=%d len=%d\n", udp_socket, length); - - mdns_create_query_packet(fqdn, query_type, querybuf, &length); - - bzero(&send_addr, sizeof(send_addr)); - send_addr.sin_family = AF_INET; - send_addr.sin_addr.s_addr = inet_addr("224.0.0.251"); - send_addr.sin_port = htons(5353); - if (sendto(udp_socket, querybuf, length, 0, (struct sockaddr *) &send_addr, sizeof(send_addr)) < 0) - stat = MDNS_STATUS_ERROR; - - DBG("mdns_send_query returning with status(%d)...\n", stat); - return stat; -} - -static int mdns_readName(unsigned char* start, unsigned char *Response, char *buf) -{ - int size = 0; - char *name = buf; - unsigned char *p = Response; - - while (size = *p++) - { - if (size >= 0xC0) - { - //Compressed Size. Just ignore it. - p++; //skip Offset byte - return (p - Response); - } - memcpy(name, p, size); - name[size] = '.'; - p += size; - name += size + 1; - } - - *(name - 1) = '\0'; - - DBG("Name = [%s]\n", buf); - return (p - Response); -} - - -static unsigned char* mdns_readMDL(unsigned char *p, unsigned char *normalized_mdl, int len) -{ - int i = 0; - int j = 0; - int z = 0; - int size = 0; - - unsigned char* mdl = normalized_mdl; - while (i < len) - { - size = *p++; - i += size + 1; - - if (strncmp(p, "mdl=", 4) == 0) - { - z = 4; - } - else if (strncmp(p, "ty=", 3) == 0) - { - z = 3+3; - } - - if(z > 0) - { - for (j = z; j < size; j++) - { - if (*(p + j) == ' ') - *mdl++ = '_'; //Replace white space with underscore - else - *mdl++ = tolower(*(p + j)); - } - - *mdl++ = '\0'; - break; - } - p += size; - - } - DBG("MDL = [%s]\n", normalized_mdl); - return p + 4; -} - -static void mdns_read_header(char *Response, DNS_PKT_HEADER *h) -{ - h->id = Response[0] << 8 | Response[1]; - h->flags = Response[2] << 8 | Response[3]; - h->questions = Response[4] << 8 | Response[5]; - h->answers = Response[6] << 8 | Response[7]; - h->authorities = Response[8] << 8 | Response[9]; - h->additionals = Response[10]<< 8 | Response[11]; - - DBG("ID=%x flags=%x Q=%x A=%x AUTH=%x ADD=%x\n", h->id, h->flags, h->questions, - h->answers, h->authorities, h->additionals); - -} - -static void mdns_parse_respponse(unsigned char *Response, DNS_RECORD *rr) -{ - unsigned char *p = Response; - unsigned short type = 0, data_len = 0; - DNS_PKT_HEADER h; - int i = 0; - - DBG("mdns_parse_respponse entry.\n"); - mdns_read_header(Response, &h); - p += MDNS_HEADER_SIZE; - - for (i = 0; i < h.questions; i++) - { - p += mdns_readName(Response, p, rr->name); - p += 4; //Skip TYPE(2 bytes)/CLASS(2 bytes) - } - - for (i = 0; i < (h.answers + h.additionals); i++) - { - p += mdns_readName(Response, p, rr->name); - type = (*p << 8 | *(p+1)); - p += 8; //Skip type(2 bytes)/class(2 bytes)/TTL(4 bytes) - - data_len = ( *p << 8 | *(p+1)); - p += 2; //Skip data_len(2 bytes) - - switch (type) - { - case QTYPE_A: - sprintf(rr->ip, "%d.%d.%d.%d", p[0], p[1], p[2], p[3]); - break; - case QTYPE_TXT: - mdns_readMDL(p, rr->mdl, data_len); - break; - default: - break; - } - - p += data_len; - //DBG("TYPE = %d, Length = %d\n",type, data_len); - } - - DBG("mdns_parse_respponse returning MDL = %s, IP = %s\n",rr->mdl, rr->ip); -} - -static int mdns_read_single_response(int udp_socket, char *recvbuffer, int recvbufsize) -{ - struct timeval tmo; - struct sockaddr_in addr; - socklen_t addrlen = sizeof(addr); - fd_set master, readfd; - int len = 0, maxfd = 0, ret = 0; - - DBG("mdns_read_single_response.\n"); - FD_ZERO(&master); - FD_SET(udp_socket, &master); - maxfd = udp_socket; - tmo.tv_sec = 0; - tmo.tv_usec = 300000; - - readfd = master; - ret = select(maxfd + 1, &readfd, NULL, NULL, &tmo); - if (ret > 0) - { - bzero(&addr, sizeof(addr)); - if ((len = recvfrom(udp_socket, recvbuffer, recvbufsize, 0, (struct sockaddr *) &addr, &addrlen)) < 0) - { - BUG("recvfrom error: (%m)\n"); - ret = -1; - } - } - - DBG("mdns_read_single_response exiting with ret = %d\n", ret); - return ret; -} - -static DNS_RECORD *mdns_read_responses(int udp_socket, int mode) -{ - int retries = 3, ret = 0; - char recvbuffer[MAX_MDNS_RESPONSE_LEN] = { 0, }; - DNS_RECORD *rr = NULL, *head = NULL, *temp = NULL; - - DBG("mdns_read_responses.\n"); - while (1 ) - { - memset(recvbuffer, 0, sizeof(recvbuffer)); - ret = mdns_read_single_response(udp_socket, recvbuffer, sizeof(recvbuffer)); - if (ret <= 0) - { - if (ret == 0 && retries--) //READ TIMEOUT. Retry few more times. - continue; - else - break; - } - else - { - temp = (DNS_RECORD *)malloc(sizeof(DNS_RECORD)); - if(temp) - { - temp->next = NULL; - if(head == NULL) - rr = head = temp; - else - { - rr->next = temp; - rr = rr->next; - } - - memset(rr, 0, sizeof(DNS_RECORD)); - mdns_parse_respponse(recvbuffer, rr); - - if(mode == MODE_READ_SINGLE) - break; - } - } - } // while(1) - - DBG("mdns_read_responses returning with (%p).\n", head); - return head; -} - -static int mdns_update_uris(DNS_RECORD *rr, char* uris_buf, int buf_size, int *count) -{ - char tempuri[MAX_URI_LEN] = {0}; - int bytes_read = 0; - - DBG("mdns_update_uris.\n"); - - *count = 0; - memset(uris_buf, 0, buf_size); - - while(rr) - { - if (rr->mdl[0] && rr->ip[0] /*&& strstr(rr->mdl, "scanjet")*/) - { - memset(tempuri, 0, sizeof(tempuri)); - sprintf(tempuri, "hp:/net/%s?ip=%s&queue=false", rr->mdl, rr->ip); - - //Check whether buffer has enough space to add new URI and check for duplicate URIs. - if(bytes_read + sizeof(tempuri) < buf_size && !strstr(uris_buf, tempuri)) - { - bytes_read += sprintf(uris_buf + bytes_read, "%s;", tempuri); - (*count)++; - *(uris_buf + bytes_read) = '\0'; - } - } - rr = rr->next; - } - - DBG("mdns_update_uris Count=[%d] bytes=[%d] URIs = %s\n",*count, bytes_read, uris_buf); - return bytes_read; -} - -static void mdns_rr_cleanup(DNS_RECORD *rr) -{ - DNS_RECORD *temp = NULL; - - DBG("mdns_rr_cleanup entry.\n"); - while(rr) - { - temp = rr->next; - free(rr); - rr = temp; - } -} - -int mdns_probe_nw_scanners(char* uris_buf, int buf_size, int *count) -{ - int n = 0, bytes_read = 0; - int udp_socket = 0; - int stat = MDNS_STATUS_ERROR; - DNS_RECORD *rr_list = NULL; - - DBG("mdns_probe_nw_scanners entry.\n"); - /* Open UDP socket */ - if (mdns_open_socket(&udp_socket) != MDNS_STATUS_OK) - goto bugout; - - /* Send dns query */ - mdns_send_query(udp_socket, "_scanner._tcp.local", QTYPE_PTR); - mdns_send_query(udp_socket, "_uscan._tcp.local", QTYPE_PTR); - - /* Read Responses */ - rr_list = mdns_read_responses(udp_socket, MODE_READ_ALL); - - /* Update URIs buffer */ - bytes_read = mdns_update_uris(rr_list, uris_buf, buf_size, count); - DBG("mdns_probe_nw_scanners returned with bytes_read = [%d].\n",bytes_read); - -bugout: - if (udp_socket >= 0) - close(udp_socket); - - mdns_rr_cleanup(rr_list); - - return bytes_read; -} - -/* - * Lookup IP for MDNS host name. - * MDNS host name example: "npi7c8a3e" (LaserJet p2055dn) - */ -int mdns_lookup(char* hostname, unsigned char* ip) -{ - int udp_socket = 0; - int stat = MDNS_STATUS_ERROR; - char fqdn[MAX_NAME_LENGTH] = {0}; - DNS_RECORD *rr_list = NULL; - - DBG("mdns_probe_nw_scanners entry.\n"); - /* Open UDP socket */ - if (mdns_open_socket(&udp_socket) != MDNS_STATUS_OK) - goto bugout; - - /* Send dns query */ - sprintf(fqdn, "%s.local", hostname); - mdns_send_query(udp_socket, fqdn, QTYPE_A); - - /* Read Responses */ - rr_list = mdns_read_responses(udp_socket, MODE_READ_SINGLE); - - /* Update IP Address buffer */ - if(rr_list) - { - strcpy(ip, rr_list->ip); - stat = MDNS_STATUS_OK; - DBG("IP = [%s].\n",ip); - } - -bugout: - if (udp_socket >= 0) - close(udp_socket); - - mdns_rr_cleanup(rr_list); - return stat; -} - diff --git a/protocol/discovery/mdns.h b/protocol/discovery/mdns.h deleted file mode 100644 index 8fccc82e2..000000000 --- a/protocol/discovery/mdns.h +++ /dev/null @@ -1,104 +0,0 @@ -/*****************************************************************************\ - - mdns.h - mDNS related calls - - (c) 2015 Copyright HP Development Company, LP - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - of the Software, and to permit persons to whom the Software is furnished to do - so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - Client/Server generic message format (see messaging-protocol.doc): - - Author: Sanjay Kumar -\*****************************************************************************/ - -#ifndef _DISCOVERY_MDNS_H -#define _DISCOVERY_MDNS_H - -//MDNS Packet fields -#define QTYPE_A 1 -#define QTYPE_TXT 16 -#define QTYPE_SRV 33 -#define QTYPE_AAAA 28 -#define QTYPE_PTR 12 -#define QCLASS_IN 1 -#define MDNS_HEADER_SIZE 12 - -//Error Codes -#define MDNS_STATUS_OK 0 -#define MDNS_STATUS_ERROR 1 -#define MDNS_STATUS_TIMEOUT 2 - -#define MAX_IP_ADDR_LEN 16 -#define MAX_URI_LEN 256 -#define MAX_MDL_NAME_LEN 256 -#define MAX_NAME_LENGTH 256 -#define MAX_MDNS_RESPONSE_LEN 2048 -#define MODE_READ_ALL 0 -#define MODE_READ_SINGLE 1 - -/*Relevant MDNS Resource Record(RR) fields */ -typedef struct _DNS_RECORD -{ - char ip[MAX_IP_ADDR_LEN]; - char mdl[MAX_MDL_NAME_LEN]; - char name[MAX_MDL_NAME_LEN]; - struct _DNS_RECORD *next; -}DNS_RECORD; - -typedef struct _DNS_PKT_HEADER -{ - unsigned short id; - unsigned short flags; - unsigned short questions; - unsigned short answers; - unsigned short authorities; - unsigned short additionals; -}DNS_PKT_HEADER; - - -//#define MDNS_DEBUG - -#define _STRINGIZE(x) #x -#define STRINGIZE(x) _STRINGIZE(x) - -#define BUG(args...) syslog(LOG_ERR, __FILE__ " " STRINGIZE(__LINE__) ": " args) -#ifdef MDNS_DEBUG - #define DBG(args...) syslog(LOG_INFO, __FILE__ " " STRINGIZE(__LINE__) ": " args) -#else - #define DBG(args...) -#endif - -/*Function Prototypes*/ -int mdns_probe_nw_scanners(char* buf, int buf_size, int *count); -int mdns_lookup(char* hostname, unsigned char* ip); - - -/*Helper Function Prototypes*/ -static int mdns_convert_name_to_dns(const char *name, int name_size, char *dns_name); -static int mdns_read_single_response(int udp_socket, char *recvbuffer, int recvbufsize); -static int mdns_open_socket(int *psocket); -static int mdns_send_query(int udp_socket, char *fqdn, int query_type); -static int mdns_readName(unsigned char* start, unsigned char *p, char *buf); -static int mdns_update_uris(DNS_RECORD *rr, char* uris_buf, int buf_size, int *count); -static void mdns_create_query_packet(char* fqdn, int query_type, char* dnsquery, int *length); -static void mdns_read_header(char *Response, DNS_PKT_HEADER *h); -static void mdns_parse_respponse(unsigned char *Response, DNS_RECORD *rr); -static void mdns_rr_cleanup(DNS_RECORD *rr); -static DNS_RECORD *mdns_read_responses(int udp_socket, int mode); -static unsigned char* mdns_readMDL(unsigned char *p, unsigned char *normalized_mdl, int len); -#endif // _DISCOVERY_MDNS_H - diff --git a/protocol/hp_ipp.c b/protocol/hp_ipp.c index 24b6b5544..af7013bf7 100644 --- a/protocol/hp_ipp.c +++ b/protocol/hp_ipp.c @@ -586,9 +586,9 @@ void initializeIPPRequest(ipp_t *request) /* * 'createDeviceStatusRequest()' - Create IPP request and update the same with values needed for getting device status attributes. */ -ipp_t * createDeviceStatusRequest() +ipp_t * createDeviceStatusRequest(const char *printer_name) { - + char uri[ HTTP_MAX_URI ] = {0}; ipp_t *request = NULL; /* IPP request object */ static const char * attrs[] = /* Requested attributes */ { @@ -605,7 +605,8 @@ ipp_t * createDeviceStatusRequest() initializeIPPRequest(request); if (request) { - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, ""); + snprintf(uri, HTTP_MAX_URI, "ipp://localhost/printers/%s", printer_name); + ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri); ippAddStrings( request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", sizeof( attrs ) / sizeof( attrs[ 0 ] ), NULL, attrs ); } @@ -693,7 +694,7 @@ HPIPP_RESULT parseResponseHeader(char *header, int *content_length, int *chunked * marker-names, marker-types, marker-levels, marker-low-levels, printer-state, printer-state-reasons. * In addition to this it also updates the attribute count in the response. */ -ipp_t * getDeviceStatusAttributes(char* device_uri, int *count) +ipp_t * getDeviceStatusAttributes(char* device_uri,char* printer_name, int *count) { ipp_t *request = NULL; /* IPP request object */ ipp_t *response = NULL; /* IPP response object */ @@ -701,7 +702,7 @@ ipp_t * getDeviceStatusAttributes(char* device_uri, int *count) int max_count = 0; //Create Device Status Request - request = createDeviceStatusRequest(); + request = createDeviceStatusRequest(printer_name); if (request == NULL) goto abort; diff --git a/protocol/hp_ipp.h b/protocol/hp_ipp.h index 3853f8432..245e798ad 100644 --- a/protocol/hp_ipp.h +++ b/protocol/hp_ipp.h @@ -157,10 +157,10 @@ static ssize_t raw_ipp_request_callback(volatile raw_ipp *raw_buffer, ipp_uchar void initializeIPPRequest(ipp_t *request); int parsePrinterAttributes(ipp_t *response, printer_t * printer_list, int size); -ipp_t * createDeviceStatusRequest(); +ipp_t * createDeviceStatusRequest(const char* printer_name); ipp_t * usbDoRequest(ipp_t *request, char* device_uri); ipp_t * networkDoRequest(ipp_t *request, char* device_uri); -ipp_t * getDeviceStatusAttributes(char* device_uri, int *count); +ipp_t * getDeviceStatusAttributes(char* device_uri,char* printer_name, int *count); int getCupsPrinters(printer_t **printer_list); HPIPP_RESULT parseResponseHeader(char* header, int *content_length, int *chunked, int* header_size); diff --git a/scan/sane/hpaio.c b/scan/sane/hpaio.c index 730a96620..be034b8bb 100644 --- a/scan/sane/hpaio.c +++ b/scan/sane/hpaio.c @@ -36,6 +36,7 @@ #include <string.h> #include <cups/cups.h> #include "hpmud.h" +#include "avahiDiscovery.h" #include "hp_ipp.h" #include "soap.h" #include "soapht.h" @@ -303,7 +304,7 @@ static int DevDiscovery(int localOnly) GetUriLine(tail, uri, &tail); total += AddDevice(uri); } - memset(message, 0, sizeof(message)); + //memset(message, 0, sizeof(message)); /* Look for Network Scan devices if localonly flag if FALSE. */ if (!localOnly) { @@ -318,12 +319,17 @@ static int DevDiscovery(int localOnly) free(cups_printer); #ifdef HAVE_LIBNETSNMP /* Discover NW scanners using Bonjour*/ - bytes_read = mdns_probe_nw_scanners(message, sizeof(message), &cnt); - token = strtok(message, ";"); - while (token) - { - total += AddDevice(token); - token = strtok(NULL, ";"); + //bytes_read = avahi_probe_nw_scanners(); + if( (avahi_probe_nw_scanners() == AVAHI_STATUS_OK) && (aUriBuf != NULL) ) + { + token = strtok(aUriBuf, ";"); + while (token) + { + total += AddDevice(token); + token = strtok(NULL, ";"); + } + free(aUriBuf); + aUriBuf = NULL; } #endif if(!total) diff --git a/scan/sane/hpaio.desc b/scan/sane/hpaio.desc index 5d77b9350..39999880a 100644 --- a/scan/sane/hpaio.desc +++ b/scan/sane/hpaio.desc @@ -1645,40 +1645,10 @@ :model "HP LaserJet MFP e72430dn" :status :good -:model "HP LaserJet MFP m232sdn" -:status :good - -:model "HP LaserJet MFP m233d" -:status :good - -:model "HP LaserJet MFP m233dw" -:status :good - -:model "HP LaserJet MFP m233sdn" -:status :good - -:model "HP LaserJet MFP m233sdw" -:status :good - :model "HP LaserJet MFP m234dw" :status :good -:model "HP LaserJet MFP m234sdn" -:status :good - -:model "HP LaserJet MFP m234sdw" -:status :good - -:model "HP LaserJet MFP m236d" -:status :good - -:model "HP LaserJet MFP m236dw" -:status :good - -:model "HP LaserJet MFP m236sdn" -:status :good - -:model "HP LaserJet MFP m236sdw" +:model "HP LaserJet MFP m234dwe" :status :good :model "HP LaserJet Pro 200 Color MFP m276n" diff --git a/ui4/scandialog.py b/ui4/scandialog.py index 470c7e449..f970b6e71 100644 --- a/ui4/scandialog.py +++ b/ui4/scandialog.py @@ -757,7 +757,7 @@ class Ui_HpScan(object): self.bp_barcode.stateChanged.connect(self.bp_Barcode) self.bp_blankpage.stateChanged.connect(self.bp_Blankpage) else: - if (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'hpgt2500', self.device_uri)): + if (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri,re.I)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'hpgt2500', self.device_uri)): self.comboBox_Flatbed.clear() self.comboBox_Flatbed.addItem(_fromUtf8("")) self.comboBox_Flatbed.addItem(_fromUtf8("")) @@ -836,7 +836,7 @@ class Ui_HpScan(object): self.multi_pick.setEnabled(True) self.CheckEnable() else: - if (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'hpgt2500', self.device_uri)): + if (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri,re.I)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'hpgt2500', self.device_uri)): self.comboBox_Flatbed.clear() self.comboBox_Flatbed.addItem(_fromUtf8("")) self.comboBox_Flatbed.addItem(_fromUtf8("")) @@ -1103,7 +1103,7 @@ class Ui_HpScan(object): self.color_dropout.setChecked(False) self.color_dropout.setEnabled(False) else: - if (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'2500', self.device_uri)): + if (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri,re.I)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'2500', self.device_uri)): self.comboBox_Flatbed.clear() self.comboBox_Flatbed.addItem(_fromUtf8("")) self.comboBox_Flatbed.addItem(_fromUtf8("")) @@ -1283,7 +1283,7 @@ class Ui_HpScan(object): self.comboBox_Flatbed.setItemText(1, _translate("HpScan", "Duplex", None)) self.comboBox_Flatbed.setItemText(2, _translate("HpScan", "ADF-Backside", None)) self.comboBox_Flatbed.setCurrentIndex(1) - elif (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'2500', self.device_uri)): + elif (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri,re.I)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'2500', self.device_uri)): self.comboBox_Flatbed.clear() self.comboBox_Flatbed.addItem(_fromUtf8("")) self.comboBox_Flatbed.addItem(_fromUtf8("")) @@ -1314,7 +1314,7 @@ class Ui_HpScan(object): if self.color_dropout_pri == True: self.color_dropout.setEnabled(True) self.comboBox_Flatbed.setEnabled(True) - if (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'2500', self.device_uri)): + if (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri,re.I)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'2500', self.device_uri)): self.comboBox_Flatbed.clear() self.comboBox_Flatbed.addItem(_fromUtf8("")) self.comboBox_Flatbed.addItem(_fromUtf8("")) @@ -1416,7 +1416,7 @@ class Ui_HpScan(object): self.device_name = '2000' elif re.search(r'hpgt2500', self.device_uri): self.device_name = '2500' - elif re.search(r'_N9120', self.device_uri): + elif re.search(r'_N9120', self.device_uri,re.I): self.device_name = '9120' elif re.search(r'_8500fn2', self.device_uri): self.device_name = '8500' @@ -1538,7 +1538,7 @@ class Ui_HpScan(object): #print (self.devicelist) for device in self.devicelist: #print(device) - if re.search(r'_5000_', device) or re.search(r'_7500', device) or re.search(r'_N9120', device) or re.search(r'_8500fn2', device) or re.search(r'_3500_f1', device) or re.search(r'_4500_fn1', device) or re.search(r'_7000_s3', device) or re.search(r'_3000_s3', device) or re.search(r'hp2000S1', device) or re.search(r'hpgt2500', device) or re.search(r'_2000_s2', device) or re.search(r'7000_snw1', device) or re.search(r'4000_snw1', device) or re.search(r'_3000_s4', device) or re.search(r'_5000_s5', device): + if re.search(r'_5000_', device) or re.search(r'_7500', device) or re.search(r'_N9120', device,re.I) or re.search(r'_8500fn2', device) or re.search(r'_3500_f1', device) or re.search(r'_4500_fn1', device) or re.search(r'_7000_s3', device) or re.search(r'_3000_s3', device) or re.search(r'hp2000S1', device) or re.search(r'hpgt2500', device) or re.search(r'_2000_s2', device) or re.search(r'7000_snw1', device) or re.search(r'4000_snw1', device) or re.search(r'_3000_s4', device) or re.search(r'_5000_s5', device): self.comboBox_Device_URI.addItem(device) self.comboBox_Device_URI.setItemText(i, _translate("HpScan", device, None)) i += 1 @@ -1569,7 +1569,7 @@ class SetupDialog(): sane_devices = sane.getDevices() for device, mfg, mdl, t in sane_devices: - if re.search(r'_5000_', device) or re.search(r'_7500', device) or re.search(r'_N9120', device) or re.search(r'_8500fn2', device) or re.search(r'_3500_f1', device) or re.search(r'_4500_fn1', device) or re.search(r'_7000_s3', device) or re.search(r'_3000_s3', device) or re.search(r'hp2000S1', device) or re.search(r'hpgt2500', device) or re.search(r'_2000_s2', device) or re.search(r'7000_snw1', device) or re.search(r'4000_snw1', device) or re.search(r'_3000_s4', device) or re.search(r'_5000_s5', device): + if re.search(r'_5000_', device) or re.search(r'_7500', device) or re.search(r'_N9120', device,re.I) or re.search(r'_8500fn2', device) or re.search(r'_3500_f1', device) or re.search(r'_4500_fn1', device) or re.search(r'_7000_s3', device) or re.search(r'_3000_s3', device) or re.search(r'hp2000S1', device) or re.search(r'hpgt2500', device) or re.search(r'_2000_s2', device) or re.search(r'7000_snw1', device) or re.search(r'4000_snw1', device) or re.search(r'_3000_s4', device) or re.search(r'_5000_s5', device): try: scanDevice = sane.openDevice(device) #source_option = scanDevice.getOptionObj("source").constraint diff --git a/ui5/scandialog.py b/ui5/scandialog.py index 44e2309f5..211596231 100644 --- a/ui5/scandialog.py +++ b/ui5/scandialog.py @@ -741,7 +741,7 @@ class Ui_HpScan(object): self.bp_barcode.stateChanged.connect(self.bp_Barcode) self.bp_blankpage.stateChanged.connect(self.bp_Blankpage) else: - if (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'hpgt2500', self.device_uri)): + if (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri,re.I)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'hpgt2500', self.device_uri)): self.comboBox_Flatbed.clear() self.comboBox_Flatbed.addItem("") self.comboBox_Flatbed.addItem("") @@ -820,7 +820,7 @@ class Ui_HpScan(object): self.multi_pick.setEnabled(True) self.CheckEnable() else: - if (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'hpgt2500', self.device_uri)): + if (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri,re.I)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'hpgt2500', self.device_uri)): self.comboBox_Flatbed.clear() self.comboBox_Flatbed.addItem("") self.comboBox_Flatbed.addItem("") @@ -1087,7 +1087,7 @@ class Ui_HpScan(object): self.color_dropout.setChecked(False) self.color_dropout.setEnabled(False) else: - if (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'2500', self.device_uri)): + if (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri,re.I)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'2500', self.device_uri)): self.comboBox_Flatbed.clear() self.comboBox_Flatbed.addItem("") self.comboBox_Flatbed.addItem("") @@ -1267,7 +1267,7 @@ class Ui_HpScan(object): self.comboBox_Flatbed.setItemText(1, _translate("HpScan", "Duplex", None)) self.comboBox_Flatbed.setItemText(2, _translate("HpScan", "ADF-Backside", None)) self.comboBox_Flatbed.setCurrentIndex(1) - elif (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'2500', self.device_uri)): + elif (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri,re.I)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'2500', self.device_uri)): self.comboBox_Flatbed.clear() self.comboBox_Flatbed.addItem("") self.comboBox_Flatbed.addItem("") @@ -1298,7 +1298,7 @@ class Ui_HpScan(object): if self.color_dropout_pri == True: self.color_dropout.setEnabled(True) self.comboBox_Flatbed.setEnabled(True) - if (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'2500', self.device_uri)): + if (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri,re.I)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'2500', self.device_uri)): self.comboBox_Flatbed.clear() self.comboBox_Flatbed.addItem("") self.comboBox_Flatbed.addItem("") @@ -1400,7 +1400,7 @@ class Ui_HpScan(object): self.device_name = '2000' elif re.search(r'hpgt2500', self.device_uri): self.device_name = '2500' - elif re.search(r'_N9120', self.device_uri): + elif re.search(r'_N9120', self.device_uri,re.I): self.device_name = '9120' elif re.search(r'_8500fn2', self.device_uri): self.device_name = '8500' @@ -1521,7 +1521,7 @@ class Ui_HpScan(object): i = 0 #print self.devicelist for device in self.devicelist: - if re.search(r'_5000_', device) or re.search(r'_7500', device) or re.search(r'_N9120', device) or re.search(r'_8500fn2', device) or re.search(r'_3500_f1', device) or re.search(r'_4500_fn1', device) or re.search(r'_7000_s3', device) or re.search(r'_3000_s3', device) or re.search(r'hp2000S1', device) or re.search(r'hpgt2500', device) or re.search(r'_2000_s2', device) or re.search(r'7000_snw1', device) or re.search(r'4000_snw1', device) or re.search(r'_3000_s4', device) or re.search(r'_5000_s5', device): + if re.search(r'_5000_', device) or re.search(r'_7500', device) or re.search(r'_N9120', device,re.I) or re.search(r'_8500fn2', device) or re.search(r'_3500_f1', device) or re.search(r'_4500_fn1', device) or re.search(r'_7000_s3', device) or re.search(r'_3000_s3', device) or re.search(r'hp2000S1', device) or re.search(r'hpgt2500', device) or re.search(r'_2000_s2', device) or re.search(r'7000_snw1', device) or re.search(r'4000_snw1', device) or re.search(r'_3000_s4', device) or re.search(r'_5000_s5', device): self.comboBox_Device_URI.addItem(device) self.comboBox_Device_URI.setItemText(i, _translate("HpScan", device, None)) i += 1 @@ -1552,7 +1552,7 @@ class SetupDialog(): sane_devices = sane.getDevices() for device, mfg, mdl, t in sane_devices: - if re.search(r'_5000_', device) or re.search(r'_7500', device) or re.search(r'_N9120', device) or re.search(r'_8500fn2', device) or re.search(r'_3500_f1', device) or re.search(r'_4500_fn1', device) or re.search(r'_7000_s3', device) or re.search(r'_3000_s3', device) or re.search(r'hp2000S1', device) or re.search(r'hpgt2500', device) or re.search(r'_2000_s2', device) or re.search(r'7000_snw1', device) or re.search(r'4000_snw1', device) or re.search(r'_3000_s4', device) or re.search(r'_5000_s5', device): + if re.search(r'_5000_', device) or re.search(r'_7500', device) or re.search(r'_N9120', device,re.I) or re.search(r'_8500fn2', device) or re.search(r'_3500_f1', device) or re.search(r'_4500_fn1', device) or re.search(r'_7000_s3', device) or re.search(r'_3000_s3', device) or re.search(r'hp2000S1', device) or re.search(r'hpgt2500', device) or re.search(r'_2000_s2', device) or re.search(r'7000_snw1', device) or re.search(r'4000_snw1', device) or re.search(r'_3000_s4', device) or re.search(r'_5000_s5', device): try: scanDevice = sane.openDevice(device) #source_option = scanDevice.getOptionObj("source").constraint |