diff options
| author | Didier Raboud <odyx@debian.org> | 2016-01-06 12:40:52 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2014-06-15 16:42:46 +1000 |
| commit | d1298c61974ba45d190a1e6bc26ac551676f726f (patch) | |
| tree | 0a6932eac57195a0db97b30912a27e185c69ca56 | |
| parent | 00c92fdd1e119945f60e87533160bf0fe2f0cae8 (diff) | |
Imported Upstream version 3.15.11
2406 files changed, 6666 insertions, 1615 deletions
@@ -336,7 +336,7 @@ are met: 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. Neither the name of the Hewlett-Packard nor the names of its +3. Neither the name of the HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/Makefile.am b/Makefile.am index c9c2e807d..73fed2ef2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,14 +1,14 @@ # # Makefile.am - hplip automake input file # -# (c) 2004-2015 Copyright Hewlett-Packard Development Company, LP +# (c) 2004-2015 Copyright HP Development Company, LP # Author: David Suffield, Naga Samrat Chowdary Narla, Sarbeswar Meher INCLUDES = -Iip -Iio/hpmud -Iscan/sane -Iprnt/hpijs -Icommon/ CFLAGS+= -DCONFDIR=\"$(hplip_confdir)\" CXXFLAGS+= -DCONFDIR=\"$(hplip_confdir)\" hplipdir = $(datadir)/hplip - +apparmordir = /etc/apparmor.d docdir = $(hpdocdir) htmldir = $(hphtmldir) doc_DATA = COPYING copyright prnt/hpijs/README_LIBJPG @@ -52,47 +52,56 @@ libsane_hpaio_la_SOURCES = scan/sane/hpaio.c scan/sane/mfpdtf.c scan/sane/pml.c scan/sane/common.c scan/sane/common.h scan/sane/soap.h scan/sane/soapht.h scan/sane/sanei_debug.h scan/sane/sanei.h \ scan/sane/sanei_init_debug.c scan/sane/marvell.h scan/sane/marvelli.h scan/sane/marvell.c scan/sane/soapht.c scan/sane/soap.c \ scan/sane/soaphti.h scan/sane/soapi.h scan/sane/xml.c scan/sane/xml.h scan/sane/ledm.h scan/sane/ledmi.h scan/sane/ledm.c \ - scan/sane/bb_ledm.c scan/sane/http.h scan/sane/http.c scan/sane/sclpml.c scan/sane/sclpml.h common/utils.c common/utils.h + scan/sane/bb_ledm.c scan/sane/http.h scan/sane/http.c scan/sane/sclpml.c scan/sane/sclpml.h common/utils.c common/utils.h \ + scan/sane/escl.h scan/sane/escli.h scan/sane/escl.c if DARWIN_BUILD libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation -version-info 1:0:0 else libsane_hpaio_la_LDFLAGS = -version-info 1:0:0 endif # The following is a interlibrary dependency that must be compiled first. -libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la libhpipp.la $(DBUS_LIBS) -lcups -ldl +libsane_hpaio_la_LIBADD = libhpip.la libhpdiscovery.la libhpmud.la libhpipp.la $(DBUS_LIBS) -lcups -ldl #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG -libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) -Iprotocol +libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) -Iprotocol -Iprotocol/discovery 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 + + +endif + # hpmud library MUDNAME=hpmud lib_LTLIBRARIES += libhpmud.la - -if LIBUSB01_BUILD -libhpmud_la_CFLAGS = -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\" +libhpmud_la_CFLAGS = -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\" -Iprotocol -Iprotocol/discovery +libhpmud_la_LDFLAGS = -version-info 0:6:0 -lpthread -ldl libhpmud_la_SOURCES = io/hpmud/hpmud.c io/hpmud/mlc.c io/hpmud/model.c io/hpmud/pml.c \ io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/pml.h io/hpmud/dot4.c \ - io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h io/hpmud/musb.h io/hpmud/musb_libusb01.c \ + io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h io/hpmud/musb.h \ common/utils.c common/utils.h + +if LIBUSB01_BUILD +libhpmud_la_SOURCES += io/hpmud/musb_libusb01.c +libhpmud_la_LDFLAGS += -lusb else -libhpmud_la_CFLAGS = -I/usr/include/libusb-1.0 -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\" -libhpmud_la_SOURCES = io/hpmud/hpmud.c io/hpmud/mlc.c io/hpmud/model.c io/hpmud/pml.c \ - io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/pml.h io/hpmud/dot4.c \ - io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h io/hpmud/musb.h io/hpmud/musb.c \ - common/utils.c common/utils.h +libhpmud_la_SOURCES += io/hpmud/musb.c +libhpmud_la_CFLAGS += -I/usr/include/libusb-1.0 +libhpmud_la_LDFLAGS += -lusb-1.0 endif -libhpmud_la_LDFLAGS = -version-info 0:6:0 -lpthread -ldl - if NETWORK_BUILD libhpmud_la_LDFLAGS += -l$(SNMPLIB) -lcrypto +libhpmud_la_LIBADD = libhpdiscovery.la endif -if LIBUSB01_BUILD -libhpmud_la_LDFLAGS += -lusb -else -libhpmud_la_LDFLAGS += -lusb-1.0 -endif + # ip library lib_LTLIBRARIES += libhpip.la @@ -189,6 +198,22 @@ dist_hpcupsfaxppd_DATA = fax/ppd/HP-Fax-hpcups.ppd.gz fax/ppd/HP-Fax2-hpcups.ppd endif # HPCUPS_INSTALL endif # FAX_BUILD +# AppArmor Changes +if APPARMOR_BUILD +apparmor_profiledir = /etc/apparmor.d +apparmor_profile_DATA = apparmor/usr.share.hplip +dist_apparmor_profile_DATA = apparmor/usr.share.hplip + +apparmor_abstractiondir = /etc/apparmor.d/abstractions +apparmor_abstraction_DATA = apparmor/abstractions/hplip +dist_apparmor_abstraction_DATA = apparmor/abstractions/hplip + +endif #APPARMOR_BUILD + +selinuxdir = +dist_selinux_DATA = selinux/hplip.te selinux/hplip.fc selinux/hplip.pp selinux/hplip.if + + # ptest noinst_PROGRAMS += ptest ptest_SOURCES = pcard/ptest.c pcard/ptest.h pcard/fat.c pcard/fat.h @@ -285,12 +310,11 @@ hpmudextdir = $(pyexecdir) hpmudext_LTLIBRARIES = hpmudext.la hpmudext_la_LDFLAGS = -module -avoid-version hpmudext_la_SOURCES = io/mudext/hpmudext.c -hpmudext_la_LIBADD = libhpmud.la +hpmudext_la_LIBADD = libhpmud.la libhpdiscovery.la +hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) -Iprotocol/discovery -if LIBUSB01_BUILD -hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) -else -hpmudext_la_CFLAGS =-I/usr/include/libusb-1.0 -I$(PYTHONINCLUDEDIR) +if !LIBUSB01_BUILD +hpmudext_la_CFLAGS +=-I/usr/include/libusb-1.0 endif # ui (qt3) @@ -565,9 +589,19 @@ if FULL_BUILD mv $(DESTDIR)$(hpfaxdir)/hpfax.py $(DESTDIR)$(hpfaxdir)/hpfax; \ chmod 700 $(DESTDIR)$(hpfaxdir)/hpfax; \ fi -# + + if [ "$(apparmor_build)" = "yes" ];then \ + chmod 644 $(DESTDIR)$(apparmor_profiledir)/usr.share.hplip;\ + chmod 644 $(DESTDIR)$(apparmor_profiledir)/abstractions/hplip;\ + fi + # Make backend run as root. -# chmod 700 $(DESTDIR)$(hpdir)/hp + chmod 700 $(DESTDIR)$(hpdir)/hp + +#AppArmor + + + endif # FULL_BUILD endif # HPLIP_BUILD @@ -581,6 +615,9 @@ if HPLIP_BUILD # # Remove fax support. rm -f $(DESTDIR)$(hpfaxdir)/hpfax +# Remove apparmor profiles + rm -f $(DESTDIR)$(apparmor_profiledir)/usr.share.hplip + rm -f $(DESTDIR)$(apparmor_profiledir)/abstractions/hplip endif rpm: diff --git a/Makefile.in b/Makefile.in index b45bd86ec..6856e3fb3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -38,12 +38,14 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ noinst_PROGRAMS = $(am__EXEEXT_1) -DIST_COMMON = $(am__configure_deps) $(am__dist_base_DATA_DIST) \ - $(am__dist_basepexpect_DATA_DIST) $(am__dist_cmd_SCRIPTS_DIST) \ - $(am__dist_copier_DATA_DIST) $(am__dist_fax_DATA_DIST) \ - $(am__dist_fax_filters_DATA_DIST) $(am__dist_fin_SCRIPTS_DIST) \ - $(am__dist_halpre_DATA_DIST) $(am__dist_home_DATA_DIST) \ - $(am__dist_hpcupsfaxppd_DATA_DIST) \ +DIST_COMMON = $(am__configure_deps) \ + $(am__dist_apparmor_abstraction_DATA_DIST) \ + $(am__dist_apparmor_profile_DATA_DIST) \ + $(am__dist_base_DATA_DIST) $(am__dist_basepexpect_DATA_DIST) \ + $(am__dist_cmd_SCRIPTS_DIST) $(am__dist_copier_DATA_DIST) \ + $(am__dist_fax_DATA_DIST) $(am__dist_fax_filters_DATA_DIST) \ + $(am__dist_fin_SCRIPTS_DIST) $(am__dist_halpre_DATA_DIST) \ + $(am__dist_home_DATA_DIST) $(am__dist_hpcupsfaxppd_DATA_DIST) \ $(am__dist_hpfax_SCRIPTS_DIST) \ $(am__dist_hpijsfaxppd_DATA_DIST) \ $(am__dist_hplip_SCRIPTS_DIST) \ @@ -66,11 +68,12 @@ DIST_COMMON = $(am__configure_deps) $(am__dist_base_DATA_DIST) \ $(am__dist_postscript_DATA_DIST) $(am__dist_ppd_DATA_DIST) \ $(am__dist_prnt_DATA_DIST) $(am__dist_rip_SCRIPTS_DIST) \ $(am__dist_rules_DATA_DIST) $(am__dist_rulessystem_DATA_DIST) \ - $(am__dist_scan_DATA_DIST) $(am__dist_ui4_DATA_DIST) \ - $(am__dist_ui_DATA_DIST) $(am__dist_www0_DATA_DIST) \ - $(am__dist_www3_DATA_DIST) $(am__dist_www4_DATA_DIST) \ - $(dist_hplip_state_DATA) $(dist_plugins4_SCRIPTS) \ - $(dist_unrel_DATA) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(am__dist_scan_DATA_DIST) $(am__dist_selinux_DATA_DIST) \ + $(am__dist_ui4_DATA_DIST) $(am__dist_ui_DATA_DIST) \ + $(am__dist_www0_DATA_DIST) $(am__dist_www3_DATA_DIST) \ + $(am__dist_www4_DATA_DIST) $(dist_hplip_state_DATA) \ + $(dist_plugins4_SCRIPTS) $(dist_unrel_DATA) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/cups_drv.inc $(srcdir)/foomatic_drv.inc \ $(srcdir)/hplip-systray.desktop.in $(srcdir)/hplip.conf.in \ $(srcdir)/hplip.desktop.in $(srcdir)/hplip.list.in \ @@ -81,12 +84,18 @@ DIST_COMMON = $(am__configure_deps) $(am__dist_base_DATA_DIST) \ config.sub depcomp install-sh ltmain.sh missing @HPLIP_BUILD_TRUE@hp_PROGRAMS = hp$(EXEEXT) +# HP Service Discovery library +@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am__append_1 = libhpdiscovery.la + # ip library -@HPLIP_BUILD_TRUE@am__append_1 = libhpmud.la libhpip.la -@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am__append_2 = -l$(SNMPLIB) -lcrypto -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@am__append_3 = -lusb -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_4 = -lusb-1.0 -@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_5 = \ +@HPLIP_BUILD_TRUE@am__append_2 = libhpmud.la libhpip.la +@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@am__append_3 = io/hpmud/musb_libusb01.c +@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@am__append_4 = -lusb +@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_5 = io/hpmud/musb.c +@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_6 = -I/usr/include/libusb-1.0 +@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_7 = -lusb-1.0 +@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am__append_8 = -l$(SNMPLIB) -lcrypto +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_9 = \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ scan/sane/hpaio.desc \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ prnt/drv/hpijs.drv.in.template \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ installer/text_install.py \ @@ -97,16 +106,17 @@ DIST_COMMON = $(am__configure_deps) $(am__dist_base_DATA_DIST) \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ data/localization/hplip_pt.ts \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ data/localization/hplip_ru.ts \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ data/localization/hplip_zh.ts -@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_6 = dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_10 = dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall # ptest # hppgsz -@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_7 = ptest hppgsz +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_11 = ptest hppgsz # IPP library -@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_8 = libhpipp.la -@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@am__append_9 = ui/colorcalform2_base.ui ui/settingsdialog_base.ui ui/aligntype6form1_base.ui \ +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_12 = libhpipp.la +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_13 = -I/usr/include/libusb-1.0 +@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@am__append_14 = ui/colorcalform2_base.ui ui/settingsdialog_base.ui ui/aligntype6form1_base.ui \ @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@ ui/aboutdlg_base.ui ui/imagepropertiesdlg_base.ui ui/paperedgealignform_base.ui ui/aligntype6form2_base.ui \ @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@ ui/nodevicesform_base.ui ui/cleaningform_base.ui ui/colorcalform_base.ui ui/devmgr4_base.ui ui/loadpaperform_base.ui \ @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@ ui/cleaningform2_base.ui ui/waitform_base.ui ui/coloradjform_base.ui ui/faxaddrbookeditform_base.ui \ @@ -116,12 +126,12 @@ DIST_COMMON = $(am__configure_deps) $(am__dist_base_DATA_DIST) \ @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@ ui/allowabletypesdlg_base.ui ui/setupform_base.ui ui/setupmanualfind_base.ui \ @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@ ui/setupsettings_base.ui ui/pluginlicenseform_base.ui ui/align13form_base.ui ui/firmwaredialog_base.ui -@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT4_INSTALL_TRUE@am__append_10 = ui4/*.ui +@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT4_INSTALL_TRUE@am__append_15 = ui4/*.ui @HPIJS_INSTALL_TRUE@bin_PROGRAMS = hpijs$(EXEEXT) @HPCUPS_INSTALL_TRUE@hpcups_PROGRAMS = hpcups$(EXEEXT) @FAX_BUILD_TRUE@@HPCUPS_INSTALL_TRUE@@HPCUPS_ONLY_BUILD_FALSE@hpcupsfax_PROGRAMS = hpcupsfax$(EXEEXT) -@FOOMATIC_PPD_INSTALL_TRUE@am__append_11 = $(foomatic_ppd_printers) -@CUPS_PPD_INSTALL_TRUE@am__append_12 = $(cups_ppd_printers) +@FOOMATIC_PPD_INSTALL_TRUE@am__append_16 = $(foomatic_ppd_printers) +@CUPS_PPD_INSTALL_TRUE@am__append_17 = $(cups_ppd_printers) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in @@ -163,8 +173,12 @@ am__installdirs = "$(DESTDIR)$(cupsextdir)" "$(DESTDIR)$(hpmudextdir)" \ "$(DESTDIR)$(cmddir)" "$(DESTDIR)$(findir)" \ "$(DESTDIR)$(hpfaxdir)" "$(DESTDIR)$(hplipdir)" \ "$(DESTDIR)$(plugins4dir)" "$(DESTDIR)$(ripdir)" \ - "$(DESTDIR)$(pstotiffdir)" "$(DESTDIR)$(cupsdrvdir)" \ - "$(DESTDIR)$(cupsdrv2dir)" "$(DESTDIR)$(basedir)" \ + "$(DESTDIR)$(pstotiffdir)" \ + "$(DESTDIR)$(apparmor_abstractiondir)" \ + "$(DESTDIR)$(apparmor_profiledir)" "$(DESTDIR)$(cupsdrvdir)" \ + "$(DESTDIR)$(cupsdrv2dir)" \ + "$(DESTDIR)$(apparmor_abstractiondir)" \ + "$(DESTDIR)$(apparmor_profiledir)" "$(DESTDIR)$(basedir)" \ "$(DESTDIR)$(basepexpectdir)" "$(DESTDIR)$(copierdir)" \ "$(DESTDIR)$(faxdir)" "$(DESTDIR)$(fax_filtersdir)" \ "$(DESTDIR)$(halpredir)" "$(DESTDIR)$(homedir)" \ @@ -184,11 +198,11 @@ am__installdirs = "$(DESTDIR)$(cupsextdir)" "$(DESTDIR)$(hpmudextdir)" \ "$(DESTDIR)$(postscriptdir)" "$(DESTDIR)$(ppddir)" \ "$(DESTDIR)$(prntdir)" "$(DESTDIR)$(rulesdir)" \ "$(DESTDIR)$(rulessystemdir)" "$(DESTDIR)$(scandir)" \ - "$(DESTDIR)$(uidir)" "$(DESTDIR)$(ui4dir)" \ - "$(DESTDIR)$(unreldir)" "$(DESTDIR)$(www0dir)" \ - "$(DESTDIR)$(www3dir)" "$(DESTDIR)$(www4dir)" \ - "$(DESTDIR)$(docdir)" "$(DESTDIR)$(hplip_confdir)" \ - "$(DESTDIR)$(hplip_desktopdir)" \ + "$(DESTDIR)$(selinuxdir)" "$(DESTDIR)$(uidir)" \ + "$(DESTDIR)$(ui4dir)" "$(DESTDIR)$(unreldir)" \ + "$(DESTDIR)$(www0dir)" "$(DESTDIR)$(www3dir)" \ + "$(DESTDIR)$(www4dir)" "$(DESTDIR)$(docdir)" \ + "$(DESTDIR)$(hplip_confdir)" "$(DESTDIR)$(hplip_desktopdir)" \ "$(DESTDIR)$(hplip_systraydir)" LTLIBRARIES = $(cupsext_LTLIBRARIES) $(hpmudext_LTLIBRARIES) \ $(lib_LTLIBRARIES) $(libsane_hpaio_LTLIBRARIES) \ @@ -207,7 +221,8 @@ cupsext_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am_cupsext_la_rpath = -rpath \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ $(cupsextdir) @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpmudext_la_DEPENDENCIES = \ -@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ libhpmud.la +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ libhpmud.la \ +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ libhpdiscovery.la am__hpmudext_la_SOURCES_DIST = io/mudext/hpmudext.c @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am_hpmudext_la_OBJECTS = \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ hpmudext_la-hpmudext.lo @@ -257,6 +272,17 @@ 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 +libhpdiscovery_la_OBJECTS = $(am_libhpdiscovery_la_OBJECTS) +libhpdiscovery_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(libhpdiscovery_la_CFLAGS) $(CFLAGS) \ + $(libhpdiscovery_la_LDFLAGS) $(LDFLAGS) -o $@ +@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am_libhpdiscovery_la_rpath = \ +@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@ -rpath $(libdir) libhpip_la_DEPENDENCIES = am__libhpip_la_SOURCES_DIST = ip/xconvolve.c ip/xfax.c ip/xgrayout.c \ ip/xjpg_dct.c ip/xjpg_fix.c ip/xpad.c ip/xrotate.c ip/xskel.c \ @@ -293,34 +319,24 @@ libhpipp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(CFLAGS) $(libhpipp_la_LDFLAGS) $(LDFLAGS) -o $@ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am_libhpipp_la_rpath = -rpath \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ $(libdir) -libhpmud_la_LIBADD = +@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@libhpmud_la_DEPENDENCIES = \ +@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@ libhpdiscovery.la am__libhpmud_la_SOURCES_DIST = io/hpmud/hpmud.c io/hpmud/mlc.c \ io/hpmud/model.c io/hpmud/pml.c io/hpmud/hpmud.h \ io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h \ io/hpmud/pml.h io/hpmud/dot4.c io/hpmud/dot4.h io/hpmud/jd.c \ io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h io/hpmud/musb.h \ - io/hpmud/musb.c common/utils.c common/utils.h \ - io/hpmud/musb_libusb01.c -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am_libhpmud_la_OBJECTS = \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@ libhpmud_la-hpmud.lo \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@ libhpmud_la-mlc.lo \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@ libhpmud_la-model.lo \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@ libhpmud_la-pml.lo \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@ libhpmud_la-dot4.lo \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@ libhpmud_la-jd.lo \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@ libhpmud_la-pp.lo \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@ libhpmud_la-musb.lo \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@ libhpmud_la-utils.lo -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@am_libhpmud_la_OBJECTS = \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@ libhpmud_la-hpmud.lo \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@ libhpmud_la-mlc.lo \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@ libhpmud_la-model.lo \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@ libhpmud_la-pml.lo \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@ libhpmud_la-dot4.lo \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@ libhpmud_la-jd.lo \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@ libhpmud_la-pp.lo \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@ libhpmud_la-musb_libusb01.lo \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@ libhpmud_la-utils.lo + common/utils.c common/utils.h io/hpmud/musb_libusb01.c \ + io/hpmud/musb.c +@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@am__objects_1 = libhpmud_la-musb_libusb01.lo +@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__objects_2 = \ +@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@ libhpmud_la-musb.lo +@HPLIP_BUILD_TRUE@am_libhpmud_la_OBJECTS = libhpmud_la-hpmud.lo \ +@HPLIP_BUILD_TRUE@ libhpmud_la-mlc.lo libhpmud_la-model.lo \ +@HPLIP_BUILD_TRUE@ libhpmud_la-pml.lo libhpmud_la-dot4.lo \ +@HPLIP_BUILD_TRUE@ libhpmud_la-jd.lo libhpmud_la-pp.lo \ +@HPLIP_BUILD_TRUE@ libhpmud_la-utils.lo $(am__objects_1) \ +@HPLIP_BUILD_TRUE@ $(am__objects_2) libhpmud_la_OBJECTS = $(am_libhpmud_la_OBJECTS) libhpmud_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libhpmud_la_CFLAGS) \ @@ -328,8 +344,9 @@ libhpmud_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ @HPLIP_BUILD_TRUE@am_libhpmud_la_rpath = -rpath $(libdir) am__DEPENDENCIES_1 = @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_DEPENDENCIES = \ -@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ libhpip.la libhpmud.la \ -@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ libhpipp.la \ +@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ libhpip.la \ +@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ libhpdiscovery.la \ +@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ libhpmud.la libhpipp.la \ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ $(am__DEPENDENCIES_1) am__libsane_hpaio_la_SOURCES_DIST = scan/sane/hpaio.c \ scan/sane/mfpdtf.c scan/sane/pml.c scan/sane/scl.c \ @@ -344,7 +361,8 @@ am__libsane_hpaio_la_SOURCES_DIST = scan/sane/hpaio.c \ scan/sane/xml.c scan/sane/xml.h scan/sane/ledm.h \ scan/sane/ledmi.h scan/sane/ledm.c scan/sane/bb_ledm.c \ scan/sane/http.h scan/sane/http.c scan/sane/sclpml.c \ - scan/sane/sclpml.h common/utils.c common/utils.h + scan/sane/sclpml.h common/utils.c common/utils.h \ + scan/sane/escl.h scan/sane/escli.h scan/sane/escl.c @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@am_libsane_hpaio_la_OBJECTS = \ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ libsane_hpaio_la-hpaio.lo \ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ libsane_hpaio_la-mfpdtf.lo \ @@ -361,7 +379,8 @@ am__libsane_hpaio_la_SOURCES_DIST = scan/sane/hpaio.c \ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ libsane_hpaio_la-bb_ledm.lo \ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ libsane_hpaio_la-http.lo \ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ libsane_hpaio_la-sclpml.lo \ -@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ libsane_hpaio_la-utils.lo +@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ libsane_hpaio_la-utils.lo \ +@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ libsane_hpaio_la-escl.lo libsane_hpaio_la_OBJECTS = $(am_libsane_hpaio_la_OBJECTS) libsane_hpaio_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libsane_hpaio_la_CFLAGS) \ @@ -587,14 +606,15 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(cupsext_la_SOURCES) $(hpmudext_la_SOURCES) \ - $(libapdk_la_SOURCES) $(libhpip_la_SOURCES) \ - $(libhpipp_la_SOURCES) $(libhpmud_la_SOURCES) \ - $(libsane_hpaio_la_SOURCES) $(pcardext_la_SOURCES) \ - $(scanext_la_SOURCES) $(hp_SOURCES) $(hpcups_SOURCES) \ - $(hpcupsfax_SOURCES) $(hpijs_SOURCES) $(hppgsz_SOURCES) \ - $(ptest_SOURCES) + $(libapdk_la_SOURCES) $(libhpdiscovery_la_SOURCES) \ + $(libhpip_la_SOURCES) $(libhpipp_la_SOURCES) \ + $(libhpmud_la_SOURCES) $(libsane_hpaio_la_SOURCES) \ + $(pcardext_la_SOURCES) $(scanext_la_SOURCES) $(hp_SOURCES) \ + $(hpcups_SOURCES) $(hpcupsfax_SOURCES) $(hpijs_SOURCES) \ + $(hppgsz_SOURCES) $(ptest_SOURCES) DIST_SOURCES = $(am__cupsext_la_SOURCES_DIST) \ $(am__hpmudext_la_SOURCES_DIST) $(libapdk_la_SOURCES) \ + $(am__libhpdiscovery_la_SOURCES_DIST) \ $(am__libhpip_la_SOURCES_DIST) $(am__libhpipp_la_SOURCES_DIST) \ $(am__libhpmud_la_SOURCES_DIST) \ $(am__libsane_hpaio_la_SOURCES_DIST) \ @@ -602,6 +622,8 @@ DIST_SOURCES = $(am__cupsext_la_SOURCES_DIST) \ $(am__hp_SOURCES_DIST) $(am__hpcups_SOURCES_DIST) \ $(am__hpcupsfax_SOURCES_DIST) $(am__hpijs_SOURCES_DIST) \ $(am__hppgsz_SOURCES_DIST) $(am__ptest_SOURCES_DIST) +am__dist_apparmor_abstraction_DATA_DIST = apparmor/abstractions/hplip +am__dist_apparmor_profile_DATA_DIST = apparmor/usr.share.hplip am__dist_base_DATA_DIST = base/maint.py base/codes.py base/g.py \ base/pml.py base/status.py base/__init__.py base/mfpdtf.py \ base/utils.py base/wifi.py base/LedmWifi.py base/device.py \ @@ -754,6 +776,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz \ prnt/ps/hp-laserjet_3200m-ps.ppd.gz \ prnt/ps/hp-laserjet_1320-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_m577-ps.ppd.gz \ prnt/ps/hp-designjet_z5400-postscript.ppd.gz \ prnt/ps/hp-laserjet_m806-ps.ppd.gz \ prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz \ @@ -771,6 +794,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz \ prnt/ps/hp-laserjet_2430-ps.ppd.gz \ prnt/ps/hp-designjet_t1500-postscript.ppd.gz \ + prnt/ps/hp-laserjet_mfp_m527-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4500-ps.ppd.gz \ prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_5m-ps.ppd.gz \ @@ -779,11 +803,13 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-designjet_t795ps_44in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp5225dn-ps.ppd.gz \ prnt/ps/hp-color_laserjet_m552-ps.ppd.gz \ + prnt/ps/hp-laserjet_pro_m402_m403-ps.ppd.gz \ prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz \ prnt/ps/hp-laserjet_4345_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet-ps.ppd.gz \ prnt/ps/hp-color_laserjet_8500-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4600-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz \ prnt/ps/hp-laserjet_500_color_m551-ps.ppd.gz \ prnt/ps/hp-laserjet_4300-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz \ @@ -831,6 +857,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-designjet_t770_postscript-ps.ppd.gz \ prnt/ps/hp-laserjet_2200_series-ps.ppd.gz \ prnt/ps/hp-laserjet_5si-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m452-ps.ppd.gz \ prnt/ps/hp-designjet_4520ps-ps.ppd.gz \ prnt/ps/hp-laserjet_1220se-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp2025dn-ps.ppd.gz \ @@ -838,11 +865,13 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-laserjet_4mp-ps.ppd.gz \ prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz \ prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz \ prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz \ prnt/ps/hp-laserjet_9040_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_2300-ps.ppd.gz \ prnt/ps/hp-laserjet_9000_series-ps.ppd.gz \ prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz \ + prnt/ps/hp-laserjet_m506-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2830-ps.ppd.gz \ prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz \ prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz \ @@ -865,6 +894,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-laserjet_p3005-ps.ppd.gz \ prnt/ps/hp-laserjet_9040-ps.ppd.gz \ prnt/ps/hp-color_laserjet_3800-ps.ppd.gz \ + prnt/ps/hp-laserjet_mfp_m426_m427-ps.ppd.gz \ prnt/ps/hp-laserjet_1300n-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2605dn-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2800-ps.ppd.gz \ @@ -890,6 +920,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4550-ps.ppd.gz \ prnt/ps/hp-designjet_z6600-postscript.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_m274-ps.ppd.gz \ prnt/ps/hp-laserjet_700_m712-ps.ppd.gz \ prnt/ps/hp-laserjet_4050_series-ps.ppd.gz \ prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz \ @@ -917,6 +948,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-laserjet_8000_series-ps.ppd.gz \ prnt/ps/hp-mopier_320-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2600-ps.ppd.gz \ + prnt/ps/hp-laserjet_pro_m402_m403d-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4730mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_5000-ps.ppd.gz \ prnt/ps/hp-laserjet_m4345_mfp-ps.ppd.gz \ @@ -939,6 +971,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ prnt/ps/hp-laserjet_1200n-ps.ppd.gz \ prnt/ps/hp-laserjet_3390-ps.ppd.gz \ prnt/ps/hp-laserjet_m604_m605_m606-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m452d-ps.ppd.gz \ prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz \ prnt/ps/hp-designjet_4500mfp.ppd.gz \ prnt/ps/hp-color_laserjet_m855-ps.ppd.gz \ @@ -969,6 +1002,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-officejet_k80-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1022nw-hpijs-zjs.ppd.gz \ ppd/hpijs/hp-business_inkjet_1100-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_4670_series-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_9500-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz \ @@ -1008,6 +1042,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_4500_g510n-z-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_1050_j410_series-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_5640_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_f4200_series-hpijs.ppd.gz \ ppd/hpijs/hp-psc_1300_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_933c-hpijs.ppd.gz \ @@ -1186,6 +1221,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_6520_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-deskjet_5570_series-hpijs.ppd.gz \ ppd/hpijs/hp-psc_1510_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1020-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_7510_series-hpijs.ppd.gz \ @@ -1435,6 +1471,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-deskjet_845c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4350-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_pro_mfp_m125r-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_4720_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_5110-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_4610_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_630-hpijs.ppd.gz \ @@ -1528,6 +1565,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-laserjet_pro_mfp_m127fw-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_d1300_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_4530_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3420-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_5500_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_630c-hpijs.ppd.gz \ @@ -1575,6 +1613,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpijs/hp-officejet_series_520-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_895c-hpijs.ppd.gz \ ppd/hpijs/hp-psc_2200_series-hpijs.ppd.gz \ + ppd/hpijs/hp-scanjet_pro_3500_f1-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_843c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4500_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_7110_series-hpijs.ppd.gz \ @@ -1845,10 +1884,13 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpcups/hp-deskjet_400.ppd.gz \ ppd/hpcups/hp-deskjet_400l.ppd.gz \ ppd/hpcups/hp-deskjet_4510_series.ppd.gz \ + ppd/hpcups/hp-deskjet_4530_series.ppd.gz \ ppd/hpcups/hp-deskjet_460.ppd.gz \ ppd/hpcups/hp-deskjet_4610_series.ppd.gz \ ppd/hpcups/hp-deskjet_4620_series.ppd.gz \ ppd/hpcups/hp-deskjet_4640_series.ppd.gz \ + ppd/hpcups/hp-deskjet_4670_series.ppd.gz \ + ppd/hpcups/hp-deskjet_4720_series.ppd.gz \ ppd/hpcups/hp-deskjet_500.ppd.gz \ ppd/hpcups/hp-deskjet_500c.ppd.gz \ ppd/hpcups/hp-deskjet_505j.ppd.gz \ @@ -1862,7 +1904,9 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpcups/hp-deskjet_5550.ppd.gz \ ppd/hpcups/hp-deskjet_5551.ppd.gz \ ppd/hpcups/hp-deskjet_5552.ppd.gz \ + ppd/hpcups/hp-deskjet_5570_series.ppd.gz \ ppd/hpcups/hp-deskjet_5600.ppd.gz \ + ppd/hpcups/hp-deskjet_5640_series.ppd.gz \ ppd/hpcups/hp-deskjet_5650.ppd.gz \ ppd/hpcups/hp-deskjet_5652.ppd.gz \ ppd/hpcups/hp-deskjet_5700.ppd.gz \ @@ -2467,13 +2511,16 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4v-ps.ppd.gz \ ppd/hpcups/hp-psc_780xi.ppd.gz \ ppd/hpcups/hp-psc_900_series.ppd.gz \ ppd/hpcups/hp-psc_920.ppd.gz ppd/hpcups/hp-psc_950.ppd.gz \ - ppd/hpcups/hp-psc_950vr.ppd.gz ppd/hpcups/hp-psc_950xi.ppd.gz + ppd/hpcups/hp-psc_950vr.ppd.gz ppd/hpcups/hp-psc_950xi.ppd.gz \ + ppd/hpcups/hp-scanjet_pro_3500_f1.ppd.gz am__dist_prnt_DATA_DIST = prnt/cups.py prnt/__init__.py prnt/ldl.py \ prnt/pcl.py prnt/colorcal.py am__dist_rules_DATA_DIST = data/rules/56-hpmud.rules \ data/rules/56-hpmud_sysfs.rules am__dist_rulessystem_DATA_DIST = data/rules/hplip-printer@.service am__dist_scan_DATA_DIST = scan/__init__.py scan/sane.py +am__dist_selinux_DATA_DIST = selinux/hplip.te selinux/hplip.fc \ + selinux/hplip.pp selinux/hplip.if am__dist_ui_DATA_DIST = ui/alignform.py ui/colorcalform_base.py \ ui/colorcalform.py ui/coloradjform_base.py ui/coloradjform.py \ ui/devmgr4_base.py ui/devmgr4.py ui/__init__.py \ @@ -2524,7 +2571,10 @@ am__dist_www0_DATA_DIST = $(wwwsrc)/index.html \ $(wwwsrc)/upgrading.html am__dist_www3_DATA_DIST = $(wwwsrc)/styles/* am__dist_www4_DATA_DIST = $(wwwsrc)/images/* -DATA = $(cupsdrv_DATA) $(cupsdrv2_DATA) $(dist_base_DATA) \ +DATA = $(apparmor_abstraction_DATA) $(apparmor_profile_DATA) \ + $(cupsdrv_DATA) $(cupsdrv2_DATA) \ + $(dist_apparmor_abstraction_DATA) \ + $(dist_apparmor_profile_DATA) $(dist_base_DATA) \ $(dist_basepexpect_DATA) $(dist_copier_DATA) $(dist_fax_DATA) \ $(dist_fax_filters_DATA) $(dist_halpre_DATA) $(dist_home_DATA) \ $(dist_hpcupsfaxppd_DATA) $(dist_hpijsfaxppd_DATA) \ @@ -2539,10 +2589,11 @@ DATA = $(cupsdrv_DATA) $(cupsdrv2_DATA) $(dist_base_DATA) \ $(dist_policykit_dbus_share_DATA) \ $(dist_policykit_policy_DATA) $(dist_postscript_DATA) \ $(dist_ppd_DATA) $(dist_prnt_DATA) $(dist_rules_DATA) \ - $(dist_rulessystem_DATA) $(dist_scan_DATA) $(dist_ui_DATA) \ - $(dist_ui4_DATA) $(dist_unrel_DATA) $(dist_www0_DATA) \ - $(dist_www3_DATA) $(dist_www4_DATA) $(doc_DATA) \ - $(hplip_conf_DATA) $(hplip_desktop_DATA) $(hplip_systray_DATA) + $(dist_rulessystem_DATA) $(dist_scan_DATA) \ + $(dist_selinux_DATA) $(dist_ui_DATA) $(dist_ui4_DATA) \ + $(dist_unrel_DATA) $(dist_www0_DATA) $(dist_www3_DATA) \ + $(dist_www4_DATA) $(doc_DATA) $(hplip_conf_DATA) \ + $(hplip_desktop_DATA) $(hplip_systray_DATA) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -2656,6 +2707,8 @@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +apparmor_build = @apparmor_build@ +apparmordir = /etc/apparmor.d bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -2756,15 +2809,15 @@ ui_toolkit = @ui_toolkit@ # # Makefile.am - hplip automake input file # -# (c) 2004-2015 Copyright Hewlett-Packard Development Company, LP +# (c) 2004-2015 Copyright HP Development Company, LP # Author: David Suffield, Naga Samrat Chowdary Narla, Sarbeswar Meher INCLUDES = -Iip -Iio/hpmud -Iscan/sane -Iprnt/hpijs -Icommon/ hplipdir = $(datadir)/hplip doc_DATA = COPYING copyright prnt/hpijs/README_LIBJPG EXTRA_DIST = prnt/hpijs/gdevijs-krgb-1.5-gs8.61.patch prnt/hpijs/README_LIBJPG copyright -dist_noinst_SCRIPTS = $(am__append_6) -dist_noinst_DATA = $(am__append_5) $(am__append_9) $(am__append_10) -lib_LTLIBRARIES = $(am__append_1) $(am__append_8) +dist_noinst_SCRIPTS = $(am__append_10) +dist_noinst_DATA = $(am__append_9) $(am__append_14) $(am__append_15) +lib_LTLIBRARIES = $(am__append_1) $(am__append_2) $(am__append_12) foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_7400_series-hpijs.ppd.gz \ ppd/hpijs/hp-psc_1358_series-hpijs.ppd.gz \ @@ -2792,6 +2845,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_k80-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1022nw-hpijs-zjs.ppd.gz \ ppd/hpijs/hp-business_inkjet_1100-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_4670_series-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_9500-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz \ @@ -2831,6 +2885,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_4500_g510n-z-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_1050_j410_series-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_5640_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_f4200_series-hpijs.ppd.gz \ ppd/hpijs/hp-psc_1300_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_933c-hpijs.ppd.gz \ @@ -3009,6 +3064,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_6520_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-deskjet_5570_series-hpijs.ppd.gz \ ppd/hpijs/hp-psc_1510_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1020-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_7510_series-hpijs.ppd.gz \ @@ -3258,6 +3314,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_845c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4350-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_pro_mfp_m125r-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_4720_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_5110-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_4610_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_630-hpijs.ppd.gz \ @@ -3351,6 +3408,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_pro_mfp_m127fw-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_d1300_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_4530_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3420-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_5500_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_630c-hpijs.ppd.gz \ @@ -3398,6 +3456,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_series_520-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_895c-hpijs.ppd.gz \ ppd/hpijs/hp-psc_2200_series-hpijs.ppd.gz \ + ppd/hpijs/hp-scanjet_pro_3500_f1-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_843c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4500_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_7110_series-hpijs.ppd.gz \ @@ -3593,6 +3652,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz \ prnt/ps/hp-laserjet_3200m-ps.ppd.gz \ prnt/ps/hp-laserjet_1320-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_m577-ps.ppd.gz \ prnt/ps/hp-designjet_z5400-postscript.ppd.gz \ prnt/ps/hp-laserjet_m806-ps.ppd.gz \ prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz \ @@ -3610,6 +3670,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz \ prnt/ps/hp-laserjet_2430-ps.ppd.gz \ prnt/ps/hp-designjet_t1500-postscript.ppd.gz \ + prnt/ps/hp-laserjet_mfp_m527-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4500-ps.ppd.gz \ prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_5m-ps.ppd.gz \ @@ -3618,11 +3679,13 @@ foomatic_ps_printers = \ prnt/ps/hp-designjet_t795ps_44in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp5225dn-ps.ppd.gz \ prnt/ps/hp-color_laserjet_m552-ps.ppd.gz \ + prnt/ps/hp-laserjet_pro_m402_m403-ps.ppd.gz \ prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz \ prnt/ps/hp-laserjet_4345_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet-ps.ppd.gz \ prnt/ps/hp-color_laserjet_8500-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4600-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz \ prnt/ps/hp-laserjet_500_color_m551-ps.ppd.gz \ prnt/ps/hp-laserjet_4300-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz \ @@ -3670,6 +3733,7 @@ foomatic_ps_printers = \ prnt/ps/hp-designjet_t770_postscript-ps.ppd.gz \ prnt/ps/hp-laserjet_2200_series-ps.ppd.gz \ prnt/ps/hp-laserjet_5si-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m452-ps.ppd.gz \ prnt/ps/hp-designjet_4520ps-ps.ppd.gz \ prnt/ps/hp-laserjet_1220se-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp2025dn-ps.ppd.gz \ @@ -3677,11 +3741,13 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_4mp-ps.ppd.gz \ prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz \ prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz \ prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz \ prnt/ps/hp-laserjet_9040_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_2300-ps.ppd.gz \ prnt/ps/hp-laserjet_9000_series-ps.ppd.gz \ prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz \ + prnt/ps/hp-laserjet_m506-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2830-ps.ppd.gz \ prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz \ prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz \ @@ -3704,6 +3770,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_p3005-ps.ppd.gz \ prnt/ps/hp-laserjet_9040-ps.ppd.gz \ prnt/ps/hp-color_laserjet_3800-ps.ppd.gz \ + prnt/ps/hp-laserjet_mfp_m426_m427-ps.ppd.gz \ prnt/ps/hp-laserjet_1300n-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2605dn-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2800-ps.ppd.gz \ @@ -3729,6 +3796,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4550-ps.ppd.gz \ prnt/ps/hp-designjet_z6600-postscript.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_m274-ps.ppd.gz \ prnt/ps/hp-laserjet_700_m712-ps.ppd.gz \ prnt/ps/hp-laserjet_4050_series-ps.ppd.gz \ prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz \ @@ -3756,6 +3824,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_8000_series-ps.ppd.gz \ prnt/ps/hp-mopier_320-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2600-ps.ppd.gz \ + prnt/ps/hp-laserjet_pro_m402_m403d-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4730mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_5000-ps.ppd.gz \ prnt/ps/hp-laserjet_m4345_mfp-ps.ppd.gz \ @@ -3778,6 +3847,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_1200n-ps.ppd.gz \ prnt/ps/hp-laserjet_3390-ps.ppd.gz \ prnt/ps/hp-laserjet_m604_m605_m606-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m452d-ps.ppd.gz \ prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz \ prnt/ps/hp-designjet_4500mfp.ppd.gz \ prnt/ps/hp-color_laserjet_m855-ps.ppd.gz \ @@ -3930,10 +4000,13 @@ cups_ppd_printers = \ ppd/hpcups/hp-deskjet_400.ppd.gz \ ppd/hpcups/hp-deskjet_400l.ppd.gz \ ppd/hpcups/hp-deskjet_4510_series.ppd.gz \ + ppd/hpcups/hp-deskjet_4530_series.ppd.gz \ ppd/hpcups/hp-deskjet_460.ppd.gz \ ppd/hpcups/hp-deskjet_4610_series.ppd.gz \ ppd/hpcups/hp-deskjet_4620_series.ppd.gz \ ppd/hpcups/hp-deskjet_4640_series.ppd.gz \ + ppd/hpcups/hp-deskjet_4670_series.ppd.gz \ + ppd/hpcups/hp-deskjet_4720_series.ppd.gz \ ppd/hpcups/hp-deskjet_500.ppd.gz \ ppd/hpcups/hp-deskjet_500c.ppd.gz \ ppd/hpcups/hp-deskjet_505j.ppd.gz \ @@ -3947,7 +4020,9 @@ cups_ppd_printers = \ ppd/hpcups/hp-deskjet_5550.ppd.gz \ ppd/hpcups/hp-deskjet_5551.ppd.gz \ ppd/hpcups/hp-deskjet_5552.ppd.gz \ + ppd/hpcups/hp-deskjet_5570_series.ppd.gz \ ppd/hpcups/hp-deskjet_5600.ppd.gz \ + ppd/hpcups/hp-deskjet_5640_series.ppd.gz \ ppd/hpcups/hp-deskjet_5650.ppd.gz \ ppd/hpcups/hp-deskjet_5652.ppd.gz \ ppd/hpcups/hp-deskjet_5700.ppd.gz \ @@ -4558,7 +4633,8 @@ cups_ppd_printers = \ ppd/hpcups/hp-psc_920.ppd.gz \ ppd/hpcups/hp-psc_950.ppd.gz \ ppd/hpcups/hp-psc_950vr.ppd.gz \ - ppd/hpcups/hp-psc_950xi.ppd.gz + ppd/hpcups/hp-psc_950xi.ppd.gz \ + ppd/hpcups/hp-scanjet_pro_3500_f1.ppd.gz cups_drv = prnt/drv/hpcups.drv @DOC_BUILD_TRUE@wwwsrc = doc @@ -4584,32 +4660,39 @@ cups_drv = prnt/drv/hpcups.drv @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ scan/sane/common.c scan/sane/common.h scan/sane/soap.h scan/sane/soapht.h scan/sane/sanei_debug.h scan/sane/sanei.h \ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ scan/sane/sanei_init_debug.c scan/sane/marvell.h scan/sane/marvelli.h scan/sane/marvell.c scan/sane/soapht.c scan/sane/soap.c \ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ scan/sane/soaphti.h scan/sane/soapi.h scan/sane/xml.c scan/sane/xml.h scan/sane/ledm.h scan/sane/ledmi.h scan/sane/ledm.c \ -@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ scan/sane/bb_ledm.c scan/sane/http.h scan/sane/http.c scan/sane/sclpml.c scan/sane/sclpml.h common/utils.c common/utils.h +@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ scan/sane/bb_ledm.c scan/sane/http.h scan/sane/http.c scan/sane/sclpml.c scan/sane/sclpml.h common/utils.c common/utils.h \ +@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ scan/sane/escl.h scan/sane/escli.h scan/sane/escl.c @DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -version-info 1:0:0 @DARWIN_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation -version-info 1:0:0 # The following is a interlibrary dependency that must be compiled first. -@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la libhpipp.la $(DBUS_LIBS) -lcups -ldl +@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpdiscovery.la libhpmud.la libhpipp.la $(DBUS_LIBS) -lcups -ldl #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG -@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) -Iprotocol +@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) -Iprotocol -Iprotocol/discovery +@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 # hpmud library @HPLIP_BUILD_TRUE@MUDNAME = hpmud -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@libhpmud_la_CFLAGS = -I/usr/include/libusb-1.0 -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\" -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@libhpmud_la_CFLAGS = -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\" -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@libhpmud_la_SOURCES = io/hpmud/hpmud.c io/hpmud/mlc.c io/hpmud/model.c io/hpmud/pml.c \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@ io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/pml.h io/hpmud/dot4.c \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@ io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h io/hpmud/musb.h io/hpmud/musb.c \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@ common/utils.c common/utils.h - -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@libhpmud_la_SOURCES = io/hpmud/hpmud.c io/hpmud/mlc.c io/hpmud/model.c io/hpmud/pml.c \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@ io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/pml.h io/hpmud/dot4.c \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@ io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h io/hpmud/musb.h io/hpmud/musb_libusb01.c \ -@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@ common/utils.c common/utils.h - +@HPLIP_BUILD_TRUE@libhpmud_la_CFLAGS = -DMUDNAME=\"$(MUDNAME)\" \ +@HPLIP_BUILD_TRUE@ -DCONFDIR=\"$(hplip_confdir)\" -Iprotocol \ +@HPLIP_BUILD_TRUE@ -Iprotocol/discovery $(am__append_6) @HPLIP_BUILD_TRUE@libhpmud_la_LDFLAGS = -version-info 0:6:0 -lpthread \ -@HPLIP_BUILD_TRUE@ -ldl $(am__append_2) $(am__append_3) \ -@HPLIP_BUILD_TRUE@ $(am__append_4) +@HPLIP_BUILD_TRUE@ -ldl $(am__append_4) $(am__append_7) \ +@HPLIP_BUILD_TRUE@ $(am__append_8) +@HPLIP_BUILD_TRUE@libhpmud_la_SOURCES = io/hpmud/hpmud.c \ +@HPLIP_BUILD_TRUE@ io/hpmud/mlc.c io/hpmud/model.c \ +@HPLIP_BUILD_TRUE@ io/hpmud/pml.c io/hpmud/hpmud.h \ +@HPLIP_BUILD_TRUE@ io/hpmud/hpmudi.h io/hpmud/list.h \ +@HPLIP_BUILD_TRUE@ io/hpmud/mlc.h io/hpmud/pml.h \ +@HPLIP_BUILD_TRUE@ io/hpmud/dot4.c io/hpmud/dot4.h \ +@HPLIP_BUILD_TRUE@ io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c \ +@HPLIP_BUILD_TRUE@ io/hpmud/pp.h io/hpmud/musb.h common/utils.c \ +@HPLIP_BUILD_TRUE@ common/utils.h $(am__append_3) \ +@HPLIP_BUILD_TRUE@ $(am__append_5) +@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@libhpmud_la_LIBADD = libhpdiscovery.la @HPLIP_BUILD_TRUE@libhpip_la_LDFLAGS = -version-info 0:1:0 @HPLIP_BUILD_TRUE@libhpip_la_LIBADD = -lm @HPLIP_BUILD_TRUE@libhpip_la_SOURCES = ip/xconvolve.c ip/xfax.c ip/xgrayout.c ip/xjpg_dct.c ip/xjpg_fix.c ip/xpad.c ip/xrotate.c ip/xskel.c ip/xtiff.c \ @@ -4685,6 +4768,16 @@ cups_drv = prnt/drv/hpcups.drv @FAX_BUILD_TRUE@@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpcupsfaxppddir = $(hpppddir) @FAX_BUILD_TRUE@@FULL_BUILD_TRUE@@HPIJS_INSTALL_TRUE@@HPLIP_BUILD_TRUE@dist_hpijsfaxppd_DATA = fax/ppd/HP-Fax-hpijs.ppd.gz fax/ppd/HP-Fax2-hpijs.ppd.gz fax/ppd/HP-Fax3-hpijs.ppd.gz fax/ppd/HP-Fax4-hpijs.ppd.gz @FAX_BUILD_TRUE@@FULL_BUILD_TRUE@@HPCUPS_INSTALL_TRUE@@HPLIP_BUILD_TRUE@dist_hpcupsfaxppd_DATA = fax/ppd/HP-Fax-hpcups.ppd.gz fax/ppd/HP-Fax2-hpcups.ppd.gz fax/ppd/HP-Fax3-hpcups.ppd.gz fax/ppd/HP-Fax4-hpcups.ppd.gz + +# AppArmor Changes +@APPARMOR_BUILD_TRUE@@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@apparmor_profiledir = /etc/apparmor.d +@APPARMOR_BUILD_TRUE@@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@apparmor_profile_DATA = apparmor/usr.share.hplip +@APPARMOR_BUILD_TRUE@@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_apparmor_profile_DATA = apparmor/usr.share.hplip +@APPARMOR_BUILD_TRUE@@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@apparmor_abstractiondir = /etc/apparmor.d/abstractions +@APPARMOR_BUILD_TRUE@@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@apparmor_abstraction_DATA = apparmor/abstractions/hplip +@APPARMOR_BUILD_TRUE@@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_apparmor_abstraction_DATA = apparmor/abstractions/hplip +@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 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ptest_SOURCES = pcard/ptest.c pcard/ptest.h pcard/fat.c pcard/fat.h @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ptest_LDADD = libhpmud.la @@ -4769,9 +4862,11 @@ cups_drv = prnt/drv/hpcups.drv @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpmudext_LTLIBRARIES = hpmudext.la @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpmudext_la_LDFLAGS = -module -avoid-version @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpmudext_la_SOURCES = io/mudext/hpmudext.c -@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpmudext_la_LIBADD = libhpmud.la -@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@hpmudext_la_CFLAGS = -I/usr/include/libusb-1.0 -I$(PYTHONINCLUDEDIR) -@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpmudext_la_LIBADD = libhpmud.la libhpdiscovery.la +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpmudext_la_CFLAGS = \ +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ -I$(PYTHONINCLUDEDIR) \ +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ -Iprotocol/discovery \ +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ $(am__append_13) # ui (qt3) @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@uidir = $(hplipdir)/ui @@ -4949,8 +5044,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpijs # PPDs ppddir = $(hpppddir) -dist_ppd_DATA = $(foomatic_ps_printers) $(am__append_11) \ - $(am__append_12) +dist_ppd_DATA = $(foomatic_ps_printers) $(am__append_16) \ + $(am__append_17) @FOOMATIC_DRV_INSTALL_TRUE@cupsdrvdir = $(drvdir) @FOOMATIC_DRV_INSTALL_TRUE@cupsdrv_DATA = $(foomatic_drv) @CUPS_DRV_INSTALL_TRUE@cupsdrv2dir = $(drvdir) @@ -5208,6 +5303,8 @@ hpmudext.la: $(hpmudext_la_OBJECTS) $(hpmudext_la_DEPENDENCIES) $(hpmudext_la_LINK) $(am_hpmudext_la_rpath) $(hpmudext_la_OBJECTS) $(hpmudext_la_LIBADD) $(LIBS) libapdk.la: $(libapdk_la_OBJECTS) $(libapdk_la_DEPENDENCIES) $(libapdk_la_LINK) $(libapdk_la_OBJECTS) $(libapdk_la_LIBADD) $(LIBS) +libhpdiscovery.la: $(libhpdiscovery_la_OBJECTS) $(libhpdiscovery_la_DEPENDENCIES) + $(libhpdiscovery_la_LINK) $(am_libhpdiscovery_la_rpath) $(libhpdiscovery_la_OBJECTS) $(libhpdiscovery_la_LIBADD) $(LIBS) libhpip.la: $(libhpip_la_OBJECTS) $(libhpip_la_DEPENDENCIES) $(libhpip_la_LINK) $(am_libhpip_la_rpath) $(libhpip_la_OBJECTS) $(libhpip_la_LIBADD) $(LIBS) libhpipp.la: $(libhpipp_la_OBJECTS) $(libhpipp_la_DEPENDENCIES) @@ -5796,6 +5893,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)/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@ @@ -5809,6 +5907,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhpmud_la-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_hpaio_la-bb_ledm.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_hpaio_la-common.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_hpaio_la-escl.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_hpaio_la-hpaio.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_hpaio_la-http.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsane_hpaio_la-io.Plo@am__quote@ @@ -5914,6 +6013,13 @@ 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@ +@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 + 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 @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xconvolve.Tpo $(DEPDIR)/xconvolve.Plo @@ -6180,13 +6286,6 @@ libhpmud_la-pp.lo: io/hpmud/pp.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) $(libhpmud_la_CFLAGS) $(CFLAGS) -c -o libhpmud_la-pp.lo `test -f 'io/hpmud/pp.c' || echo '$(srcdir)/'`io/hpmud/pp.c -libhpmud_la-musb.lo: io/hpmud/musb.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhpmud_la_CFLAGS) $(CFLAGS) -MT libhpmud_la-musb.lo -MD -MP -MF $(DEPDIR)/libhpmud_la-musb.Tpo -c -o libhpmud_la-musb.lo `test -f 'io/hpmud/musb.c' || echo '$(srcdir)/'`io/hpmud/musb.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libhpmud_la-musb.Tpo $(DEPDIR)/libhpmud_la-musb.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='io/hpmud/musb.c' object='libhpmud_la-musb.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) $(libhpmud_la_CFLAGS) $(CFLAGS) -c -o libhpmud_la-musb.lo `test -f 'io/hpmud/musb.c' || echo '$(srcdir)/'`io/hpmud/musb.c - libhpmud_la-utils.lo: common/utils.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhpmud_la_CFLAGS) $(CFLAGS) -MT libhpmud_la-utils.lo -MD -MP -MF $(DEPDIR)/libhpmud_la-utils.Tpo -c -o libhpmud_la-utils.lo `test -f 'common/utils.c' || echo '$(srcdir)/'`common/utils.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libhpmud_la-utils.Tpo $(DEPDIR)/libhpmud_la-utils.Plo @@ -6201,6 +6300,13 @@ libhpmud_la-musb_libusb01.lo: io/hpmud/musb_libusb01.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) $(libhpmud_la_CFLAGS) $(CFLAGS) -c -o libhpmud_la-musb_libusb01.lo `test -f 'io/hpmud/musb_libusb01.c' || echo '$(srcdir)/'`io/hpmud/musb_libusb01.c +libhpmud_la-musb.lo: io/hpmud/musb.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhpmud_la_CFLAGS) $(CFLAGS) -MT libhpmud_la-musb.lo -MD -MP -MF $(DEPDIR)/libhpmud_la-musb.Tpo -c -o libhpmud_la-musb.lo `test -f 'io/hpmud/musb.c' || echo '$(srcdir)/'`io/hpmud/musb.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libhpmud_la-musb.Tpo $(DEPDIR)/libhpmud_la-musb.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='io/hpmud/musb.c' object='libhpmud_la-musb.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) $(libhpmud_la_CFLAGS) $(CFLAGS) -c -o libhpmud_la-musb.lo `test -f 'io/hpmud/musb.c' || echo '$(srcdir)/'`io/hpmud/musb.c + libsane_hpaio_la-hpaio.lo: scan/sane/hpaio.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsane_hpaio_la_CFLAGS) $(CFLAGS) -MT libsane_hpaio_la-hpaio.lo -MD -MP -MF $(DEPDIR)/libsane_hpaio_la-hpaio.Tpo -c -o libsane_hpaio_la-hpaio.lo `test -f 'scan/sane/hpaio.c' || echo '$(srcdir)/'`scan/sane/hpaio.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsane_hpaio_la-hpaio.Tpo $(DEPDIR)/libsane_hpaio_la-hpaio.Plo @@ -6313,6 +6419,13 @@ libsane_hpaio_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) $(libsane_hpaio_la_CFLAGS) $(CFLAGS) -c -o libsane_hpaio_la-utils.lo `test -f 'common/utils.c' || echo '$(srcdir)/'`common/utils.c +libsane_hpaio_la-escl.lo: scan/sane/escl.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsane_hpaio_la_CFLAGS) $(CFLAGS) -MT libsane_hpaio_la-escl.lo -MD -MP -MF $(DEPDIR)/libsane_hpaio_la-escl.Tpo -c -o libsane_hpaio_la-escl.lo `test -f 'scan/sane/escl.c' || echo '$(srcdir)/'`scan/sane/escl.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsane_hpaio_la-escl.Tpo $(DEPDIR)/libsane_hpaio_la-escl.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='scan/sane/escl.c' object='libsane_hpaio_la-escl.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) $(libsane_hpaio_la_CFLAGS) $(CFLAGS) -c -o libsane_hpaio_la-escl.lo `test -f 'scan/sane/escl.c' || echo '$(srcdir)/'`scan/sane/escl.c + pcardext_la-pcardext.lo: pcard/pcardext/pcardext.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcardext_la_CFLAGS) $(CFLAGS) -MT pcardext_la-pcardext.lo -MD -MP -MF $(DEPDIR)/pcardext_la-pcardext.Tpo -c -o pcardext_la-pcardext.lo `test -f 'pcard/pcardext/pcardext.c' || echo '$(srcdir)/'`pcard/pcardext/pcardext.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcardext_la-pcardext.Tpo $(DEPDIR)/pcardext_la-pcardext.Plo @@ -7665,6 +7778,46 @@ clean-libtool: distclean-libtool: -rm -f libtool config.lt +install-apparmor_abstractionDATA: $(apparmor_abstraction_DATA) + @$(NORMAL_INSTALL) + test -z "$(apparmor_abstractiondir)" || $(MKDIR_P) "$(DESTDIR)$(apparmor_abstractiondir)" + @list='$(apparmor_abstraction_DATA)'; test -n "$(apparmor_abstractiondir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(apparmor_abstractiondir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(apparmor_abstractiondir)" || exit $$?; \ + done + +uninstall-apparmor_abstractionDATA: + @$(NORMAL_UNINSTALL) + @list='$(apparmor_abstraction_DATA)'; test -n "$(apparmor_abstractiondir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(apparmor_abstractiondir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(apparmor_abstractiondir)" && rm -f $$files +install-apparmor_profileDATA: $(apparmor_profile_DATA) + @$(NORMAL_INSTALL) + test -z "$(apparmor_profiledir)" || $(MKDIR_P) "$(DESTDIR)$(apparmor_profiledir)" + @list='$(apparmor_profile_DATA)'; test -n "$(apparmor_profiledir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(apparmor_profiledir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(apparmor_profiledir)" || exit $$?; \ + done + +uninstall-apparmor_profileDATA: + @$(NORMAL_UNINSTALL) + @list='$(apparmor_profile_DATA)'; test -n "$(apparmor_profiledir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(apparmor_profiledir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(apparmor_profiledir)" && rm -f $$files install-cupsdrvDATA: $(cupsdrv_DATA) @$(NORMAL_INSTALL) test -z "$(cupsdrvdir)" || $(MKDIR_P) "$(DESTDIR)$(cupsdrvdir)" @@ -7705,6 +7858,46 @@ uninstall-cupsdrv2DATA: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(cupsdrv2dir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(cupsdrv2dir)" && rm -f $$files +install-dist_apparmor_abstractionDATA: $(dist_apparmor_abstraction_DATA) + @$(NORMAL_INSTALL) + test -z "$(apparmor_abstractiondir)" || $(MKDIR_P) "$(DESTDIR)$(apparmor_abstractiondir)" + @list='$(dist_apparmor_abstraction_DATA)'; test -n "$(apparmor_abstractiondir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(apparmor_abstractiondir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(apparmor_abstractiondir)" || exit $$?; \ + done + +uninstall-dist_apparmor_abstractionDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_apparmor_abstraction_DATA)'; test -n "$(apparmor_abstractiondir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(apparmor_abstractiondir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(apparmor_abstractiondir)" && rm -f $$files +install-dist_apparmor_profileDATA: $(dist_apparmor_profile_DATA) + @$(NORMAL_INSTALL) + test -z "$(apparmor_profiledir)" || $(MKDIR_P) "$(DESTDIR)$(apparmor_profiledir)" + @list='$(dist_apparmor_profile_DATA)'; test -n "$(apparmor_profiledir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(apparmor_profiledir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(apparmor_profiledir)" || exit $$?; \ + done + +uninstall-dist_apparmor_profileDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_apparmor_profile_DATA)'; test -n "$(apparmor_profiledir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(apparmor_profiledir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(apparmor_profiledir)" && rm -f $$files install-dist_baseDATA: $(dist_base_DATA) @$(NORMAL_INSTALL) test -z "$(basedir)" || $(MKDIR_P) "$(DESTDIR)$(basedir)" @@ -8385,6 +8578,26 @@ uninstall-dist_scanDATA: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(scandir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(scandir)" && rm -f $$files +install-dist_selinuxDATA: $(dist_selinux_DATA) + @$(NORMAL_INSTALL) + test -z "$(selinuxdir)" || $(MKDIR_P) "$(DESTDIR)$(selinuxdir)" + @list='$(dist_selinux_DATA)'; test -n "$(selinuxdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(selinuxdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(selinuxdir)" || exit $$?; \ + done + +uninstall-dist_selinuxDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_selinux_DATA)'; test -n "$(selinuxdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(selinuxdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(selinuxdir)" && rm -f $$files install-dist_uiDATA: $(dist_ui_DATA) @$(NORMAL_INSTALL) test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @@ -8791,7 +9004,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) install-binPROGRAMS: install-libLTLIBRARIES installdirs: - for dir in "$(DESTDIR)$(cupsextdir)" "$(DESTDIR)$(hpmudextdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libsane_hpaiodir)" "$(DESTDIR)$(pcardextdir)" "$(DESTDIR)$(scanextdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(hpdir)" "$(DESTDIR)$(hpcupsdir)" "$(DESTDIR)$(hpcupsfaxdir)" "$(DESTDIR)$(cmddir)" "$(DESTDIR)$(findir)" "$(DESTDIR)$(hpfaxdir)" "$(DESTDIR)$(hplipdir)" "$(DESTDIR)$(plugins4dir)" "$(DESTDIR)$(ripdir)" "$(DESTDIR)$(pstotiffdir)" "$(DESTDIR)$(cupsdrvdir)" "$(DESTDIR)$(cupsdrv2dir)" "$(DESTDIR)$(basedir)" "$(DESTDIR)$(basepexpectdir)" "$(DESTDIR)$(copierdir)" "$(DESTDIR)$(faxdir)" "$(DESTDIR)$(fax_filtersdir)" "$(DESTDIR)$(halpredir)" "$(DESTDIR)$(homedir)" "$(DESTDIR)$(hpcupsfaxppddir)" "$(DESTDIR)$(hpijsfaxppddir)" "$(DESTDIR)$(hplip_statedir)" "$(DESTDIR)$(images_128x128dir)" "$(DESTDIR)$(images_16x16dir)" "$(DESTDIR)$(images_24x24dir)" "$(DESTDIR)$(images_256x256dir)" "$(DESTDIR)$(images_32x32dir)" "$(DESTDIR)$(images_64x64dir)" "$(DESTDIR)$(images_devicesdir)" "$(DESTDIR)$(images_otherdir)" "$(DESTDIR)$(installdir)" "$(DESTDIR)$(ldldir)" "$(DESTDIR)$(localzdir)" "$(DESTDIR)$(modelsdir)" "$(DESTDIR)$(pcarddir)" "$(DESTDIR)$(pcldir)" "$(DESTDIR)$(pluginsdir)" "$(DESTDIR)$(policykit_dbus_etcdir)" "$(DESTDIR)$(policykit_dbus_sharedir)" "$(DESTDIR)$(policykit_policydir)" "$(DESTDIR)$(postscriptdir)" "$(DESTDIR)$(ppddir)" "$(DESTDIR)$(prntdir)" "$(DESTDIR)$(rulesdir)" "$(DESTDIR)$(rulessystemdir)" "$(DESTDIR)$(scandir)" "$(DESTDIR)$(uidir)" "$(DESTDIR)$(ui4dir)" "$(DESTDIR)$(unreldir)" "$(DESTDIR)$(www0dir)" "$(DESTDIR)$(www3dir)" "$(DESTDIR)$(www4dir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(hplip_confdir)" "$(DESTDIR)$(hplip_desktopdir)" "$(DESTDIR)$(hplip_systraydir)"; do \ + for dir in "$(DESTDIR)$(cupsextdir)" "$(DESTDIR)$(hpmudextdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libsane_hpaiodir)" "$(DESTDIR)$(pcardextdir)" "$(DESTDIR)$(scanextdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(hpdir)" "$(DESTDIR)$(hpcupsdir)" "$(DESTDIR)$(hpcupsfaxdir)" "$(DESTDIR)$(cmddir)" "$(DESTDIR)$(findir)" "$(DESTDIR)$(hpfaxdir)" "$(DESTDIR)$(hplipdir)" "$(DESTDIR)$(plugins4dir)" "$(DESTDIR)$(ripdir)" "$(DESTDIR)$(pstotiffdir)" "$(DESTDIR)$(apparmor_abstractiondir)" "$(DESTDIR)$(apparmor_profiledir)" "$(DESTDIR)$(cupsdrvdir)" "$(DESTDIR)$(cupsdrv2dir)" "$(DESTDIR)$(apparmor_abstractiondir)" "$(DESTDIR)$(apparmor_profiledir)" "$(DESTDIR)$(basedir)" "$(DESTDIR)$(basepexpectdir)" "$(DESTDIR)$(copierdir)" "$(DESTDIR)$(faxdir)" "$(DESTDIR)$(fax_filtersdir)" "$(DESTDIR)$(halpredir)" "$(DESTDIR)$(homedir)" "$(DESTDIR)$(hpcupsfaxppddir)" "$(DESTDIR)$(hpijsfaxppddir)" "$(DESTDIR)$(hplip_statedir)" "$(DESTDIR)$(images_128x128dir)" "$(DESTDIR)$(images_16x16dir)" "$(DESTDIR)$(images_24x24dir)" "$(DESTDIR)$(images_256x256dir)" "$(DESTDIR)$(images_32x32dir)" "$(DESTDIR)$(images_64x64dir)" "$(DESTDIR)$(images_devicesdir)" "$(DESTDIR)$(images_otherdir)" "$(DESTDIR)$(installdir)" "$(DESTDIR)$(ldldir)" "$(DESTDIR)$(localzdir)" "$(DESTDIR)$(modelsdir)" "$(DESTDIR)$(pcarddir)" "$(DESTDIR)$(pcldir)" "$(DESTDIR)$(pluginsdir)" "$(DESTDIR)$(policykit_dbus_etcdir)" "$(DESTDIR)$(policykit_dbus_sharedir)" "$(DESTDIR)$(policykit_policydir)" "$(DESTDIR)$(postscriptdir)" "$(DESTDIR)$(ppddir)" "$(DESTDIR)$(prntdir)" "$(DESTDIR)$(rulesdir)" "$(DESTDIR)$(rulessystemdir)" "$(DESTDIR)$(scandir)" "$(DESTDIR)$(selinuxdir)" "$(DESTDIR)$(uidir)" "$(DESTDIR)$(ui4dir)" "$(DESTDIR)$(unreldir)" "$(DESTDIR)$(www0dir)" "$(DESTDIR)$(www3dir)" "$(DESTDIR)$(www4dir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(hplip_confdir)" "$(DESTDIR)$(hplip_desktopdir)" "$(DESTDIR)$(hplip_systraydir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -8848,8 +9061,11 @@ info: info-am info-am: -install-data-am: install-cupsdrv2DATA install-cupsdrvDATA \ - install-cupsextLTLIBRARIES install-dist_baseDATA \ +install-data-am: install-apparmor_abstractionDATA \ + install-apparmor_profileDATA install-cupsdrv2DATA \ + install-cupsdrvDATA install-cupsextLTLIBRARIES \ + install-dist_apparmor_abstractionDATA \ + install-dist_apparmor_profileDATA install-dist_baseDATA \ install-dist_basepexpectDATA install-dist_cmdSCRIPTS \ install-dist_copierDATA install-dist_faxDATA \ install-dist_fax_filtersDATA install-dist_finSCRIPTS \ @@ -8870,15 +9086,15 @@ install-data-am: install-cupsdrv2DATA install-cupsdrvDATA \ install-dist_ppdDATA install-dist_prntDATA \ install-dist_ripSCRIPTS install-dist_rulesDATA \ install-dist_rulessystemDATA install-dist_scanDATA \ - install-dist_ui4DATA install-dist_uiDATA \ - install-dist_unrelDATA install-dist_www0DATA \ - install-dist_www3DATA install-dist_www4DATA install-docDATA \ - install-hpPROGRAMS install-hpcupsPROGRAMS \ - install-hpcupsfaxPROGRAMS install-hplip_confDATA \ - install-hplip_desktopDATA install-hplip_systrayDATA \ - install-hpmudextLTLIBRARIES install-libsane_hpaioLTLIBRARIES \ - install-pcardextLTLIBRARIES install-pstotiffSCRIPTS \ - install-scanextLTLIBRARIES + install-dist_selinuxDATA install-dist_ui4DATA \ + install-dist_uiDATA install-dist_unrelDATA \ + install-dist_www0DATA install-dist_www3DATA \ + install-dist_www4DATA install-docDATA install-hpPROGRAMS \ + install-hpcupsPROGRAMS install-hpcupsfaxPROGRAMS \ + install-hplip_confDATA install-hplip_desktopDATA \ + install-hplip_systrayDATA install-hpmudextLTLIBRARIES \ + install-libsane_hpaioLTLIBRARIES install-pcardextLTLIBRARIES \ + install-pstotiffSCRIPTS install-scanextLTLIBRARIES @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-am @@ -8927,15 +9143,19 @@ ps: ps-am ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-cupsdrv2DATA \ - uninstall-cupsdrvDATA uninstall-cupsextLTLIBRARIES \ - uninstall-dist_baseDATA uninstall-dist_basepexpectDATA \ - uninstall-dist_cmdSCRIPTS uninstall-dist_copierDATA \ - uninstall-dist_faxDATA uninstall-dist_fax_filtersDATA \ - uninstall-dist_finSCRIPTS uninstall-dist_halpreDATA \ - uninstall-dist_homeDATA uninstall-dist_hpcupsfaxppdDATA \ - uninstall-dist_hpfaxSCRIPTS uninstall-dist_hpijsfaxppdDATA \ - uninstall-dist_hplipSCRIPTS uninstall-dist_hplip_stateDATA \ +uninstall-am: uninstall-apparmor_abstractionDATA \ + uninstall-apparmor_profileDATA uninstall-binPROGRAMS \ + uninstall-cupsdrv2DATA uninstall-cupsdrvDATA \ + uninstall-cupsextLTLIBRARIES \ + uninstall-dist_apparmor_abstractionDATA \ + uninstall-dist_apparmor_profileDATA uninstall-dist_baseDATA \ + uninstall-dist_basepexpectDATA uninstall-dist_cmdSCRIPTS \ + uninstall-dist_copierDATA uninstall-dist_faxDATA \ + uninstall-dist_fax_filtersDATA uninstall-dist_finSCRIPTS \ + uninstall-dist_halpreDATA uninstall-dist_homeDATA \ + uninstall-dist_hpcupsfaxppdDATA uninstall-dist_hpfaxSCRIPTS \ + uninstall-dist_hpijsfaxppdDATA uninstall-dist_hplipSCRIPTS \ + uninstall-dist_hplip_stateDATA \ uninstall-dist_images_128x128DATA \ uninstall-dist_images_16x16DATA \ uninstall-dist_images_24x24DATA \ @@ -8954,10 +9174,11 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsdrv2DATA \ uninstall-dist_postscriptDATA uninstall-dist_ppdDATA \ uninstall-dist_prntDATA uninstall-dist_ripSCRIPTS \ uninstall-dist_rulesDATA uninstall-dist_rulessystemDATA \ - uninstall-dist_scanDATA uninstall-dist_ui4DATA \ - uninstall-dist_uiDATA uninstall-dist_unrelDATA \ - uninstall-dist_www0DATA uninstall-dist_www3DATA \ - uninstall-dist_www4DATA uninstall-docDATA uninstall-hpPROGRAMS \ + uninstall-dist_scanDATA uninstall-dist_selinuxDATA \ + uninstall-dist_ui4DATA uninstall-dist_uiDATA \ + uninstall-dist_unrelDATA uninstall-dist_www0DATA \ + uninstall-dist_www3DATA uninstall-dist_www4DATA \ + uninstall-docDATA uninstall-hpPROGRAMS \ uninstall-hpcupsPROGRAMS uninstall-hpcupsfaxPROGRAMS \ uninstall-hplip_confDATA uninstall-hplip_desktopDATA \ uninstall-hplip_systrayDATA uninstall-hpmudextLTLIBRARIES \ @@ -8979,10 +9200,12 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsdrv2DATA \ dist-xz dist-zip distcheck distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags \ distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-cupsdrv2DATA install-cupsdrvDATA \ + html-am info info-am install install-am \ + install-apparmor_abstractionDATA install-apparmor_profileDATA \ + install-binPROGRAMS install-cupsdrv2DATA install-cupsdrvDATA \ install-cupsextLTLIBRARIES install-data install-data-am \ - install-data-hook install-dist_baseDATA \ + install-data-hook install-dist_apparmor_abstractionDATA \ + install-dist_apparmor_profileDATA install-dist_baseDATA \ install-dist_basepexpectDATA install-dist_cmdSCRIPTS \ install-dist_copierDATA install-dist_faxDATA \ install-dist_fax_filtersDATA install-dist_finSCRIPTS \ @@ -9003,25 +9226,29 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsdrv2DATA \ install-dist_ppdDATA install-dist_prntDATA \ install-dist_ripSCRIPTS install-dist_rulesDATA \ install-dist_rulessystemDATA install-dist_scanDATA \ - install-dist_ui4DATA install-dist_uiDATA \ - install-dist_unrelDATA install-dist_www0DATA \ - install-dist_www3DATA install-dist_www4DATA install-docDATA \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-hpPROGRAMS install-hpcupsPROGRAMS \ - install-hpcupsfaxPROGRAMS install-hplip_confDATA \ - install-hplip_desktopDATA install-hplip_systrayDATA \ - install-hpmudextLTLIBRARIES install-html install-html-am \ - install-info install-info-am install-libLTLIBRARIES \ - install-libsane_hpaioLTLIBRARIES install-man \ - install-pcardextLTLIBRARIES install-pdf install-pdf-am \ - install-ps install-ps-am install-pstotiffSCRIPTS \ - install-scanextLTLIBRARIES install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ + install-dist_selinuxDATA install-dist_ui4DATA \ + install-dist_uiDATA install-dist_unrelDATA \ + install-dist_www0DATA install-dist_www3DATA \ + install-dist_www4DATA install-docDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-hpPROGRAMS \ + install-hpcupsPROGRAMS install-hpcupsfaxPROGRAMS \ + install-hplip_confDATA install-hplip_desktopDATA \ + install-hplip_systrayDATA install-hpmudextLTLIBRARIES \ + install-html install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-libsane_hpaioLTLIBRARIES \ + install-man install-pcardextLTLIBRARIES install-pdf \ + install-pdf-am install-ps install-ps-am \ + install-pstotiffSCRIPTS install-scanextLTLIBRARIES \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-apparmor_abstractionDATA \ + uninstall-apparmor_profileDATA uninstall-binPROGRAMS \ uninstall-cupsdrv2DATA uninstall-cupsdrvDATA \ - uninstall-cupsextLTLIBRARIES uninstall-dist_baseDATA \ + uninstall-cupsextLTLIBRARIES \ + uninstall-dist_apparmor_abstractionDATA \ + uninstall-dist_apparmor_profileDATA uninstall-dist_baseDATA \ uninstall-dist_basepexpectDATA uninstall-dist_cmdSCRIPTS \ uninstall-dist_copierDATA uninstall-dist_faxDATA \ uninstall-dist_fax_filtersDATA uninstall-dist_finSCRIPTS \ @@ -9047,15 +9274,15 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsdrv2DATA \ uninstall-dist_postscriptDATA uninstall-dist_ppdDATA \ uninstall-dist_prntDATA uninstall-dist_ripSCRIPTS \ uninstall-dist_rulesDATA uninstall-dist_rulessystemDATA \ - uninstall-dist_scanDATA uninstall-dist_ui4DATA \ - uninstall-dist_uiDATA uninstall-dist_unrelDATA \ - uninstall-dist_www0DATA uninstall-dist_www3DATA \ - uninstall-dist_www4DATA uninstall-docDATA uninstall-hook \ - uninstall-hpPROGRAMS uninstall-hpcupsPROGRAMS \ - uninstall-hpcupsfaxPROGRAMS uninstall-hplip_confDATA \ - uninstall-hplip_desktopDATA uninstall-hplip_systrayDATA \ - uninstall-hpmudextLTLIBRARIES uninstall-libLTLIBRARIES \ - uninstall-libsane_hpaioLTLIBRARIES \ + uninstall-dist_scanDATA uninstall-dist_selinuxDATA \ + uninstall-dist_ui4DATA uninstall-dist_uiDATA \ + uninstall-dist_unrelDATA uninstall-dist_www0DATA \ + uninstall-dist_www3DATA uninstall-dist_www4DATA \ + uninstall-docDATA uninstall-hook uninstall-hpPROGRAMS \ + uninstall-hpcupsPROGRAMS uninstall-hpcupsfaxPROGRAMS \ + uninstall-hplip_confDATA uninstall-hplip_desktopDATA \ + uninstall-hplip_systrayDATA uninstall-hpmudextLTLIBRARIES \ + uninstall-libLTLIBRARIES uninstall-libsane_hpaioLTLIBRARIES \ uninstall-pcardextLTLIBRARIES uninstall-pstotiffSCRIPTS \ uninstall-scanextLTLIBRARIES @@ -9086,9 +9313,16 @@ install-data-hook: @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ mv $(DESTDIR)$(hpfaxdir)/hpfax.py $(DESTDIR)$(hpfaxdir)/hpfax; \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ chmod 700 $(DESTDIR)$(hpfaxdir)/hpfax; \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ fi -# + +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ if [ "$(apparmor_build)" = "yes" ];then \ +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ chmod 644 $(DESTDIR)$(apparmor_profiledir)/usr.share.hplip;\ +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ chmod 644 $(DESTDIR)$(apparmor_profiledir)/abstractions/hplip;\ +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ fi + # Make backend run as root. -# chmod 700 $(DESTDIR)$(hpdir)/hp +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ chmod 700 $(DESTDIR)$(hpdir)/hp + +#AppArmor uninstall-hook: # Remove hp-xxx commands. @@ -9099,6 +9333,9 @@ uninstall-hook: # # Remove fax support. @HPLIP_BUILD_TRUE@ rm -f $(DESTDIR)$(hpfaxdir)/hpfax +# Remove apparmor profiles +@HPLIP_BUILD_TRUE@ rm -f $(DESTDIR)$(apparmor_profiledir)/usr.share.hplip +@HPLIP_BUILD_TRUE@ rm -f $(DESTDIR)$(apparmor_profiledir)/abstractions/hplip rpm: @FULL_BUILD_TRUE@ epm -f rpm hplipfull hplip.list diff --git a/__init__.py b/__init__.py index 410f33251..724f2acca 100644 --- a/__init__.py +++ b/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/apparmor/abstractions/hplip b/apparmor/abstractions/hplip new file mode 100644 index 000000000..5675798f3 --- /dev/null +++ b/apparmor/abstractions/hplip @@ -0,0 +1,87 @@ +#include <abstractions/base> +#include <abstractions/authentication> +#include <abstractions/cups-client> +#include <abstractions/dbus-accessibility> +#include <abstractions/dbus-session> +#include <abstractions/fonts> +#include <abstractions/dconf> +#include <abstractions/python> +# #include <abstractions/ubuntu-browsers.d/plugins-common> +# #include <abstractions/ubuntu-browsers.d/java> +#include <abstractions/gnome> +#include <abstractions/nameservice> +#include <abstractions/openssl> + +/usr/{,local/}bin/python[2-3].[0-9] ix, + +/etc/ r, +/etc/** r, +/var/ r, +/bin/bash ix, +/etc/hp/hplip.conf r, +/tmp/* rw, +owner @{HOME} r, +owner @{HOME}/** rw, +/dev/** rw, +/usr/share/** r, +@{sys}/** r, +/usr/** r, +/bin/ r, +/sbin/ r, +/bin/** r, +/sbin/** r, +/usr/bin/lsusb Ux, +network, +@{PROC}/@{pid}/** r, +@{PROC}/** r, +owner /{,var/}run/user/*/dconf/user w, +owner @{HOME}/.config/dconf/user w, +dbus, + +/{,usr/}bin/cut rix, +/{,usr/}bin/lsb_release rix, +/{,usr/}bin/head rix, +/{,usr/}bin/gawk rix, +/{,usr/}bin/cat rix, +/{,usr/}bin/ldconfig rix, +/{,usr/}bin/gs rix, +/{,usr/}bin/libtool rix, +/{,usr/}bin/scanimage rix, +/{,usr/}bin/xsane rix, +/{,usr/}bin/lpstat rix, +/{,usr/}bin/g[c+][c+]* rix, +/{,usr/}bin/make rix, +/{,usr/}bin/ps rix, +/{,usr/}bin/file rix, +/{,usr/}bin/cups-config rix, +/{,usr/}bin/uname rix, +/sbin/ldconfig rix, +/usr/lib{32,64}/** mra, +/{,usr/}bin/sed rix, +/{,usr/}bin/grep rix, +@{PROC}/** r, +/{,usr/}bin/dirname rix, +/{,usr/}bin/pkexec rix, +/{,usr/}bin/wget rix, +/{,usr/}bin/avahi-browse rix, +/{,usr/}bin/bus-daemon rix, +/{,usr/}bin/openssl rix, +/{,usr/}bin/net-snmp-config rix, +/{,usr/}bin/sane-config rix, +/{,usr/}bin/stty rix, +/{,usr/}bin/dash rix, + +# HPLIP +/usr/{,local/}share/hplip/** rw, +@{HOME}/** rak, +@{HOME}/Downloads/** w, +@{HOME}/.hplip/** rwk, +/var/lib/hp/** rw, +/var/lib/** rw, +/var/* rwk, +/usr/{,local/}share/hplip/fax/plugins/* mr, +/usr/{,local/}share/hplip/scan/plugins/* mr, +/usr/{,local/}share/hplip/prnt/plugins/* mr, +/{,usr/}bin/sudo rix, +/{,usr/}bin/su rix, +/run/** rw, diff --git a/apparmor/usr.share.hplip b/apparmor/usr.share.hplip new file mode 100644 index 000000000..796770716 --- /dev/null +++ b/apparmor/usr.share.hplip @@ -0,0 +1,262 @@ +# Last Modified: Wed Jun 3 14:45:18 2015 +#include <tunables/global> +#include <tunables/sys> + + + +/usr/share/hplip/plugin.py { + #include <abstractions/bash> + #include <abstractions/hplip> + + capability chown, + capability dac_override, + capability dac_read_search, + capability fowner, + capability fsetid, + capability ipc_lock, + capability sys_nice, + capability setuid, + capability setgid, + capability sys_resource, + capability audit_write, + capability net_admin, + /{,usr/}bin/gpg rUx, + /{,usr/}bin/gpg2 rUx, + /{,usr/}bin/chmod rix, + /{,usr/}bin/xauth rix, + /run/utmp rw, + /bin/true rix, + /bin/dash rix, + /bin/dd rix, + /bin/df rix, + /bin/gzip rix, + /{,usr/}bin/mkdir rix, + /bin/ping rix, + /bin/tar rix, + /bin/uname rix, + /{,usr/}bin/which rix, + / r, + /etc/ r, + /home/ r, + /home/*/ ra, + /home/*/** ra, + /home/*/.Xauthority r, + /run/dbus/* rw, + /{,usr/}bin/basename rix, + /{,usr/}bin/cksum rix, + /{,usr/}bin/cut rix, + /{,usr/}bin/expr rix, + /{,usr/}bin/file rix, + /{,usr/}bin/gpg rUx, + /{,usr/}bin/head rix, + /{,usr/}bin/[gm]awk rix, + /{,usr/}bin/md5sum rix, + /{,usr/}bin/tail rix, + /{,usr/}bin/tr rix, + /{,usr/}bin/wc rix, + /{,usr/}bin/wget rix, + /{,usr/}bin/getopt rix, + /{,usr/}lib{,32,64}/** mra, + /var/hp-plugin.lock rw, + @{HOME}/.hplip/** rwix, + /{,usr/}bin/cat rix, + /{,usr/}bin/lsb_release rix, + /{,usr/}bin/sed rix, + /{,usr/}bin/dd rix, + /{,usr/}bin/gzip rix, + /{,usr/}bin/df rix, + /{,usr/}bin/chown rix, + /{,usr/}bin/id rix, + /{,usr/}bin/chgrp rix, + /{,usr/}bin/rm rix, + /{,usr/}bin/sudo rix, + /{,usr/}bin/su rix, + /usr/lib{,32,64}/python{2.[4-7],3.[0-4]}/**.{pyc,so} rw, +} + + + +/usr/share/hplip/sendfax.py { + #include <abstractions/hplip> + #include <abstractions/ibus> + #include <abstractions/p11-kit> + + /bin/ r, + /bin/dash ix, + /etc/cups/ r, + /etc/cups/ppd/** r, + /etc/cups/raw.convs r, + /etc/fonts/** r, + /etc/fstab r, + /etc/nsswitch.conf r, + /etc/passwd r, + /etc/python[2-3].[0-9]/sitecustomize.py r, + /etc/xdg/Trolltech.conf r, + /home/*/ r, + /home/*/** rw, + /home/*/.ICEauthority r, + /home/*/.cache/fontconfig/** rw, + /home/*/.config/Trolltech.conf r, + /home/*/.hplip/hplip.conf r, + /proc/*/cmdline r, + /proc/*/mounts r, + /proc/filesystems r, + /proc/meminfo r, + /run/user/1000/dconf/user rw, + /run/** r, + /sbin/ r, + /etc/ r, + /{,usr/}bin/ r, + /usr/lib{,32,64}/** ra, + /usr/local/bin/ r, + /usr/local/lib/python2.7/dist-packages/ r, + /usr/local/sbin/ r, + /usr/local/share/fonts/ r, + /usr/sbin/ r, + /usr/share/cups/mime/ r, + /usr/share/cups/mime/cupsfilters.convs r, + /usr/share/cups/mime/mime.convs r, + /usr/share/cups/mime/pstotiff.convs r, + /usr/share/fontconfig/conf.avail/90-fonts-nanum.conf r, + /usr/share/fonts/ r, + /usr/share/fonts/** r, + /usr/share/glib-2.0/schemas/gschemas.compiled r, + /usr/share/gvfs/remote-volume-monitors/ r, + /usr/share/gvfs/remote-volume-monitors/afc.monitor r, + /usr/share/gvfs/remote-volume-monitors/gphoto2.monitor r, + /usr/share/gvfs/remote-volume-monitors/mtp.monitor r, + /usr/share/gvfs/remote-volume-monitors/udisks2.monitor r, + /usr/share/icons/ r, + /usr/share/icons/** r, + /usr/share/poppler/cMap/** r, + /var/cache/fontconfig/** rw, + /var/lib/snmp/mib_indexes/ a, + @{PROC}/[0-9]*/net/dev r, + @{PROC}/[0-9]*/net/if_inet6 r, + @{PROC}/[0-9]*/net/ipv6_route r, + @{PROC}/[0-9]*/net/wireless r, + /{,usr/}bin/stty rix, + +} +/usr/share/hplip/setup.py { + #include <abstractions/hplip> + capability dac_override, + capability dac_read_search, + /usr/share/hplip/plugin.py Px, + /run/cups/certs/* r, + /run/dbus/system_bus_socket rw, + /{,usr/}bin/file rix, + /usr/bin/lpr rix, + /usr/lib{,32,64}/python{2.[4-7],3.[0-4]}/**.{pyc,so} rw, + /var/lib/** rw, + /usr/share/hplip/testpage.py rix, + /run/udev/** r, + +} +/usr/share/hplip/systray.py { + #include <abstractions/hplip> + /usr/share/hplip/toolbox.py Px, + /usr/share/hplip/diagnose_plugin.py rix, + /usr/share/hplip/plugin.py Px, + /usr/share/hplip/upgrade.py rix, + /usr/lib/libproxy-0.4.11/pxgsettings rix, + #/usr/share/hplip/upgrade.py rix, + /usr/bin/xdg-open rix, + /usr/bin/gvfs-open rix, + /usr/bin/which rix, + /run/dbus/* rw, + /usr/** mra, + /usr/lib/python[2-3].[0-9]/** rw, + /usr/share/hplip/sendfax.py ix, + /var/lib/snmp/mib_indexes/ a, + /var/cache/** r, + #/usr/lib/firefox/firefox.sh rix, + /run/udev/** r, + +} + + +/usr/share/hplip/toolbox.py { + #include <abstractions/hplip> + /dev/ r, + /usr/share/hplip/doctor.py rix, + /run/dbus/system_bus_socket rw, + /usr/share/hplip/fab.py rix, + /usr/lib/libproxy-0.4.11/pxgsettings rix, + /usr/share/hplip/upgrade.py rix, + /usr/bin/xdg-open rix, + /usr/bin/gvfs-open rix, + /usr/lib/firefox/firefox.sh rix, + /usr/lib/firefox/firefox rix, + /var/cache/gio-2.0/gnome-defaults.list r, + /usr/share/hplip/diagnose_queues.py rix, + /run/udev/data/** r, + /etc/ r, + /usr/bin/gnome-terminal rix, + /usr/lib/gnome-terminal/gnome-terminal-server rix, + /usr/bin/gnome-terminal.real rix, + /usr/lib/libvte-2.91-0/gnome-pty-helper rix, + /usr/bin/lpr rix, + /usr/bin/simple-scan rix, + /usr/bin/xsane ix, + /usr/lib{,32,64}/** mra, + /usr/share/hplip/plugin.py Px, + /usr/share/hplip/setup.py Px, + /usr/share/hplip/systray.py Px, + /usr/share/hplip/wificonfig.py Ux, + /{,usr/}bin/basename rix, + /{,usr/}bin/cksum rix, + /{,usr/}bin/cut rix, + /{,usr/}bin/expr rix, + /{,usr/}bin/file rix, + /{,usr/}bin/gpg rUx, + /{,usr/}bin/gpg2 rUx, + /{,usr/}bin/head rix, + /{,usr/}bin/[gm]awk rix, + /{,usr/}bin/md5sum rix, + /{,usr/}bin/tail rix, + /{,usr/}bin/tr rix, + /{,usr/}bin/wc rix, + /{,usr/}bin/wget rix, + /{,usr/}bin/getopt rix, + /{,usr/}lib{,32,64}/** mra, + /var/hp-plugin.lock rw, + @{HOME}/.hplip/** rwix, + /{,usr/}bin/cat rix, + /{,usr/}bin/lsb_release rix, + /{,usr/}bin/sed rix, + /{,usr/}bin/dd rix, + /{,usr/}bin/gzip rix, + /{,usr/}bin/df rix, + /{,usr/}bin/chown rix, + /{,usr/}bin/id rix, + /{,usr/}bin/chgrp rix, + /bin/dash rix, + /bin/dd rix, + /bin/df rix, + /bin/gzip rix, + /{,usr/}bin/mkdir rix, + /bin/ping rix, + /bin/tar rix, + /bin/uname rix, + /{,usr/}bin/which rix, + /usr/lib{,32,64}/python{2.[4-7],3.[0-4]}/**.{pyc,so} rw, + /usr/lib{,32,64}/python{2.[4-7],3.[0-4]}/** rw, + /usr/lib/python3.4/** rw, + /var/log/wtmp rw, + /run/utmp rw, + /bin/dash rix, + /bin/grep rix, + /bin/ps rix, + /bin/stty rix, + /bin/uname rix, + /proc/ r, + /proc/sys/kernel/pid_max r, + /proc/uptime r, + /sbin/ldconfig rix, + /sbin/ldconfig.real rix, + /usr/** rix, + /{,usr/}bin/dpkg-architecture rix, + /var/crash/** rw, + /bin/getfacl rix, +} diff --git a/base/LedmWifi.py b/base/LedmWifi.py index a16b2af60..e57193335 100644 --- a/base/LedmWifi.py +++ b/base/LedmWifi.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -548,7 +548,8 @@ def readXmlDataFromURI(dev,URI,xmlRootNode,xmlChildNode,timeout=5): if strResp is not None: code = get_error_code(strResp) if code == HTTP_OK: - strResp = utils.unchunck_xml_data(strResp) + #strResp = utils.unchunck_xml_data(strResp) + strResp = utils.extract_xml_chunk(strResp) pos = strResp.find(xmlRootNode,0,len(strResp)) repstr = strResp[pos:].strip() repstr = repstr.replace('\r',' ').replace('\t',' ').replace('\n',' ') # To remove formating characters from the received xml diff --git a/base/__init__.py b/base/__init__.py index e4b6d285e..ba246ed0f 100644 --- a/base/__init__.py +++ b/base/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/avahi.py b/base/avahi.py index e691eba63..cbd67fae4 100755 --- a/base/avahi.py +++ b/base/avahi.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 20013 Hewlett-Packard Development Company, L.P. +# (c) Copyright 20013 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/codes.py b/base/codes.py index ff29d485f..badda6936 100644 --- a/base/codes.py +++ b/base/codes.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/device.py b/base/device.py index b9c81e324..731a1a741 100644 --- a/base/device.py +++ b/base/device.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/dime.py b/base/dime.py index d0faa4c6b..648d6d90b 100644 --- a/base/dime.py +++ b/base/dime.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/imagesize.py b/base/imagesize.py index 4792be7a7..e8a8ea78d 100644 --- a/base/imagesize.py +++ b/base/imagesize.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/logger.py b/base/logger.py index ee7adef46..949c2f774 100644 --- a/base/logger.py +++ b/base/logger.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2002-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2002-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/magic.py b/base/magic.py index b6ab21cb3..aa79df87e 100644 --- a/base/magic.py +++ b/base/magic.py @@ -8,7 +8,7 @@ # All Rights Reserved # # Modifications by Don Welch -# (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # Redistribution and use in source and binary forms, with or without modification, # are permitted provided that the following conditions are met: diff --git a/base/maint.py b/base/maint.py index 7ccdce85a..ba7fcbef7 100644 --- a/base/maint.py +++ b/base/maint.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/mdns.py b/base/mdns.py index efd2e3d53..03bdb9223 100644 --- a/base/mdns.py +++ b/base/mdns.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/mfpdtf.py b/base/mfpdtf.py index 41dd8acb2..5c0abf070 100644 --- a/base/mfpdtf.py +++ b/base/mfpdtf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/models.py b/base/models.py index c9c07bad0..a1c14e0af 100644 --- a/base/models.py +++ b/base/models.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/module.py b/base/module.py index c71eb4aea..fee611158 100644 --- a/base/module.py +++ b/base/module.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -455,7 +455,7 @@ class Module(object): log.info(log.bold("%s ver. %s" % (self.title, self.version))) log.info("") - log.info("Copyright (c) 2001-15 Hewlett-Packard Development Company, LP") + log.info("Copyright (c) 2001-15 HP Development Company, LP") log.info("This software comes with ABSOLUTELY NO WARRANTY.") log.info("This is free software, and you are welcome to distribute it") log.info("under certain conditions. See COPYING file for more details.") diff --git a/base/os_utils.py b/base/os_utils.py index bc6f8b1c5..7e25a5415 100644 --- a/base/os_utils.py +++ b/base/os_utils.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright @ 2013 Hewlett-Packard Development Company, L.P. +# (c) Copyright @ 2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/password.py b/base/password.py index ac67bbe32..3ca16aea0 100644 --- a/base/password.py +++ b/base/password.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright @ 2013 Hewlett-Packard Development Company, L.P. +# (c) Copyright @ 2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/pkit.py b/base/pkit.py index e7ba5f7fc..f3f1e44d0 100644 --- a/base/pkit.py +++ b/base/pkit.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/pml.py b/base/pml.py index 1bd93b8e2..ef3d115ba 100644 --- a/base/pml.py +++ b/base/pml.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/queues.py b/base/queues.py index 19734d149..13e682416 100755 --- a/base/queues.py +++ b/base/queues.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2011-2014 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2011-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/services.py b/base/services.py index 4c033f0b5..8246ed3bb 100644 --- a/base/services.py +++ b/base/services.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2013 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/sixext.py b/base/sixext.py index f384dd592..0bf4fc4f4 100644 --- a/base/sixext.py +++ b/base/sixext.py @@ -170,7 +170,6 @@ else: import cStringIO StringIO = BytesIO = cStringIO.StringIO - import gobject import commands as subprocess diff --git a/base/slp.py b/base/slp.py index 333c4f043..8e2d8f9a8 100644 --- a/base/slp.py +++ b/base/slp.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/smart_install.py b/base/smart_install.py index 708545469..ed239105e 100755 --- a/base/smart_install.py +++ b/base/smart_install.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright @2013 Hewlett-Packard Development Company, L.P. +# (c) Copyright @2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/status.py b/base/status.py index 313c1b7da..f84c06f89 100644 --- a/base/status.py +++ b/base/status.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1825,8 +1825,10 @@ marker_type_xlate = {'magenta ink' : AGENT_TYPE_MAGENTA, 'yellow ink' : AGENT_TYPE_YELLOW, 'black ink' : AGENT_TYPE_BLACK, 'Black Cartridge' : AGENT_TYPE_BLACK, + 'Magenta Cartridge' : AGENT_TYPE_MAGENTA, + 'Cyan Cartridge' : AGENT_TYPE_CYAN, + 'Yellow Cartridge' : AGENT_TYPE_YELLOW, 'Maintenance Kit' : AGENT_TYPE_NONE, - } marker_leveltrigger_xlate = { 'ok' : AGENT_LEVEL_TRIGGER_SUFFICIENT_0, @@ -1911,8 +1913,11 @@ def StatusTypeIPPAgents(attrs): else: state = 'low' + #match the type if marker-type is something like 'Black Cartridge HP XXXX' + mtype = [v for k,v in marker_type_xlate.items() if attrs['marker-names'][loopcntr].startswith(k)] + entry = { 'kind' : marker_kind_xlate.get(attrs['marker-types'][loopcntr], AGENT_KIND_NONE), - 'type' : marker_type_xlate.get(attrs['marker-names'][loopcntr], AGENT_TYPE_NONE), + 'type' : mtype[0] if len(mtype) > 0 else 0, 'health' : marker_state_xlate.get(state, AGENT_HEALTH_OK), 'level' : attrs['marker-levels'][loopcntr], 'level-trigger' : marker_leveltrigger_xlate.get(state, AGENT_LEVEL_TRIGGER_SUFFICIENT_0), diff --git a/base/strings.py b/base/strings.py index ac1982690..b9cdae551 100644 --- a/base/strings.py +++ b/base/strings.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/tui.py b/base/tui.py index a56535f19..99bda7b9f 100644 --- a/base/tui.py +++ b/base/tui.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/utils.py b/base/utils.py index b17385d01..f1ec1e168 100644 --- a/base/utils.py +++ b/base/utils.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1793,7 +1793,7 @@ encoding: utf8 log.info(text1) log.info(".SH AUTHOR") - log.info("HPLIP (Hewlett-Packard Linux Imaging and Printing) is an") + log.info("HPLIP (HP Linux Imaging and Printing) is an") log.info("HP developed solution for printing, scanning, and faxing with") log.info("HP inkjet and laser based printers in Linux.") @@ -1805,7 +1805,7 @@ encoding: utf8 log.info("contact the HPLIP Team.") log.info(".SH COPYRIGHT") - log.info("Copyright (c) 2001-15 Hewlett-Packard Development Company, L.P.") + log.info("Copyright (c) 2001-15 HP Development Company, L.P.") log.info(".LP") log.info("This software comes with ABSOLUTELY NO WARRANTY.") log.info("This is free software, and you are welcome to distribute it") @@ -1824,7 +1824,7 @@ def log_title(program_name, version, show_ver=True): # TODO: Move to base/module log.info(log.bold("%s ver. %s" % (program_name, version))) log.info("") - log.info("Copyright (c) 2001-15 Hewlett-Packard Development Company, LP") + log.info("Copyright (c) 2001-15 HP Development Company, LP") log.info("This software comes with ABSOLUTELY NO WARRANTY.") log.info("This is free software, and you are welcome to distribute it") log.info("under certain conditions. See COPYING file for more details.") @@ -2355,3 +2355,28 @@ def find_pip(): return 'pip-python' else: log.error("python pip command not found. Please install '%s' package(s) manually"%depends_to_install_using_pip) + + +def check_lan(): + try: + x = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + x.connect(('1.2.3.4', 56)) + x.close() + return True + except socket.error: + return False + +def extract_xml_chunk(data): + if data.find('\r\n\r\n'): + index = data.find('\r\n\r\n') + data = data[index+4:] + if data[0:1] != '<': # Check for source encoding chunked or content length in http respose header. + size = -1 + temp = "" + while size: + index = data.find('\r\n') + size = int(data[0:index+1], 16) + temp = temp + data[index+2:index+2+size] + data = data[index+2+size+2:len(data)] + data = temp + return data diff --git a/base/validation.py b/base/validation.py index 2e498fc87..d555f12a0 100644 --- a/base/validation.py +++ b/base/validation.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2014 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/vcard.py b/base/vcard.py index a4da29e95..f130213cb 100644 --- a/base/vcard.py +++ b/base/vcard.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/base/wifi.py b/base/wifi.py index 337a7fe2b..5ab58ed65 100644 --- a/base/wifi.py +++ b/base/wifi.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/check-plugin.py b/check-plugin.py index 60de3b20b..edc2ac933 100755 --- a/check-plugin.py +++ b/check-plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2011-2014 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2011-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2014 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -180,7 +180,7 @@ class DependenciesCheck(CoreInstall): # self.missing_user_grps = '' self.ui_toolkit = ui_toolkit - self.disable_selinux = False +# self.disable_selinux = False self.req_deps_to_be_installed = [] self.opt_deps_to_be_installed =[] self.cmds_to_be_run = [] @@ -268,8 +268,8 @@ class DependenciesCheck(CoreInstall): return self.cmds_to_be_run - def get_disable_selinux_status(self): - return self.disable_selinux + # def get_disable_selinux_status(self): + # return self.disable_selinux def get_communication_error_devs(self): @@ -684,25 +684,25 @@ class DependenciesCheck(CoreInstall): else: log.info("%-15s %-30s %-15s %-8s %-8s %-8s %s"%("USB", printer_name, "Required","-","-","OK", "Node:'%s' Mode:'%s'"%(devnode,st_mode&0o777))) - selinux_file = '/etc/selinux/config' - if os.path.exists(selinux_file): - tui.header("SELINUX") - try: - selinux_fp = open(selinux_file, 'r') - except IOError: - log.error("Failed to open %s file."%selinux_file) - else: - for line in selinux_fp: - line=re.sub(r'\s','',line) - if line == "SELINUX=enforcing": - self.num_warns += 1 - log.warn("%-12s %-12s %-10s %-3s %-3s %-8s %s" \ - %("SELinux", "enabled", "Optional", "-", "-", "INCOMPAT", "'SELinux needs to be disabled for Plugin printers and Fax functionality.'")) - self.disable_selinux = True - break - if self.disable_selinux == False: - log.info("%-15s %-15s %-10s %-3s %-3s %-8s %s"\ - %("SELinux", "disabled", "Optional", "-", "-", "OK", "-")) + # selinux_file = '/etc/selinux/config' + # if os.path.exists(selinux_file): + # tui.header("SELINUX") + # try: + # selinux_fp = open(selinux_file, 'r') + # except IOError: + # log.error("Failed to open %s file."%selinux_file) + # else: + # for line in selinux_fp: + # line=re.sub(r'\s','',line) + # if line == "SELINUX=enforcing": + # self.num_warns += 1 + # log.warn("%-12s %-12s %-10s %-3s %-3s %-8s %s" \ + # %("SELinux", "enabled", "Optional", "-", "-", "INCOMPAT", "'SELinux needs to be disabled for Plugin printers and Fax functionality.'")) + # self.disable_selinux = True + # break + # if self.disable_selinux == False: + # log.info("%-15s %-15s %-10s %-3s %-3s %-8s %s"\ + # %("SELinux", "disabled", "Optional", "-", "-", "OK", "-")) self.smart_install_devices = smart_install.get_smartinstall_enabled_devices() if len(self.smart_install_devices): @@ -750,11 +750,11 @@ class DependenciesCheck(CoreInstall): log.info(log.bold('-'*len("Plug-in Status"))) log.error("Plug-ins need to be installed") - if self.disable_selinux == True: - log.info("") - log.info(log.bold("SELINUX")) - log.info(log.bold('-'*len("SELINUX"))) - log.error("SELINUX need to be disabled") + # if self.disable_selinux == True: + # log.info("") + # log.info(log.bold("SELINUX")) + # log.info(log.bold('-'*len("SELINUX"))) + # log.error("SELINUX need to be disabled") # if self.missing_user_grps: # log.info("") @@ -776,8 +776,8 @@ class DependenciesCheck(CoreInstall): log.info("Total Warnings: %d" % self.num_warns) log.info() # if self.disable_selinux or self.missing_user_grps or (self.plugin_status == PLUGIN_VERSION_MISMATCH) or (self.plugin_status == PLUGIN_NOT_INSTALLED) or len(self.req_deps_to_be_installed) or len(self.opt_deps_to_be_installed): - if self.disable_selinux or (self.plugin_status == PLUGIN_VERSION_MISMATCH) or (self.plugin_status == PLUGIN_NOT_INSTALLED) or len(self.req_deps_to_be_installed) or len(self.opt_deps_to_be_installed): - log.info("Run 'hp-doctor' command to prompt and fix the issues. ") + # if self.disable_selinux or (self.plugin_status == PLUGIN_VERSION_MISMATCH) or (self.plugin_status == PLUGIN_NOT_INSTALLED) or len(self.req_deps_to_be_installed) or len(self.opt_deps_to_be_installed): + # log.info("Run 'hp-doctor' command to prompt and fix the issues. ") ############ Main ####################### @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/colorcal.py b/colorcal.py index 56ed9b75b..4eedbc42d 100755 --- a/colorcal.py +++ b/colorcal.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/common/utils.h b/common/utils.h index a6fc218e0..a003abe53 100644 --- a/common/utils.h +++ b/common/utils.h @@ -22,6 +22,7 @@ #define SCAN_PLUGIN_MARVELL "bb_marvell.so" #define SCAN_PLUGIN_SOAP "bb_soap.so" #define SCAN_PLUGIN_SOAPHT "bb_soapht.so" +#define SCAN_PLUGIN_ESCL "bb_escl.so" #define HPLIP_PLUGIN_STATE "/var/lib/hp/hplip.state" #define CUPS_TMP_DIR getenv("TMPDIR") ? : getenv("HOME") ?:"/tmp" diff --git a/config_usb_printer.py b/config_usb_printer.py index f79f19e58..9930d935f 100755 --- a/config_usb_printer.py +++ b/config_usb_printer.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2011-2014 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2011-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -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.15.9. +# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.15.11. # -# Report bugs to <3.15.9>. +# Report bugs to <3.15.11>. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -246,7 +246,7 @@ fi $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and 3.15.9 about your + $as_echo "$0: Please tell bug-autoconf@gnu.org and 3.15.11 about your $0: system, including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." @@ -569,9 +569,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='HP Linux Imaging and Printing' PACKAGE_TARNAME='hplip' -PACKAGE_VERSION='3.15.9' -PACKAGE_STRING='HP Linux Imaging and Printing 3.15.9' -PACKAGE_BUGREPORT='3.15.9' +PACKAGE_VERSION='3.15.11' +PACKAGE_STRING='HP Linux Imaging and Printing 3.15.11' +PACKAGE_BUGREPORT='3.15.11' PACKAGE_URL='' # Factoring default headers for most tests. @@ -669,6 +669,8 @@ cupsbackenddir systraydir icondir mimedir +apparmor_build +apparmordir abs_mimedir abs_drvdir abs_ppddir @@ -714,6 +716,8 @@ SHADOW_BUILD_FALSE SHADOW_BUILD_TRUE UDEV_SYSFS_RULES_FALSE UDEV_SYSFS_RULES_TRUE +APPARMOR_BUILD_FALSE +APPARMOR_BUILD_TRUE FAX_BUILD_FALSE FAX_BUILD_TRUE GUI_BUILD_FALSE @@ -879,6 +883,7 @@ enable_pp_build enable_scan_build enable_gui_build enable_fax_build +enable_apparmor_build enable_dbus_build enable_cups11_build enable_udev_sysfs_rules @@ -889,6 +894,7 @@ with_cupsfilterdir with_icondir with_systraydir with_hpppddir +with_apparmordir with_mimedir with_docdir with_htmldir @@ -1464,7 +1470,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.15.9 to adapt to many kinds of systems. +\`configure' configures HP Linux Imaging and Printing 3.15.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1534,7 +1540,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.15.9:";; + short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.15.11:";; esac cat <<\_ACEOF @@ -1561,6 +1567,7 @@ Optional Features: --enable-scan-build enable scanner build (default=yes) --enable-gui-build enable gui build (default=yes) --enable-fax-build enable fax build (default=yes) + --enable-apparmor_build enable apparmor build (default=no) --enable-dbus-build enable dbus build (default=yes) --enable-cups11-build enable cups 1.1.x build (default=no) --enable-udev_sysfs_rules Use SYSFS attribute instead of ATTR/ATTRS attribute in udev rules(default=no) @@ -1595,6 +1602,8 @@ Optional Packages: [default=/etc/xdg/autostart] --with-hpppddir=DIR set hp ppd install directory [default=datadir/ppd/HP] + --with-apparmordir=DIR set apparmor profile install directory + [default=/etc/apparmor.d] --with-mimedir=DIR set cups mime.types location [default=abs_mimedir] --with-docdir=DIR set hplip documentation directory [default=datadir/doc] @@ -1629,7 +1638,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.15.9>. +Report bugs to <3.15.11>. _ACEOF ac_status=$? fi @@ -1692,7 +1701,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HP Linux Imaging and Printing configure 3.15.9 +HP Linux Imaging and Printing configure 3.15.11 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2158,9 +2167,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## --------------------- ## -## Report this to 3.15.9 ## -## --------------------- ##" +( $as_echo "## ---------------------- ## +## Report this to 3.15.11 ## +## ---------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -2236,7 +2245,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.15.9, which was +It was created by HP Linux Imaging and Printing $as_me 3.15.11, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3052,7 +3061,7 @@ fi # Define the identity of the package. PACKAGE='hplip' - VERSION='3.15.9' + VERSION='3.15.11' cat >>confdefs.h <<_ACEOF @@ -16057,6 +16066,37 @@ else fi +#AppArmor Changes +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for apparmor profile" >&5 +$as_echo_n "checking for apparmor profile... " >&6; } +# Check whether --enable-apparmor_build was given. +if test "${enable_apparmor_build+set}" = set; then : + enableval=$enable_apparmor_build; apparmor_build=$enableval +else + apparmor_build=no +fi + +if test "$apparmor_build" = "yes"; then + if test -d /etc/apparmor.d/; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + as_fn_error $? "cannot find apparmor support" "$LINENO" 5 + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test x$apparmor_build = xyes; then + APPARMOR_BUILD_TRUE= + APPARMOR_BUILD_FALSE='#' +else + APPARMOR_BUILD_TRUE='#' + APPARMOR_BUILD_FALSE= +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus build" >&5 $as_echo_n "checking for dbus build... " >&6; } # Check whether --enable-dbus_build was given. @@ -16215,6 +16255,16 @@ else fi +# AppArmor Changes + +# Check whether --with-apparmordir was given. +if test "${with_apparmordir+set}" = set; then : + withval=$with_apparmordir; apparmordir=$withval +else + apparmordir="/etc/apparmor.d" +fi + + if test -f "/usr/share/cups/mime/mime.types"; then abs_mimedir="/usr/share/cups/mime/" else @@ -17509,6 +17559,10 @@ abs_ppddir=${abs_hpppddir%/*} +# AppArmor Changes + + + @@ -17789,6 +17843,10 @@ if test -z "${FAX_BUILD_TRUE}" && test -z "${FAX_BUILD_FALSE}"; then as_fn_error $? "conditional \"FAX_BUILD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${APPARMOR_BUILD_TRUE}" && test -z "${APPARMOR_BUILD_FALSE}"; then + as_fn_error $? "conditional \"APPARMOR_BUILD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${UDEV_SYSFS_RULES_TRUE}" && test -z "${UDEV_SYSFS_RULES_FALSE}"; then as_fn_error $? "conditional \"UDEV_SYSFS_RULES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18242,7 +18300,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.15.9, which was +This file was extended by HP Linux Imaging and Printing $as_me 3.15.11, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18293,13 +18351,13 @@ $config_files Configuration commands: $config_commands -Report bugs to <3.15.9>." +Report bugs to <3.15.11>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -HP Linux Imaging and Printing config.status 3.15.9 +HP Linux Imaging and Printing config.status 3.15.11 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index c5e917122..3706645bc 100755 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ # # configure.in - hplip autoconf input file # -# (c) 2004-2007 Copyright Hewlett-Packard Development Company, LP +# (c) 2004-2007 Copyright HP Development Company, LP # # exit status: # 0 = ok @@ -26,7 +26,7 @@ # 104 = no libdl #AC_PREREQ(2.59) -AC_INIT([HP Linux Imaging and Printing], [3.15.9], [3.15.9], [hplip]) +AC_INIT([HP Linux Imaging and Printing], [3.15.11], [3.15.11], [hplip]) #AM_INIT_AUTOMAKE([1.9 foreign]) AM_INIT_AUTOMAKE AC_DISABLE_STATIC @@ -261,6 +261,23 @@ else fi AM_CONDITIONAL(FAX_BUILD, test x$fax_build = xyes) +#AppArmor Changes +AC_MSG_CHECKING([for apparmor profile]) +AC_ARG_ENABLE(apparmor_build, + [ --enable-apparmor_build enable apparmor build (default=no)], + apparmor_build=$enableval, apparmor_build=no) +if test "$apparmor_build" = "yes"; then + if test -d /etc/apparmor.d/; then + AC_MSG_RESULT(yes) + else + AC_MSG_ERROR([cannot find apparmor support]) + fi +else + AC_MSG_RESULT(no) +fi +AM_CONDITIONAL(APPARMOR_BUILD, test x$apparmor_build = xyes) + + AC_MSG_CHECKING([for dbus build]) AC_ARG_ENABLE(dbus_build, [ --enable-dbus-build enable dbus build (default=yes)], @@ -330,6 +347,10 @@ AC_ARG_WITH(systraydir, AC_HELP_STRING([--with-systraydir=DIR], [set hplip-systr AC_ARG_WITH(hpppddir, AC_HELP_STRING([--with-hpppddir=DIR], [set hp ppd install directory [default=datadir/ppd/HP]]), hpppddir=$withval, hpppddir="$datadir/ppd/HP") + +# AppArmor Changes +AC_ARG_WITH(apparmordir, AC_HELP_STRING([--with-apparmordir=DIR], [set apparmor profile install directory [default=/etc/apparmor.d]]), + apparmordir=$withval, apparmordir="/etc/apparmor.d") if test -f "/usr/share/cups/mime/mime.types"; then abs_mimedir="/usr/share/cups/mime/" @@ -584,15 +605,19 @@ AC_DEFINE_DIR([abs_htmldir], [hphtmldir]) abs_ppddir=${abs_hpppddir%/*} AC_DEFINE_DIR([abs_drvdir], [drvdir]) -AC_SUBST(abs_datadir) -AC_SUBST(abs_sbindir) -AC_SUBST(abs_hpppddir) -AC_SUBST(abs_docdir) -AC_SUBST(abs_htmldir) -AC_SUBST(abs_ppddir) -AC_SUBST(abs_drvdir) -AC_SUBST(abs_mimedir) -AC_SUBST(mimedir) +AC_SUBST(abs_datadir) +AC_SUBST(abs_sbindir) +AC_SUBST(abs_hpppddir) +AC_SUBST(abs_docdir) +AC_SUBST(abs_htmldir) +AC_SUBST(abs_ppddir) +AC_SUBST(abs_drvdir) +AC_SUBST(abs_mimedir) + +# AppArmor Changes +AC_SUBST(apparmordir) +AC_SUBST(apparmor_build) +AC_SUBST(mimedir) AC_SUBST(icondir) AC_SUBST(systraydir) AC_SUBST(cupsbackenddir) diff --git a/copier/__init__.py b/copier/__init__.py index 41cd78c5c..ba246ed0f 100644 --- a/copier/__init__.py +++ b/copier/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/copier/copier.py b/copier/copier.py index b727a5094..a595baa3f 100644 --- a/copier/copier.py +++ b/copier/copier.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -7,7 +7,7 @@ Upstream website: http://hplip.sourceforge.net/ Copyright: - Copyright (c) 2001-2009 Hewlett-Packard Development Company, L.P. All rights reserved. + Copyright (c) 2001-2015 HP Development Company, L.P. All rights reserved. The GPL license applies to the files in these directories: @@ -347,7 +347,7 @@ are met: 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. Neither the name of the Hewlett-Packard nor the names of its +3. Neither the name of the HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/cups_drv.inc b/cups_drv.inc index cf37e5295..c3c260db7 100644 --- a/cups_drv.inc +++ b/cups_drv.inc @@ -142,10 +142,13 @@ cups_ppd_printers = \ ppd/hpcups/hp-deskjet_400.ppd.gz \ ppd/hpcups/hp-deskjet_400l.ppd.gz \ ppd/hpcups/hp-deskjet_4510_series.ppd.gz \ + ppd/hpcups/hp-deskjet_4530_series.ppd.gz \ ppd/hpcups/hp-deskjet_460.ppd.gz \ ppd/hpcups/hp-deskjet_4610_series.ppd.gz \ ppd/hpcups/hp-deskjet_4620_series.ppd.gz \ ppd/hpcups/hp-deskjet_4640_series.ppd.gz \ + ppd/hpcups/hp-deskjet_4670_series.ppd.gz \ + ppd/hpcups/hp-deskjet_4720_series.ppd.gz \ ppd/hpcups/hp-deskjet_500.ppd.gz \ ppd/hpcups/hp-deskjet_500c.ppd.gz \ ppd/hpcups/hp-deskjet_505j.ppd.gz \ @@ -159,7 +162,9 @@ cups_ppd_printers = \ ppd/hpcups/hp-deskjet_5550.ppd.gz \ ppd/hpcups/hp-deskjet_5551.ppd.gz \ ppd/hpcups/hp-deskjet_5552.ppd.gz \ + ppd/hpcups/hp-deskjet_5570_series.ppd.gz \ ppd/hpcups/hp-deskjet_5600.ppd.gz \ + ppd/hpcups/hp-deskjet_5640_series.ppd.gz \ ppd/hpcups/hp-deskjet_5650.ppd.gz \ ppd/hpcups/hp-deskjet_5652.ppd.gz \ ppd/hpcups/hp-deskjet_5700.ppd.gz \ @@ -770,5 +775,6 @@ cups_ppd_printers = \ ppd/hpcups/hp-psc_920.ppd.gz \ ppd/hpcups/hp-psc_950.ppd.gz \ ppd/hpcups/hp-psc_950vr.ppd.gz \ - ppd/hpcups/hp-psc_950xi.ppd.gz + ppd/hpcups/hp-psc_950xi.ppd.gz \ + ppd/hpcups/hp-scanjet_pro_3500_f1.ppd.gz cups_drv = prnt/drv/hpcups.drv diff --git a/dat2drv.py b/dat2drv.py index adec63261..c06bf2f9a 100755 --- a/dat2drv.py +++ b/dat2drv.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2008-9 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2008-9 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/data/localization/hplip_de.ts b/data/localization/hplip_de.ts index 6f20eafe1..83f156cbb 100755 --- a/data/localization/hplip_de.ts +++ b/data/localization/hplip_de.ts @@ -40,9 +40,9 @@ Steve DeRoos, Mark Overton, Aaron Albright, Smith Kennedy, John Hosszu, Chris Wi </message> <message> <source><b>License and Copyright:</b> -(c) Copyright 2006 Hewlett-Packard Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.</source> +(c) Copyright 2015 HP Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.</source> <translation><b>Lizenz und Copyright:</b> -(c) Copyright 2006 Hewlett-Packard Development Company, L.P. Diese Software ist unter folgenden Lizenzen lizenziert: GNU-General Public License (GPL), BSD und MIT. Weitere Informationen finden Sie in den Softwarequellen.</translation> +(c) Copyright 2015 HP Development Company, L.P. Diese Software ist unter folgenden Lizenzen lizenziert: GNU-General Public License (GPL), BSD und MIT. Weitere Informationen finden Sie in den Softwarequellen.</translation> </message> </context> <context> diff --git a/data/localization/hplip_es.ts b/data/localization/hplip_es.ts index 466983926..363e82a10 100755 --- a/data/localization/hplip_es.ts +++ b/data/localization/hplip_es.ts @@ -40,9 +40,9 @@ Steve DeRoos, Mark Overton, Aaron Albright, Smith Kennedy, John Hosszu, Chris Wi </message> <message> <source><b>License and Copyright:</b> -(c) Copyright 2006 Hewlett-Packard Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.</source> +(c) Copyright 2015 HP Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.</source> <translation><b>Licencia y Propiedad intelectual:</b> -(c) Copyright 2006 Hewlett-Packard Development Company, L.P. Se autoriza el uso de este software con licencias GNU GPL (General Public License), BSD y MIT. Consulte los códigos fuente del software para obtener más detalles.</translation> +(c) Copyright 2015 HP Development Company, L.P. Se autoriza el uso de este software con licencias GNU GPL (General Public License), BSD y MIT. Consulte los códigos fuente del software para obtener más detalles.</translation> </message> </context> <context> diff --git a/data/localization/hplip_fr.ts b/data/localization/hplip_fr.ts index 4f457d946..6cf006df5 100755 --- a/data/localization/hplip_fr.ts +++ b/data/localization/hplip_fr.ts @@ -40,9 +40,9 @@ Steve DeRoos, Mark Overton, Aaron Albright, Smith Kennedy, John Hosszu, Chris Wi </message> <message> <source><b>License and Copyright:</b> -(c) Copyright 2006 Hewlett-Packard Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.</source> +(c) Copyright 2015 HP Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.</source> <translation><b>Licence et copyright :</b> -(c) Copyright 2006 Hewlett-Packard Development Company, L.P. Ce logiciel bénéficie des licences GPL GNU, BSD et MIT. Pour plus d'informations, consultez les sources du logiciel.</translation> +(c) Copyright 2015 HP Development Company, L.P. Ce logiciel bénéficie des licences GPL GNU, BSD et MIT. Pour plus d'informations, consultez les sources du logiciel.</translation> </message> </context> <context> diff --git a/data/localization/hplip_it.ts b/data/localization/hplip_it.ts index 8490b528c..8c5cd5b98 100755 --- a/data/localization/hplip_it.ts +++ b/data/localization/hplip_it.ts @@ -40,9 +40,9 @@ Steve DeRoos, Mark Overton, Aaron Albright, Smith Kennedy, John Hosszu, Chris Wi </message> <message> <source><b>License and Copyright:</b> -(c) Copyright 2006 Hewlett-Packard Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.</source> +(c) Copyright 2015 HP Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.</source> <translation><b>Licenza e Copyright:</b> -(c) Copyright 2006 Hewlett-Packard Development Company, L.P. Questo software è concesso in licenza in base alle licenze GNU GPL (General Public License), BSD e MIT. Vedere le sorgenti software per i dettagli.</translation> +(c) Copyright 2015 HP Development Company, L.P. Questo software è concesso in licenza in base alle licenze GNU GPL (General Public License), BSD e MIT. Vedere le sorgenti software per i dettagli.</translation> </message> </context> <context> diff --git a/data/localization/hplip_pt.ts b/data/localization/hplip_pt.ts index 8c07a446b..fa2792646 100755 --- a/data/localization/hplip_pt.ts +++ b/data/localization/hplip_pt.ts @@ -40,9 +40,9 @@ Steve DeRoos, Mark Overton, Aaron Albright, Smith Kennedy, John Hosszu, Chris Wi </message> <message> <source><b>License and Copyright:</b> -(c) Copyright 2006 Hewlett-Packard Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.</source> +(c) Copyright 2015 HP Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.</source> <translation><b>Licença e direitos autorais:</b> -© Copyright 2006 Hewlett-Packard Development Company, L.P. Este software está licenciado nos termos das licenças GNU GPL (Licença pública geral), BSD e MIT. Consulte as fontes do software para obter detalhes.</translation> +© Copyright 2015 HP Development Company, L.P. Este software está licenciado nos termos das licenças GNU GPL (Licença pública geral), BSD e MIT. Consulte as fontes do software para obter detalhes.</translation> </message> </context> <context> diff --git a/data/localization/hplip_ru.ts b/data/localization/hplip_ru.ts index 5a14078b9..3a42ed3ac 100755 --- a/data/localization/hplip_ru.ts +++ b/data/localization/hplip_ru.ts @@ -40,9 +40,9 @@ </message> <message> <source><b>License and Copyright:</b> -(c) Copyright 2006 Hewlett-Packard Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.</source> +(c) Copyright 2015 HP Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.</source> <translation><b>Лицензия и авторское право:</b> -(c) Компания Hewlett-Packard Development, L.P., 2006 г. Данное программное обеспечение имеет стандартную общедоступную лицензию GNU (GPL), лицензии BSD и MIT. Подробнее см. в исходных текстах ПО.</translation> +(c) Компания HP Development, L.P., 2006 г. Данное программное обеспечение имеет стандартную общедоступную лицензию GNU (GPL), лицензии BSD и MIT. Подробнее см. в исходных текстах ПО.</translation> </message> </context> <context> diff --git a/data/localization/hplip_zh.ts b/data/localization/hplip_zh.ts index 2b1dcd8f6..3de79fe15 100755 --- a/data/localization/hplip_zh.ts +++ b/data/localization/hplip_zh.ts @@ -40,9 +40,9 @@ Steve DeRoos、Mark Overton、Aaron Albright、Smith Kennedy、John Hosszu、Chr </message> <message> <source><b>License and Copyright:</b> -(c) Copyright 2006 Hewlett-Packard Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.</source> +(c) Copyright 2015 HP Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.</source> <translation><b>许可证与版权：</b> -(c) 版权所有 2006 Hewlett-Packard Development Company, L.P. 本软件已获经 GNU 通用公共许可证 (GPL)、BSD 以及 MIT 许可证的授权。有关详细信息，请参阅软件原始资料。</translation> +(c) 版权所有 2015 HP Development Company, L.P. 本软件已获经 GNU 通用公共许可证 (GPL)、BSD 以及 MIT 许可证的授权。有关详细信息，请参阅软件原始资料。</translation> </message> </context> <context> diff --git a/data/models/models.dat b/data/models/models.dat index aa1a61069..150422bb2 100644 --- a/data/models/models.dat +++ b/data/models/models.dat @@ -1,4 +1,4 @@ -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -45269,6 +45269,8 @@ model2=HP ENVY 5531 e-All-in-One Printer model3=HP ENVY 5532 e-All-in-One Printer model4=HP ENVY 5534 e-All-in-One Printer model5=HP ENVY 5535 e-All-in-One Printer +model6=HP ENVY 5536 e-All-in-One Printer +model7=HP ENVY 5539 e-All-in-One Printer monitor-type=0 panel-check-type=0 pcard-type=2 @@ -57422,10 +57424,12 @@ job-storage=0 linefeed-cal-type=0 model1=HP DeskJet 3630 All-in-One Printer model2=HP DeskJet 3632 All-in-One Printer -model3=HP DeskJet Ink Advantage 3630 All-in-One Printer -model4=HP DeskJet Ink Advantage 3635 All-in-One Printer -model5=HP DeskJet Ink Advantage 3636 All-in-One Printer -model6=HP DeskJet Ink Advantage 3638 All-in-One Printer +model3=HP DeskJet 3633 All-in-One Printer +model4=HP DeskJet 3634 All-in-One Printer +model5=HP DeskJet Ink Advantage 3630 All-in-One Printer +model6=HP DeskJet Ink Advantage 3635 All-in-One Printer +model7=HP DeskJet Ink Advantage 3636 All-in-One Printer +model8=HP DeskJet Ink Advantage 3638 All-in-One Printer monitor-type=0 panel-check-type=0 pcard-type=0 @@ -57467,10 +57471,11 @@ linefeed-cal-type=0 model1=HP DeskJet 2130 All-in-One Printer series model2=HP DeskJet 2131 All-in-One Printer model3=HP DeskJet 2132 All-in-One Printer -model4=HP DeskJet Ink Advantage 2130 All-in_One Printer -model5=HP DeskJet Ink Advantage 2135 All-in_One Printer -model6=HP DeskJet Ink Advantage 2136 All-in_One Printer -model7=HP DeskJet Ink Advantage 2138 All-in_One Printer +model4=HP DeskJet 2134 All-in-One Printer +model5=HP DeskJet Ink Advantage 2130 All-in_One Printer +model6=HP DeskJet Ink Advantage 2135 All-in_One Printer +model7=HP DeskJet Ink Advantage 2136 All-in_One Printer +model8=HP DeskJet Ink Advantage 2138 All-in_One Printer monitor-type=0 panel-check-type=0 pcard-type=0 @@ -57677,7 +57682,8 @@ linefeed-cal-type=0 model1=HP OfficeJet 4650 All-in-One Printer series model2=HP OfficeJet 4650 All-in-One Printer model3=HP OfficeJet 4652 All-in-One Printer -model4=HP OfficeJet 4655 All-in-One Printer +model4=HP OfficeJet 4654 All-in-One Printer +model5=HP OfficeJet 4655 All-in-One Printer monitor-type=0 panel-check-type=0 pcard-type=0 @@ -57759,7 +57765,10 @@ job-storage=0 linefeed-cal-type=0 model1=HP Envy 5540 All-in-One Printer series model2=HP Envy 5540 All-in-One Printer -model3=HP Envy 5545 All-in-One Printer +model3=HP Envy 5542 All-in-One Printer +model4=HP Envy 5543 All-in-One Printer +model5=HP Envy 5544 All-in-One Printer +model6=HP Envy 5545 All-in-One Printer monitor-type=0 panel-check-type=0 pcard-type=0 @@ -57825,6 +57834,1420 @@ usb-pid=e811 usb-vid=3f0 wifi-config=3 +[hp_color_laserjet_mfp_m274n] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cm1312_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color LaserJet Pro MFP M274n +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +ppd-name=hp-color_laserjet_mfp_m274n +pq-diag-type=0 +scan-src=3 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=48c3 +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=842a +usb-vid=3f0 +wifi-config=3 + +[envy_4520_series] +align-type=-1 +clean-type=-1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=default_printer.png +io-mfp-mode=1 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP ENVY 4520 All-in-One Printer series +model2=HP ENVY 4520 All-in-One Printer +model3=HP ENVY 4522 All-in-One Printer +model4=HP ENVY 4523 All-in-One Printer +model5=HP ENVY 4524 All-in-One Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=0 +scan-src=1 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=447b +support-type=2 +support-ver=3.15.11 +tech-class=Mimas15 +tech-subclass=Normal +tech-type=2 +usb-pid=d711 +usb-vid=3f0 +wifi-config=3 + +[deskjet_4720_series] +align-type=15 +clean-type=4 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=default_printer.png +io-mfp-mode=1 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP DeskJet Ink Advantage Ultra 4720 All-in-One Printer series +model2=HP DeskJet Ink Advantage Ultra 4729 All-in-One Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=0 +scan-src=1 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=447b +support-type=2 +support-ver=3.15.11 +tech-class=Pyramid15 +tech-subclass=Normal +tech-type=2 +usb-pid=e211 +usb-vid=3f0 +wifi-config=3 + +[deskjet_5640_series] +align-type=-1 +clean-type=-1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=psc_2300_series.png +io-mfp-mode=1 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP DeskJet Ink Advantage 5640 All-in-One Printer series +model2=HP DeskJet Ink Advantage 5645 All-in-One Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=0 +scan-src=1 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=41a4 +support-type=2 +support-ver=3.15.11 +tech-class=CopperheadIPH +tech-subclass=Normal +tech-type=0 +usb-pid=db11 +usb-vid=3f0 +wifi-config=3 + +[deskjet_4670_series] +align-type=-1 +clean-type=-1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=6 +fw-download=False +icon=default_printer.png +io-mfp-mode=1 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP DeskJet Ink Advantage 4670 All-in-One +model2=HP DeskJet Ink Advantage 4675 All-in-One +model3=HP DeskJet Ink Advantage 4676 All-in-One +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=0 +scan-src=3 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=447b +support-type=2 +support-ver=3.15.11 +tech-class=Mimas15 +tech-subclass=Normal +tech-type=2 +usb-pid=da11 +usb-vid=3f0 +wifi-config=3 + +[deskjet_4530_series] +align-type=-1 +clean-type=-1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=default_printer.png +io-mfp-mode=1 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP DeskJet Ink Advantage 4530 All-in-One +model2=HP DeskJet Ink Advantage 4535 All-in-One +model3=HP DeskJet Ink Advantage 4536 All-in-One +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=0 +scan-src=1 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=447b +support-type=2 +support-ver=3.15.11 +tech-class=Mimas15 +tech-subclass=Normal +tech-type=2 +usb-pid=d811 +usb-vid=3f0 +wifi-config=3 + +[hp_laserjet_m506] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=officejet_k550.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Enterprise M506 series +model2=HP Laserjet Enterprise M506n +model3=HP Laserjet Enterprise M506dn +model4=HP Laserjet Enterprise M506x +model5=HP Laserjet Enterprise M506dh +monitor-type=0 +ppd-name=laserjet_m506 +panel-check-type=1 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF287A/CF287X +r0-agent1-type=1 +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.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=2 +usb-pid=422A +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_m402dw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_LaserJet_1200.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Pro M402-M403 series +model2=HP LaserJet Pro M402dw +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=laserjet_pro_m402_m403d +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF226A/CF226X/CF228A +r0-agent1-type=1 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=45e8 +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=542a +usb-vid=3f0 +wifi-config=3 + +[hp_laserjet_m402n] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_LaserJet_1200.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Pro M402-M403 n-dn series +model2=HP LaserJet Pro M402n +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=laserjet_pro_m402_m403 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF226A/CF226X/CF228A +r0-agent1-type=1 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=45e8 +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=602a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_m402dn] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_LaserJet_1200.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Pro M402-M403 n-dn series +model2=HP LaserJet Pro M402dn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=laserjet_pro_m402_m403d +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF226A/CF226X/CF228A +r0-agent1-type=1 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=45e8 +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=602a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_m402d] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=hp_LaserJet_1200.png +io-mfp-mode=1 +io-mode=1 +io-support=2 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Pro M402-M403 series +model2=HP LaserJet Pro M402d +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=laserjet_pro_m402_m403d +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF226A/CF226X/CF228A +r0-agent1-type=1 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=45e8 +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=542a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_m403n] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_LaserJet_1200.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Pro M402-M403 n-dn series +model2=HP LaserJet Pro M403n +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=laserjet_pro_m402_m403 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF226A/CF226X/CF228A +r0-agent1-type=1 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=45e8 +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=602a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_m403dw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_LaserJet_1200.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Pro M402-M403 series +model2=HP LaserJet Pro M403dw +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=laserjet_pro_m402_m403d +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF226A/CF226X/CF228A +r0-agent1-type=1 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=45e8 +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=542a +usb-vid=3f0 +wifi-config=3 + +[hp_laserjet_m403dn] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_LaserJet_1200.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Pro M402-M403 n-dn series +model2=HP LaserJet Pro M403dn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=laserjet_pro_m402_m403d +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF226A/CF226X/CF228A +r0-agent1-type=1 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=45e8 +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=602a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_m403d] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=hp_LaserJet_1200.png +io-mfp-mode=1 +io-mode=1 +io-support=2 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Pro M402-M403 series +model2=HP LaserJet Pro M403d +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=laserjet_pro_m402_m403d +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF226A/CF226X/CF228A +r0-agent1-type=1 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=45e8 +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=542a +usb-vid=3f0 +wifi-config=0 + +[hp_color_laserjet_m452dn] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=officejet_k550.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color Laserjet Pro M452dn +monitor-type=0 +ppd-name=color_laserjet_m452d +panel-check-type=1 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=2 +usb-pid=522a +usb-vid=3f0 +wifi-config=0 + +[hp_color_laserjet_m452dw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=officejet_k550.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color Laserjet Pro M452dw +monitor-type=0 +ppd-name=color_laserjet_m452d +panel-check-type=1 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=2 +usb-pid=522a +usb-vid=3f0 +wifi-config=3 + +[hp_color_laserjet_m452nw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=officejet_k550.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color Laserjet Pro M452nw +monitor-type=0 +ppd-name=color_laserjet_m452 +panel-check-type=1 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=2 +usb-pid=522a +usb-vid=3f0 +wifi-config=3 + +[hp_laserjet_mfp_m426fdn] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=7 +fw-download=False +icon=default_printer.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Laserjet Pro MFP M426fdn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +ppd-name=laserjet_mfp_m426_m427 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF226A/CF226X/CF228A +r0-agent1-type=1 +scan-src=3 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=1 +support-subtype=219b2b +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=5a2a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_mfp_m426fdw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=7 +fw-download=False +icon=default_printer.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP Laserjet Pro MFP M426fdw +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +ppd-name=laserjet_mfp_m426_m427 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF226A/CF226X/CF228A +r0-agent1-type=1 +scan-src=3 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=1 +support-subtype=219b2b +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=5a2a +usb-vid=3f0 +wifi-config=3 + +[hp_laserjet_mfp_m427fdn] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=7 +fw-download=False +icon=default_printer.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Laserjet Pro MFP M427dn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +ppd-name=laserjet_mfp_m426_m427 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF226A/CF226X/CF228A +r0-agent1-type=1 +scan-src=3 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=1 +support-subtype=219b2b +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=5a2a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_mfp_m427fdw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=7 +fw-download=False +icon=default_printer.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP Laserjet Pro MFP M427fdw +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +ppd-name=laserjet_mfp_m426_m427 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF226A/CF226X/CF228A +r0-agent1-type=1 +scan-src=3 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=1 +support-subtype=219b2b +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=5a2a +usb-vid=3f0 +wifi-config=3 + +[hp_laserjet_mfp_m426dw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=default_printer.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP Laserjet Pro MFP M426dw +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +ppd-name=laserjet_mfp_m426_m427 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF226A/CF226X/CF228A +r0-agent1-type=1 +scan-src=3 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=1 +support-subtype=219b2b +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=5a2a +usb-vid=3f0 +wifi-config=3 + +[hp_laserjet_mfp_m427dw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=default_printer.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP Laserjet Pro MFP M427dw +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +ppd-name=laserjet_mfp_m426_m427 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF226A/CF226X/CF228A +r0-agent1-type=1 +scan-src=3 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=1 +support-subtype=219b2b +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=5a2a +usb-vid=3f0 +wifi-config=3 + +[deskjet_5570_series] +align-type=-1 +clean-type=-1 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=psc_2300_series.png +io-mfp-mode=1 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP DeskJet Ink Advantage 5570 All-in-One +model2=HP DeskJet Ink Advantage 5575 All-in-One +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=0 +scan-src=1 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=41a4 +support-type=2 +support-ver=3.15.11 +tech-class=CopperheadIPH15 +tech-subclass=Normal +tech-type=2 +usb-pid=ce11 +usb-vid=3f0 +wifi-config=3 + +[hp_laserjet_mfp_m527] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=officejet_k550.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP Laserjet Enterprise MFP M527dn +model2=HP Laserjet Enterprise MFP M527f +monitor-type=0 +ppd-name=laserjet_mfp_m527 +panel-check-type=1 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF287A/CF287X +r0-agent1-type=1 +scan-src=3 +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.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=2 +usb-pid=402A +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_flow_mfp_m527] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=officejet_k550.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP Laserjet Enterprise Flow MFP M527c +model2=HP Laserjet Enterprise Flow MFP M527z +monitor-type=0 +ppd-name=laserjet_mfp_m527 +panel-check-type=1 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF287A/CF287X +r0-agent1-type=1 +scan-src=3 +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.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=2 +usb-pid=412a +usb-vid=3f0 +wifi-config=0 + +[hp_scanjet_pro_3500_f1] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=default_printer.png +io-mfp-mode=1 +io-mode=1 +io-support=2 +job-storage=0 +linefeed-cal-type=0 +model1=HP Scanjet Pro 3500 f1 Flatbed Scanner +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +scan-src=3 +scan-type=9 +status-battery-check=0 +status-dynamic-counters=0 +status-type=0 +support-released=True +support-subtype=0 +support-type=2 +support-ver=3.15.11 +tech-class=DJ3320 +tech-subclass=Normal +tech-type=0 +usb-pid=5305 +usb-vid=3f0 +wifi-config=0 + +[hp_color_laserjet_mfp_m577] +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 M577 Series +model2=HP Color LaserJet Enterprise MFP M577dn +model3=HP Color LaserJet Enterprise MFP M577f +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=color_laserjet_mfp_m577 +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.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=3a2a +usb-vid=3f0 +wifi-config=0 + +[hp_color_laserjet_flowmfp_m577] +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 M577 Series +model2=HP Color LaserJet Enterprise Flow MFP M577z +model3=HP Color LaserJet Enterprise Flow MFP M577c +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=color_laserjet_mfp_m577 +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.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=4a2a +usb-vid=3f0 +wifi-config=0 + +[hp_color_laserjet_mfp_m477fnw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=7 +fw-download=False +icon=default_printer.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color Laserjet Pro MFP M477 fnw +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +ppd-name=color_laserjet_pro_mfp_m477 +pq-diag-type=0 +r-type=0 +scan-src=3 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=1 +support-subtype=219b2b +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=512a +usb-vid=3f0 +wifi-config=3 + +[hp_color_laserjet_mfp_m477fdn] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=7 +fw-download=False +icon=default_printer.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color Laserjet Pro MFP M477 fdn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +ppd-name=color_laserjet_pro_mfp_m477d +pq-diag-type=0 +r-type=0 +scan-src=3 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=1 +support-subtype=219b2b +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=512a +usb-vid=3f0 +wifi-config=0 + +[hp_color_laserjet_mfp_m477fdw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=7 +fw-download=False +icon=default_printer.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color Laserjet Pro MFP M477 fdw +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +ppd-name=color_laserjet_pro_mfp_m477d +pq-diag-type=0 +r-type=0 +scan-src=3 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=1 +support-subtype=219b2b +support-type=2 +support-ver=3.15.11 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=512a +usb-vid=3f0 +wifi-config=3 + + # align-type # ---------- # Align cartridges type diff --git a/data/policykit/com.hp.hplip.policy b/data/policykit/com.hp.hplip.policy index 5a42271bc..e8072395d 100644 --- a/data/policykit/com.hp.hplip.policy +++ b/data/policykit/com.hp.hplip.policy @@ -4,11 +4,11 @@ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd"> <policyconfig> - <vendor>Hewlett-Packard Development Company</vendor> + <vendor>HP Development Company</vendor> <vendor_url>http://hplip.net/</vendor_url> <action id="com.hp.hplip.installplugin"> - <description>Install a plug-in into a Hewlett-Packard printer</description> + <description>Install a plug-in into a HP printer</description> <message>System policy prevents installation of a printer plug-in</message> <defaults> <allow_any>no</allow_any> diff --git a/devicesettings.py b/devicesettings.py index d283ebe71..242feaf20 100755 --- a/devicesettings.py +++ b/devicesettings.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/diagnose_plugin.py b/diagnose_plugin.py index 5746389ff..87b0d6e9b 100755 --- a/diagnose_plugin.py +++ b/diagnose_plugin.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2011 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/diagnose_queues.py b/diagnose_queues.py index 11c51149d..e928f4ce5 100755 --- a/diagnose_queues.py +++ b/diagnose_queues.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2011-2014 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2011-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/doc/commandline.html b/doc/commandline.html index 6404a5c8e..43fafd536 100644 --- a/doc/commandline.html +++ b/doc/commandline.html @@ -23,7 +23,7 @@ variables and options.<br><p>If you run the command with -h you will get he <div id="footer"> <p class="copyright"></p><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br></center> <p></p> </div> </div> diff --git a/doc/copying.html b/doc/copying.html index 1efdb4a75..54de6ba53 100644 --- a/doc/copying.html +++ b/doc/copying.html @@ -27,7 +27,7 @@ printing devices support this feature.<br><br><div style="text-align: center;"> <div id="footer"> <p class="copyright"></p><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br></center> <p></p> </div> </div> diff --git a/doc/devicemanager.html b/doc/devicemanager.html index 4c5937a0c..0a8ce6f7c 100644 --- a/doc/devicemanager.html +++ b/doc/devicemanager.html @@ -29,7 +29,7 @@ settings such as quality level, page orientation, media size, etc.<br><p style=" <div id="footer"> <p class="copyright"></p><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br></center> <p></p> </div> </div> diff --git a/doc/faxtrouble.html b/doc/faxtrouble.html index d30d3b4c5..a05094905 100644 --- a/doc/faxtrouble.html +++ b/doc/faxtrouble.html @@ -58,7 +58,7 @@ To install or uninstall, update or configure add-ons, click theManage Add-ons bu <div id="footer"> <p class="copyright"><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br /></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br /></center> </p> </div> </div> diff --git a/doc/gettinghelp.html b/doc/gettinghelp.html index 005fe8b0c..8896f8535 100644 --- a/doc/gettinghelp.html +++ b/doc/gettinghelp.html @@ -17,7 +17,7 @@ </p> <h3 class="showhide_heading" id="Startup">Getting help</h3>The HPLIP team provides forum-based support to users on the <a href="https://launchpad.net/" target="_blank">launchpad.net</a> website (site run by <a href="http://canonical.com/" target="_blank">Canonical Ltd</a>).<br><br>To <span style="font-weight: bold;">search for answers</span> among previously asked questions, please use this link:<br><a href="https://answers.launchpad.net/hplip/" target="_blank">https://answers.launchpad.net/hplip/</a> <br><br>To<span style="font-weight: bold;"> ask a question</span>, get help with installation or usage of HPLIP, please use this link (Launchpad.net registration is required):<br><a href="https://answers.launchpad.net/hplip/+addquestion/+login" target="_blank">https://answers.launchpad.net/hplip/+addquestion/+login</a><br><br>To <span style="font-weight: bold;">report a confirmed bug</span> (defect), please use this link (Launchpad.net registration is required):<br><a href="https://bugs.launchpad.net/hplip/+filebug/+login" target="_blank">https://bugs.launchpad.net/hplip/+filebug/+login</a><br><span style="font-style: italic;">Note: Please do not report a bug (defect) if you are unsure whether or not your issue really is a bug. Please use </span><a style="font-style: italic;" href="https://answers.launchpad.net/hplip/+addquestion/+login" target="_blank">ask a question</a><span style="font-style: italic;"> instead.</span><br style="font-style: italic;"><br>HPLIP also maintains a website on <a href="http://sourceforge.net/" target="_blank">sourceforge.net</a> (site run by <a href="http://web.sourceforge.com/" target="_blank">Sourceforge, Inc.</a>) that contains HPLIP <span style="font-weight: bold;">downloads, installation help, and other resources</span>:<br><a href="http://hplip.sourceforge.net/" target="_blank">http://hplip.sourceforge.net/</a><br></div><div id="footer"><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br></center> <p></p> </div> </div> diff --git a/doc/hpscan.html b/doc/hpscan.html index d32f34c84..74763d141 100644 --- a/doc/hpscan.html +++ b/doc/hpscan.html @@ -257,7 +257,7 @@ $ hp-scan -n --editor=gimp <span style="font-weight: bold;"><br><br> <div id="footer"> <p class="copyright"></p><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br></center> <p></p> </div> </div> diff --git a/doc/index.html b/doc/index.html index 8c7ec0328..6ef550d0e 100644 --- a/doc/index.html +++ b/doc/index.html @@ -39,7 +39,7 @@ </div> <div id="footer"> <p class="copyright"></p><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br></center> <p></p> </div> </div> diff --git a/doc/mainttask.html b/doc/mainttask.html index d80885012..f3e4a10af 100644 --- a/doc/mainttask.html +++ b/doc/mainttask.html @@ -23,7 +23,7 @@ Align Cartridges, Clean Cartridges, Color Calibration.<br><br>Not all printers s <div id="footer"> <p class="copyright"></p><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br></center> <p></p> </div> </div> diff --git a/doc/plugins.html b/doc/plugins.html index ea315b9ea..2bfd77273 100644 --- a/doc/plugins.html +++ b/doc/plugins.html @@ -20,7 +20,7 @@ <div id="footer"> <p class="copyright"></p><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br></center> <p></p> </div> </div> diff --git a/doc/print.html b/doc/print.html index 85f619f56..e21c863f7 100644 --- a/doc/print.html +++ b/doc/print.html @@ -25,7 +25,7 @@ and so forth.<br><span style="font-style: italic;"><br></span></div> <div id="footer"> <p class="copyright"></p><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br></center> <p></p> </div> </div> diff --git a/doc/printing.html b/doc/printing.html index 2216cc334..bb7f9e98e 100644 --- a/doc/printing.html +++ b/doc/printing.html @@ -22,7 +22,7 @@ installed you can print either using hp-print, hp-toolbox or via the application <div id="footer"> <p class="copyright"></p><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br></center> <p></p> </div> </div> diff --git a/doc/printoptions.html b/doc/printoptions.html index a21415738..7eb61b325 100644 --- a/doc/printoptions.html +++ b/doc/printoptions.html @@ -33,7 +33,7 @@ print settings.<br></div> <div id="footer"> <p class="copyright"></p><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br></center> <p></p> </div> </div> diff --git a/doc/printtroubleshooting.html b/doc/printtroubleshooting.html index db28aed73..90c29dcf6 100644 --- a/doc/printtroubleshooting.html +++ b/doc/printtroubleshooting.html @@ -58,7 +58,7 @@ To install or uninstall, update or configure add-ons, click theManage Add-ons bu <div id="footer"> <p class="copyright"><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br /></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br /></center> </p> </div> </div> diff --git a/doc/scanning.html b/doc/scanning.html index e4ccf3b88..237bf890c 100644 --- a/doc/scanning.html +++ b/doc/scanning.html @@ -20,7 +20,7 @@ <div id="footer"> <p class="copyright"></p><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br></center> <p></p> </div> </div> diff --git a/doc/scantrouble.html b/doc/scantrouble.html index 72614f881..4cec666fb 100644 --- a/doc/scantrouble.html +++ b/doc/scantrouble.html @@ -58,7 +58,7 @@ To install or uninstall, update or configure add-ons, click theManage Add-ons bu <div id="footer"> <p class="copyright"><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br /></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br /></center> </p> </div> </div> diff --git a/doc/sendfax.html b/doc/sendfax.html index db848081a..e13c98fc3 100644 --- a/doc/sendfax.html +++ b/doc/sendfax.html @@ -22,7 +22,7 @@ and then click send fax or run hp-sendfax from the command line.<br><br>Using hp <div id="footer"> <p class="copyright"></p><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br></center> <p></p> </div> </div> diff --git a/doc/setup.html b/doc/setup.html index a392dec54..f00f475b4 100644 --- a/doc/setup.html +++ b/doc/setup.html @@ -45,7 +45,7 @@ your printer.</div> <div id="footer"> <p class="copyright"></p><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br></center> <p></p> </div> </div> diff --git a/doc/systray.html b/doc/systray.html index a238670db..bd0ecbab6 100644 --- a/doc/systray.html +++ b/doc/systray.html @@ -22,7 +22,7 @@ dialog. The systray starts automatically when hp-toolbox is ran.</p></div> <div id="footer"> <p class="copyright"></p><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br></center> <p></p> </div> </div> diff --git a/doc/troubleshooting.html b/doc/troubleshooting.html index df3384d39..beb0e71ed 100644 --- a/doc/troubleshooting.html +++ b/doc/troubleshooting.html @@ -71,7 +71,7 @@ see output similar to the following after running hp-check -t:<br><br><span styl <div id="footer"> <p class="copyright"></p><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br></center> <p></p> </div> </div> diff --git a/doc/uninstalling.html b/doc/uninstalling.html index b1db13e1f..219aad825 100644 --- a/doc/uninstalling.html +++ b/doc/uninstalling.html @@ -25,7 +25,7 @@ when HPLIP is initially installed. Usually in <div id="footer"> <p class="copyright"></p><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br></center> <p></p> </div> </div> diff --git a/doc/upgrading.html b/doc/upgrading.html index 48c02b654..c8dae53a2 100644 --- a/doc/upgrading.html +++ b/doc/upgrading.html @@ -24,7 +24,7 @@ installing HPLIP is available on our <a href="http://hplip.sf.net">website</a>.< <div id="footer"> <p class="copyright"></p><center> - <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2008 Hewlett-Packard Development Company, L.P. <br></center> + <a href="http://welcome.hp.com/country/us/en/privacy.html">Privacy Statement</a> | <a href="http://hplip.sourceforge.net/legal.html">Legal Notices</a> | © 2015 HP Development Company, L.P. <br></center> <p></p> </div> </div> @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# (c) Copyright 2012-2020 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2012-2020 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -305,8 +305,8 @@ try: log.info(log.bold("\n\nChecking Permissions....")) # if not core.get_missing_user_grps() and not core.get_disable_selinux_status(): - if not core.get_disable_selinux_status(): - log.info("Permissions are correct.") + # if not core.get_disable_selinux_status(): + # log.info("Permissions are correct.") # if core.get_missing_user_grps(): # log.info(log.bold("Missing User Groups")) @@ -316,13 +316,13 @@ try: # if core.add_groups_to_user(core.get_missing_user_grps(), core.get_user_grp_cmd()): # IS_RESTART_REQ = True - if core.get_disable_selinux_status(): - log.info(log.bold("SELinux Status")) - log.info(log.bold('-'*len("SELinux Status"))) - log.info("SELinux is enabled. Needs to be disabled") - authenticate(core) - if core.disable_SELinux(): - IS_RESTART_REQ = True + # if core.get_disable_selinux_status(): + # log.info(log.bold("SELinux Status")) + # log.info(log.bold('-'*len("SELinux Status"))) + # log.info("SELinux is enabled. Needs to be disabled") + # authenticate(core) + # if core.disable_SELinux(): + # IS_RESTART_REQ = True log.info(log.bold("\n\nChecking for Configured Queues....")) queues.main_function(core.passwordObj, MODE,ui_toolkit, False, DEVICE_URI) @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/fax/__init__.py b/fax/__init__.py index 97d3c89a2..1ab2ca6a2 100644 --- a/fax/__init__.py +++ b/fax/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/fax/backend/hpfax.py b/fax/backend/hpfax.py index dbea22d1f..9560e840b 100755 --- a/fax/backend/hpfax.py +++ b/fax/backend/hpfax.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/fax/coverpages.py b/fax/coverpages.py index eb40ff713..1eb69f17b 100644 --- a/fax/coverpages.py +++ b/fax/coverpages.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/fax/fax.py b/fax/fax.py index 4cf3b5254..3d6922661 100644 --- a/fax/fax.py +++ b/fax/fax.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2010 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/fax/faxdevice.py b/fax/faxdevice.py index f65a45210..348e7e3df 100644 --- a/fax/faxdevice.py +++ b/fax/faxdevice.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2010 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/fax/ledmfax.py b/fax/ledmfax.py index fa2065dbe..e210f7c78 100644 --- a/fax/ledmfax.py +++ b/fax/ledmfax.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/fax/ledmsoapfax.py b/fax/ledmsoapfax.py index 2829d577d..4f025ddb8 100644 --- a/fax/ledmsoapfax.py +++ b/fax/ledmsoapfax.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/fax/marvellfax.py b/fax/marvellfax.py index 29df63d75..465a35aff 100644 --- a/fax/marvellfax.py +++ b/fax/marvellfax.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2010 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/fax/pmlfax.py b/fax/pmlfax.py index b1c0b3dfe..b68ff6a09 100644 --- a/fax/pmlfax.py +++ b/fax/pmlfax.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/fax/ppd/HP-Fax-hpcups.ppd.gz b/fax/ppd/HP-Fax-hpcups.ppd.gz Binary files differindex 692a8d249..725c751a4 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 b8c81f070..7850c5c8d 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 cebd6fcf5..a0a0b3342 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 a5e8e1561..27a3f102b 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 6e91a5af3..d9a5fe499 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 f7fbfe735..6bfec2c86 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 58551c7f5..f3fb1b21d 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 af0c5ae46..42239e889 100644 --- a/fax/ppd/HP-Fax4-hpijs.ppd.gz +++ b/fax/ppd/HP-Fax4-hpijs.ppd.gz diff --git a/fax/soapfax.py b/fax/soapfax.py index 329386647..daee01208 100644 --- a/fax/soapfax.py +++ b/fax/soapfax.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/faxsetup.py b/faxsetup.py index eb073bf30..1a4de1ee0 100755 --- a/faxsetup.py +++ b/faxsetup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/firmware.py b/firmware.py index 7b3aa6a37..f0d88d46e 100755 --- a/firmware.py +++ b/firmware.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/foomatic_drv.inc b/foomatic_drv.inc index 528780aa9..21d053869 100644 --- a/foomatic_drv.inc +++ b/foomatic_drv.inc @@ -25,6 +25,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_k80-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1022nw-hpijs-zjs.ppd.gz \ ppd/hpijs/hp-business_inkjet_1100-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_4670_series-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_9500-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz \ @@ -64,6 +65,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_4500_g510n-z-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_1050_j410_series-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_5640_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_f4200_series-hpijs.ppd.gz \ ppd/hpijs/hp-psc_1300_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_933c-hpijs.ppd.gz \ @@ -242,6 +244,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_6520_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-deskjet_5570_series-hpijs.ppd.gz \ ppd/hpijs/hp-psc_1510_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1020-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_7510_series-hpijs.ppd.gz \ @@ -491,6 +494,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_845c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4350-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_pro_mfp_m125r-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_4720_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_5110-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_4610_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_630-hpijs.ppd.gz \ @@ -584,6 +588,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_pro_mfp_m127fw-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_d1300_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_4530_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3420-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_5500_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_630c-hpijs.ppd.gz \ @@ -631,6 +636,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_series_520-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_895c-hpijs.ppd.gz \ ppd/hpijs/hp-psc_2200_series-hpijs.ppd.gz \ + ppd/hpijs/hp-scanjet_pro_3500_f1-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_843c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4500_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_7110_series-hpijs.ppd.gz \ @@ -826,6 +832,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz \ prnt/ps/hp-laserjet_3200m-ps.ppd.gz \ prnt/ps/hp-laserjet_1320-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_m577-ps.ppd.gz \ prnt/ps/hp-designjet_z5400-postscript.ppd.gz \ prnt/ps/hp-laserjet_m806-ps.ppd.gz \ prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz \ @@ -843,6 +850,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz \ prnt/ps/hp-laserjet_2430-ps.ppd.gz \ prnt/ps/hp-designjet_t1500-postscript.ppd.gz \ + prnt/ps/hp-laserjet_mfp_m527-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4500-ps.ppd.gz \ prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_5m-ps.ppd.gz \ @@ -851,11 +859,13 @@ foomatic_ps_printers = \ prnt/ps/hp-designjet_t795ps_44in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp5225dn-ps.ppd.gz \ prnt/ps/hp-color_laserjet_m552-ps.ppd.gz \ + prnt/ps/hp-laserjet_pro_m402_m403-ps.ppd.gz \ prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz \ prnt/ps/hp-laserjet_4345_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet-ps.ppd.gz \ prnt/ps/hp-color_laserjet_8500-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4600-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz \ prnt/ps/hp-laserjet_500_color_m551-ps.ppd.gz \ prnt/ps/hp-laserjet_4300-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz \ @@ -903,6 +913,7 @@ foomatic_ps_printers = \ prnt/ps/hp-designjet_t770_postscript-ps.ppd.gz \ prnt/ps/hp-laserjet_2200_series-ps.ppd.gz \ prnt/ps/hp-laserjet_5si-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m452-ps.ppd.gz \ prnt/ps/hp-designjet_4520ps-ps.ppd.gz \ prnt/ps/hp-laserjet_1220se-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp2025dn-ps.ppd.gz \ @@ -910,11 +921,13 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_4mp-ps.ppd.gz \ prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz \ prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz \ prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz \ prnt/ps/hp-laserjet_9040_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_2300-ps.ppd.gz \ prnt/ps/hp-laserjet_9000_series-ps.ppd.gz \ prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz \ + prnt/ps/hp-laserjet_m506-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2830-ps.ppd.gz \ prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz \ prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz \ @@ -937,6 +950,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_p3005-ps.ppd.gz \ prnt/ps/hp-laserjet_9040-ps.ppd.gz \ prnt/ps/hp-color_laserjet_3800-ps.ppd.gz \ + prnt/ps/hp-laserjet_mfp_m426_m427-ps.ppd.gz \ prnt/ps/hp-laserjet_1300n-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2605dn-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2800-ps.ppd.gz \ @@ -962,6 +976,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4550-ps.ppd.gz \ prnt/ps/hp-designjet_z6600-postscript.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_m274-ps.ppd.gz \ prnt/ps/hp-laserjet_700_m712-ps.ppd.gz \ prnt/ps/hp-laserjet_4050_series-ps.ppd.gz \ prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz \ @@ -989,6 +1004,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_8000_series-ps.ppd.gz \ prnt/ps/hp-mopier_320-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2600-ps.ppd.gz \ + prnt/ps/hp-laserjet_pro_m402_m403d-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4730mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_5000-ps.ppd.gz \ prnt/ps/hp-laserjet_m4345_mfp-ps.ppd.gz \ @@ -1011,6 +1027,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_1200n-ps.ppd.gz \ prnt/ps/hp-laserjet_3390-ps.ppd.gz \ prnt/ps/hp-laserjet_m604_m605_m606-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m452d-ps.ppd.gz \ prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz \ prnt/ps/hp-designjet_4500mfp.ppd.gz \ prnt/ps/hp-color_laserjet_m855-ps.ppd.gz \ @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/hplip-install b/hplip-install index 776a133a8..63ccfdb39 100755 --- a/hplip-install +++ b/hplip-install @@ -1,11 +1,27 @@ #!/bin/bash -MAJOR=`python -c 'import sys; print(sys.version_info[0])'` -MINOR=`python -c 'import sys; print(sys.version_info[1])'` + +PYTHON="python" + +if [ ! -f /usr/bin/python -a -f /usr/bin/python3 ]; then + PYTHON="python3" + PAT1="#!\/usr\/bin\/(env )?python$" + PAT2="#!\/usr\/bin\/env python3" + #replace shebang lines to python3 interpreter + for pyfile in `find . -maxdepth 1 -name "*.py"`; do + sed -i -r "0,/$PAT1/s//$PAT2/" $pyfile + done + for pyfile in `find . -type f \( -iname hpps -o -iname hpfax.py -o -iname pstotiff \)`; do + sed -i -r "0,/$PAT1/s//$PAT2/" $pyfile + done +fi + +MAJOR=`$PYTHON -c 'import sys; print(sys.version_info[0])'` +MINOR=`$PYTHON -c 'import sys; print(sys.version_info[1])'` if [ "$MAJOR" -le 2 ] && [ "$MINOR" -lt 6 ];then echo -e "\e[1;31mInstalled python version is ${MAJOR}.${MINOR}\e[0m" echo -e "\e[1;31mThis installer cannot be run on python version < 2.6\e[0m" echo -e "\e[1;31mPlease download the appropriate hplip version form www.hplipopensource.com\e[0m" exit 0 else - python ./install.py -i $* + ./install.py -i $* fi diff --git a/hplip.conf.in b/hplip.conf.in index f1df71a4c..f34a065e9 100644 --- a/hplip.conf.in +++ b/hplip.conf.in @@ -15,7 +15,7 @@ cupsbackend=@cupsbackenddir@ cupsfilter=@cupsfilterdir@ drv=@abs_drvdir@ bin=/usr/bin - +apparmor=@apparmordir@ # Following values are determined at configure time and cannot be changed. [configure] network-build=@network_build@ @@ -45,3 +45,4 @@ lite-build=@lite_build@ udev_sysfs_rules=@udev_sysfs_rules@ hpcups-only-build=@hpcups_only_build@ hpijs-only-build=@hpijs_only_build@ +apparmor_build=@apparmor_build@ diff --git a/hplip.list.in b/hplip.list.in index ae4d26c99..9e31fa1f5 100644 --- a/hplip.list.in +++ b/hplip.list.in @@ -2,7 +2,7 @@ # # ESP Package Manager (EPM) "list" file. # -# (c) 2008-2009 Copyright Hewlett-Packard Development Company, LP +# (c) 2008-2009 Copyright HP Development Company, LP # # Use this configuration for new distributions that support CUPSDDK 1.2.3 or higher. # ./configure --prefix=/usr @@ -22,8 +22,8 @@ # %product HPLIP -%copyright (c) 2004-2009 Copyright Hewlett-Packard Development Company, LP -%vendor Hewlett-Packard +%copyright (c) 2004-2009 Copyright HP Development Company, LP +%vendor HP %if PLUGIN %license prnt/plugins/license.txt %else @@ -31,7 +31,7 @@ %endif %readme doc/index.html %version @VERSION@ -%description The Hewlett-Packard Linux Imaging and Printing (HPLIP) system +%description The HP Linux Imaging and Printing (HPLIP) system %description provides a unified single and multi-function connectivity %description driver solution. HPLIPLITE provides support for print and scan only. %description HPLIPFULL provides support for print, scan, fax and toolbox. @@ -112,6 +112,8 @@ f 0644 root root $ppd/HP prnt/ps/*.ppd.gz @epm_print_only_exclude@l 0755 root root $libdir/libhpip.dylib libhpip.0.0.1.dylib @epm_print_only_exclude@f 0755 root root $libdir/libhpipp.0.0.1.dylib .libs/libhpipp.0.0.1.dylib @epm_print_only_exclude@l 0755 root root $libdir/libhpipp.dylib libhpipp.0.0.1.dylib +@epm_print_only_exclude@f 0755 root root $libdir/libhpdiscovery.0.0.1.dylib .libs/libhpdiscovery.0.0.1.dylib +@epm_print_only_exclude@l 0755 root root $libdir/libhpdiscovery.dylib libhpdiscovery.0.0.1.dylib %system !darwin @epm_print_only_exclude@f 0755 root root $libdir/libhpmud.so.0.0.6 .libs/libhpmud.so.0.0.6 @epm_print_only_exclude@l 0755 root root $libdir/libhpmud.so libhpmud.so.0.0.6 @@ -119,6 +121,8 @@ f 0644 root root $ppd/HP prnt/ps/*.ppd.gz @epm_print_only_exclude@l 0755 root root $libdir/libhpip.so libhpip.so.0.0.1 @epm_print_only_exclude@f 0755 root root $libdir/libhpipp.so.0.0.1 .libs/libhpipp.so.0.0.1 @epm_print_only_exclude@l 0755 root root $libdir/libhpipp.so libhpipp.so.0.0.1 +@epm_print_only_exclude@f 0755 root root $libdir/libhpdiscovery.so.0.0.1 .libs/libhpdiscovery.so.0.0.1 +@epm_print_only_exclude@l 0755 root root $libdir/libhpdiscovery.so libhpdiscovery.so.0.0.1 # Ugly fix for inconsistent libcrypto soname #l 0755 root root $libdir/libcrypto.so.6 libcrypto.so.0.9.8 @@ -203,6 +207,13 @@ f 0644 root root $ppd/HP prnt/ps/*.ppd.gz @epm_full@f 755 root root $home/unload.py unload.py @epm_full@f 755 root root $home/scan.py scan.py @epm_full@f 755 root root $home/sendfax.py sendfax.py + +@epm_full@d 775 root root $home/selinux - +@epm_full@f 755 root root $home/selinux/hplip.te selinux/hplip.te +@epm_full@f 755 root root $home/selinux/hplip.fc selinux/hplip.fc +@epm_full@f 755 root root $home/selinux/hplip.if selinux/hplip.if +@epm_full@f 755 root root $home/selinux/hplip.pp selinux/hplip.pp + @epm_full@d 775 root root $home/data - @epm_full@d 775 root root $home/data/pcl - @epm_full@f 644 root root $home/data/pcl data/pcl/*.pcl.gz @@ -486,6 +497,7 @@ l 0755 root root $home/prnt/plugins/hbpl1.so hbpl1-${machine}.so %postinstall <<EOF ver=`echo $version | sed 's/\([0-9]*.[0-9]*.[0-9]*\).*/\1/'` touch $home/data/plugin/hplip-$${ver}-plugin.run +semodule -n -i $home/selinux/hplip.pp EOF %postremove <<EOF ver=`echo $version | sed 's/\([0-9]*.[0-9]*.[0-9]*\).*/\1/'` diff --git a/hplip_clean.sh b/hplip_clean.sh index bb8750d06..c47d3593c 100755 --- a/hplip_clean.sh +++ b/hplip_clean.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# (c) Copyright @2013 Hewlett-Packard Development Company, L.P. +# (c) Copyright @2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/install.py b/install.py index d05484da4..e2a67be8a 100755 --- a/install.py +++ b/install.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/installer/__init__.py b/installer/__init__.py index ffdcaff09..c740ead61 100644 --- a/installer/__init__.py +++ b/installer/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/installer/core_install.py b/installer/core_install.py index f4b21c8a7..254a16363 100644 --- a/installer/core_install.py +++ b/installer/core_install.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -186,6 +186,13 @@ SCANEXT_STR = 'Scan-SANE-Extension' QT_STR = "Python-Qt" +APPARMOR_DIR = "/etc/apparmor.d" +SELINUX_DIR = "/etc/selinux/targeted/policy/policy*" +SEC_DICT = {"AppArmor": (APPARMOR_DIR, ["/etc/apparmor.d/usr.share.hplip", "/etc/apparmor.d/abstractions/hplip"]), + "SELinux": (SELINUX_DIR, ["/etc/selinux/targeted/modules/active/modules/hplip.pp"]) +} + + try: from functools import update_wrapper except ImportError: # using Python version < 2.5 @@ -229,6 +236,7 @@ class CoreInstall(object): self.enable = None self.disable = None self.reload_dbus = False + self.security_package = "" self.FIELD_TYPES = { @@ -372,13 +380,13 @@ class CoreInstall(object): } python3_dep = { - 'python3X': (True, ['base'], PYTHON_STR, self.check_python, DEPENDENCY_RUN_AND_COMPILE_TIME,'2.2','python --version',GENERALDEP), + 'python3X': (True, ['base'], PYTHON_STR, self.check_python, DEPENDENCY_RUN_AND_COMPILE_TIME,'2.2','python3 --version',GENERALDEP), 'python3-notify2' : (False, ['gui_qt4'], PYNTF_STR, self.check_pynotify, DEPENDENCY_RUN_TIME,'-','python-notify --version',GENERALDEP), # Optional for libnotify style popups from hp-systray 'python3-pyqt4-dbus': (False, ['gui_qt4'], QT4DBUS_STR, self.check_pyqt4_dbus, DEPENDENCY_RUN_TIME,'4.0','FUNC#get_pyQt4_version', GENERALDEP), 'python3-pyqt4': (True, ['gui_qt4'], QT4_STR, self.check_pyqt4, DEPENDENCY_RUN_TIME,'4.0','FUNC#get_pyQt4_version', GENERALDEP), # PyQt 4.x ) 'python3-dbus': (True, ['fax'], PYDBUS_STR, self.check_python_dbus, DEPENDENCY_RUN_TIME,'0.80.0','FUNC#get_python_dbus_ver', GENERALDEP), 'python3-xml' : (True, ['base'], PYXML_STR, self.check_python_xml, DEPENDENCY_RUN_TIME,'-','FUNC#get_python_xml_version',GENERALDEP), - 'python3-devel' : (True, ['base'], PY_DEV_STR, self.check_python_devel, DEPENDENCY_COMPILE_TIME,'2.2','python --version',GENERALDEP), + 'python3-devel' : (True, ['base'], PY_DEV_STR, self.check_python_devel, DEPENDENCY_COMPILE_TIME,'2.2','python3 --version',GENERALDEP), 'python3-pil': (False, ['scan'], PIL_STR, self.check_pil, DEPENDENCY_RUN_TIME,'-','FUNC#get_pil_version',GENERALDEP), # Optional fax packages 'python3-reportlab': (False, ['fax'], REPORTLAB_STR, self.check_reportlab, DEPENDENCY_RUN_TIME,'2.0','FUNC#get_reportlab_version',GENERALDEP), @@ -1198,6 +1206,29 @@ class CoreInstall(object): return found + + def security_package_status(self): + found = ["", False] + + for key in SEC_DICT.keys(): + if glob.glob(SEC_DICT[key][0]): + found[0] = key + found[1] = all(map(glob.glob, SEC_DICT[key][1])) + + return found + + return found + + + def selinux_install(self): + src_dir = os.getcwd() + profile_location = src_dir + "/selinux/hplip.pp" + profile_cmd = "semodule -n -i " + profile_location + cmd = self.passwordObj.getAuthCmd()%profile_cmd + log.info("Installing SELinux profile...") + status, output = utils.run(cmd, self.passwordObj) + + def get_hplip_version(self): self.version_description, self.version_public, self.version_internal = '', '', '' @@ -1348,6 +1379,12 @@ class CoreInstall(object): else: configure_cmd += ' --disable-%s' % c + # For AppArmor Profiles + if self.security_package == "AppArmor": + configure_cmd += ' --enable-apparmor_build' + if self.security_package == "SELinux": + configure_cmd += ' --enable-selinux_build' + # For Unit/Functional testing changes. if ".internal" in prop.version and os.path.exists('testcommon/'): configure_cmd += ' --enable-hplip_testing_flag' @@ -1861,6 +1898,12 @@ class CoreInstall(object): utils.remove(p, self.passwordObj, checkSudo) + #Removing Security profiles/policies + package_st = self.security_package_status() + if package_st[1]: + log.debug("Removing Security Profiles") + [utils.remove(f, self.passwordObj, checkSudo) for f in SEC_DICT[package_st[0]][1]] + #remove the binaries and libraries pat=re.compile(r"""(\S.*)share\/hplip""") base =pat.match(home_dir) diff --git a/installer/dcheck.py b/installer/dcheck.py index 27d7b1a0a..ab5d3bbe9 100644 --- a/installer/dcheck.py +++ b/installer/dcheck.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/installer/distros.dat b/installer/distros.dat index 4cfff3032..0baa10913 100644 --- a/installer/distros.dat +++ b/installer/distros.dat @@ -1,4 +1,4 @@ -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -112,7 +112,7 @@ supported=0 [suse] index=3 -versions=12.2,12.3,13.1,13.2 +versions=12.2,12.3,13.1,13.2,42.1 display_name=SUSE Linux alt_names= display=1 @@ -150,7 +150,6 @@ drv_dir=/usr/share/cups/drv/HP cups_path_with_bitness=0 ui_toolkit=qt4 native_cups=1 -open_mdns_port=/bin/bash ./init-suse-firewall pre_depend_cmd=su -c "zypper refresh" [suse:12.2:cups] @@ -290,7 +289,6 @@ drv_dir=/usr/share/cups/drv/HP cups_path_with_bitness=0 ui_toolkit=qt4 native_cups=1 -open_mdns_port=/bin/bash ./init-suse-firewall pre_depend_cmd=su -c "zypper refresh" [suse:12.3:cups] @@ -447,7 +445,6 @@ drv_dir=/usr/share/cups/drv/HP cups_path_with_bitness=0 ui_toolkit=qt4 native_cups=1 -open_mdns_port=/bin/bash ./init-suse-firewall pre_depend_cmd=su -c "zypper refresh" [suse:13.2:cups] @@ -571,6 +568,14 @@ packages=python3-reportlab [suse:13.2:python3-notify2] packages=python3-notify2 +# **************************************** + +[suse:42.1] +code_name=Malachitte +supported=1 +packaged_version=3.14.6 +release_date=04.11.2015 +same_as_version=13.2 # **************************************** @@ -774,7 +779,7 @@ ui_toolkit=qt3 # **************************************** [fedora] index=5 -versions=17,18,19,20,21,22 +versions=17,18,19,20,21,22,23 display_name=Fedora alt_names=Fedora Core display=1 @@ -1199,6 +1204,16 @@ packages=python3-pillow packages=python3-reportlab # **************************************** + +[fedora:23] +code_name= +supported=1 +packaged_version=3.15.7 +release_date=27/10/2015 +same_as_version=22 + + +# **************************************** [linspire] index=15 versions=5.0 @@ -2604,7 +2619,7 @@ packages=avahi # **************************************** [ubuntu] index=12 -versions=10.04,11.10,12.04,12.10,13.04,13.10,14.04,14.10,15.04 +versions=10.04,11.10,12.04,12.10,13.04,13.10,14.04,14.10,15.04,15.10 display_name=Ubuntu alt_names=kubuntu,edubuntu,xubuntu display=1 @@ -3598,6 +3613,14 @@ packages=python3-pil [ubuntu:15.04:python3-reportlab] packages=python3-reportlab +# ******************** + +[ubuntu:15.10] +code_name=Willy +packaged_version=3.15.7 +release_date=22/10/2015 +same_as_version=15.04 + # **************************************** [debian] diff --git a/installer/pluginhandler.py b/installer/pluginhandler.py index 2bed908d2..0a0ac587c 100755 --- a/installer/pluginhandler.py +++ b/installer/pluginhandler.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright @ 20013 Hewlett-Packard Development Company, L.P. +# (c) Copyright @ 20013 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/installer/text_install.py b/installer/text_install.py index c660740fa..e5eb93e9a 100755 --- a/installer/text_install.py +++ b/installer/text_install.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2014 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -360,6 +360,23 @@ def start(language, auto=True, test_depends=False, if not tui.continue_prompt("Please read the installation notes."): sys.exit(0) + sec_package_name, is_sec_installed = core.security_package_status() + + if sec_package_name: + tui.title("SECURITY PACKAGES") + log.info("%s is installed. " % sec_package_name) + log.info("%s protects the application from external intrusion attempts making the application secure" % sec_package_name ) + ok, answer = tui.enter_yes_no("\nWould you like to have this installer install the hplip specific policy/profile", default_value='') + if not ok: + sys.exit(0) + elif answer: + if sec_package_name == "SELinux": + core.selinux_install() + core.security_package = sec_package_name + else: + pass + + # # PRE-INSTALL COMMANDS # @@ -547,6 +564,20 @@ def start(language, auto=True, test_depends=False, else: log.info("Network connection present.") + # sec_package_name, is_sec_installed = core.security_package_status() + + # if sec_package_name: + # tui.title("SECURITY PACKAGES") + # log.info("%s is installed. " % sec_package_name) + # log.info("%s protects the application from external intrusion attempts making the application secure" % sec_package_name ) + # ok, answer = tui.enter_yes_no("\nWould you like to have this installer install the hplip specific policy/profile") + # if not ok: + # sys.exit(0) + # elif answer: + # core.security_package = sec_package_name + # else: + # pass + # # PRE-DEPEND # diff --git a/io/hpmud/dot4.c b/io/hpmud/dot4.c index ba56e53b0..d346bc907 100644 --- a/io/hpmud/dot4.c +++ b/io/hpmud/dot4.c @@ -2,7 +2,7 @@ dot4.c - 1284.4 support multi-point tranport driver - (c) 2005-2007 Copyright Hewlett-Packard Development Company, LP + (c) 2005-2007 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 diff --git a/io/hpmud/dot4.h b/io/hpmud/dot4.h index d69e288ae..89f3a0088 100644 --- a/io/hpmud/dot4.h +++ b/io/hpmud/dot4.h @@ -2,7 +2,7 @@ dot4.h - 1284.4 support for multi-point transport driver - (c) 2005-2007 Copyright Hewlett-Packard Development Company, LP + (c) 2005-2007 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 diff --git a/io/hpmud/hpmud.c b/io/hpmud/hpmud.c index c6ab57803..0eb6fff3a 100644 --- a/io/hpmud/hpmud.c +++ b/io/hpmud/hpmud.c @@ -2,7 +2,7 @@ hpmud.cpp - multi-point transport driver - (c) 2004-2007 Copyright Hewlett-Packard Development Company, LP + (c) 2004-2007 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 @@ -231,7 +231,14 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) service_to_channel(mud } else if (strncasecmp(sn, "hp-ipp", 6) == 0) { - *index = HPMUD_IPP_CHANNEL; + if (strncasecmp(sn, "hp-ipp2", 7) == 0) + *index = HPMUD_IPP_CHANNEL2; + else + *index = HPMUD_IPP_CHANNEL; + } + else if (strncasecmp(sn, "hp-escl-scan", 12) == 0) + { + *index = HPMUD_ESCL_SCAN_CHANNEL; } /* All the following services require MLC/1284.4. */ else if (pd->io_mode == HPMUD_RAW_MODE || pd->io_mode == HPMUD_UNI_MODE) @@ -499,10 +506,10 @@ int hpmud_get_uri_datalink(const char *uri, char *buf, int buf_size) if (zc) { #ifdef HAVE_LIBNETSNMP - if (hpmud_mdns_lookup(p, HPMUD_MDNS_TIMEOUT, ip) != HPMUD_R_OK) - return 0; - for (i=0; (ip[i] != 0) && (i < buf_size); i++) - buf[i] = ip[i]; + if (mdns_lookup(p, ip) != MDNS_STATUS_OK) + return 0; + for (i=0; (ip[i] != 0) && (i < buf_size); i++) + buf[i] = ip[i]; #else return 0; #endif @@ -619,7 +626,7 @@ enum HPMUD_RESULT hpmud_probe_devices(enum HPMUD_BUS_ID bus, char *buf, int buf_ if (bus == HPMUD_BUS_USB) { - len = musb_probe_devices(buf, buf_size, cnt); + len = musb_probe_devices(buf, buf_size, cnt, HPMUD_AIO); } #ifdef HAVE_PPORT else if (bus == HPMUD_BUS_PARALLEL) @@ -629,7 +636,32 @@ enum HPMUD_RESULT hpmud_probe_devices(enum HPMUD_BUS_ID bus, char *buf, int buf_ #endif else if (bus == HPMUD_BUS_ALL) { - len = musb_probe_devices(buf, buf_size, cnt); + len = musb_probe_devices(buf, buf_size, cnt, HPMUD_AIO); +#ifdef HAVE_PPORT + len += pp_probe_devices(buf+len, buf_size-len, cnt); +#endif + } + + *bytes_read = len; + + return HPMUD_R_OK; +} + +enum HPMUD_RESULT hpmud_probe_printers(enum HPMUD_BUS_ID bus, char *buf, int buf_size, int *cnt, int *bytes_read) +{ + int len=0; + + DBG("[%d] hpmud_probe_printers() bus=%d\n", getpid(), bus); + + if (buf == NULL || buf_size <= 0) + return HPMUD_R_INVALID_LENGTH; + + buf[0] = 0; + *cnt = 0; + + if (bus == HPMUD_BUS_ALL) + { + len = musb_probe_devices(buf, buf_size, cnt, HPMUD_PRINTER); #ifdef HAVE_PPORT len += pp_probe_devices(buf+len, buf_size-len, cnt); #endif diff --git a/io/hpmud/hpmud.h b/io/hpmud/hpmud.h index 74173202e..d3618e2d2 100644 --- a/io/hpmud/hpmud.h +++ b/io/hpmud/hpmud.h @@ -2,7 +2,7 @@ hpmud.h - public definitions for multi-point transport driver - (c) 2004-2015 Copyright Hewlett-Packard Development Company, LP + (c) 2004-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 @@ -68,6 +68,13 @@ enum HPMUD_BUS_ID HPMUD_BUS_ALL }; +enum HPMUD_DEVICE_TYPE +{ + HPMUD_AIO=0, + HPMUD_PRINTER=1, + HPMUD_SCANNER=2, +}; + enum HPMUD_SCANTYPE { HPMUD_SCANTYPE_NA = 0, @@ -79,6 +86,7 @@ enum HPMUD_SCANTYPE HPMUD_SCANTYPE_SCL_DUPLEX = 6, HPMUD_SCANTYPE_LEDM = 7, HPMUD_SCANTYPE_MARVELL2 = 8, /* (Tsunami lj 1212 and series) */ + HPMUD_SCANTYPE_ESCL=9, }; enum HPMUD_SCANSRC @@ -134,6 +142,8 @@ enum HPMUD_PLUGIN_TYPE #define HPMUD_S_WIFI_CHANNEL "HP-WIFICONFIG" #define HPMUD_S_MARVELL_EWS_CHANNEL "HP-MARVELL-EWS" #define HPMUD_S_IPP_CHANNEL "HP-IPP" +#define HPMUD_S_IPP_CHANNEL2 "HP-IPP2" +#define HPMUD_S_ESCL_SCAN "HP-ESCL-SCAN" typedef int HPMUD_DEVICE; /* usb, parallel or jetdirect */ #define HPMUD_DEVICE_MAX 2 /* zero is not used */ @@ -237,6 +247,21 @@ enum HPMUD_RESULT hpmud_get_device_status(HPMUD_DEVICE dd, unsigned int *status) enum HPMUD_RESULT hpmud_probe_devices(enum HPMUD_BUS_ID bus, char *buf, int buf_size, int *cnt, int *bytes_read); /* + * hpmud_probe_printers - probe local buses for HP supported printers, call normally does not block + * + * inputs: + * bus - see enum definiton + * buf_size - size of read buffer + * + * outputs: + * buf - zero terminated CUPS backend formatted data + * cnt - number of HP devices found + * bytes_read - number of bytes actually read + * return value - see enum definition + */ +enum HPMUD_RESULT hpmud_probe_printers(enum HPMUD_BUS_ID bus, char *buf, int buf_size, int *cnt, int *bytes_read); + +/* * hpmud_channel_open - open specified channel, call will block * * Only EWS channel can be opened by more than one process. @@ -513,20 +538,6 @@ enum HPMUD_RESULT hpmud_make_net_uri(const char *ip, int port, char *uri, int ur */ enum HPMUD_RESULT hpmud_make_par_uri(const char *dnode, char *uri, int uri_size, int *bytes_read); -/* - * hpmud_mdns_lookup - lookup IP for MDNS host name - * - * This function is a stateless hpmud helper function. - * - * inputs: - * host_name - zero terminated string (ie: "npi7c8a3e") - * sec_timeout - in seconds - * - * outputs: - * ip - zero terminated string - * return value - see enum definition - */ -enum HPMUD_RESULT hpmud_mdns_lookup(const char *host_name, int sec_timeout, char *ip); /* * hpmud_make_mdns_uri - make a network uri from host name diff --git a/io/hpmud/hpmudi.h b/io/hpmud/hpmudi.h index 2d367ec06..fca8fdd02 100644 --- a/io/hpmud/hpmudi.h +++ b/io/hpmud/hpmudi.h @@ -2,7 +2,7 @@ hpmudi.h - internal definitions for multi-point transport driver - (c) 2004-2007 Copyright Hewlett-Packard Development Company, LP + (c) 2004-2007 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 @@ -52,12 +52,13 @@ #include "pml.h" #ifdef HAVE_LIBNETSNMP #include "jd.h" +#include "mdns.h" #endif #ifdef HAVE_PPORT #include "pp.h" #endif -// Don DO NOT commit with HPMUD_DEBUG enabled :( +// DO NOT commit with HPMUD_DEBUG enabled :( //#define HPMUD_DEBUG #define _STRINGIZE(x) #x @@ -108,9 +109,11 @@ enum HPMUD_CHANNEL_ID HPMUD_EWS_LEDM_CHANNEL = 0x17, /* Embeded Web Server interface ff/4/1, any unused socket id */ HPMUD_LEDM_SCAN_CHANNEL = 0x18, /* LEDM scan interface ff/cc/0, any unused socket id */ HPMUD_MARVELL_EWS_CHANNEL = 0x19, /*MARVELL EWS interface found in Cicad Series*/ + HPMUD_ESCL_SCAN_CHANNEL = 0x1a, /* ESCL scan interface ff/cc/0, any unused socket id */ HPMUD_WIFI_CHANNEL = 0x2b, /* WIFI config */ HPMUD_DEVMGMT_CHANNEL = 0x2c, /* decimal 44 */ HPMUD_IPP_CHANNEL = 0x2d, + HPMUD_IPP_CHANNEL2 = 0x2e, HPMUD_MAX_CHANNEL_ID }; diff --git a/io/hpmud/jd.c b/io/hpmud/jd.c index a399b08b3..9a27eae75 100644 --- a/io/hpmud/jd.c +++ b/io/hpmud/jd.c @@ -2,7 +2,7 @@ jd.c - JetDirect support for multi-point transport driver - (c) 2004-2007 Copyright Hewlett-Packard Development Company, LP + (c) 2004-2007 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 @@ -159,10 +159,17 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_open(mud_device *pd char model[128]; char *p, *tail; int len=0; + int printqueue = 0; enum HPMUD_RESULT stat = HPMUD_R_IO_ERROR; pthread_mutex_lock(&pd->mutex); + //Check whether the URI is generated dynamically by using bonjour discovery. If yes, then + //there is no need of validating the MDL string against Device ID MDL string. If URI belongs to + //an existing print queue then we need to validate the MDL, because the same IP address might get + //assigned to some other device after adding a print queue. + printqueue = ( strstr(pd->uri, "queue=false") )? 0:1; + if (pd->id[0] == 0) { /* First client. */ @@ -180,22 +187,28 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_open(mud_device *pd goto blackout; } - len = device_id(pd->ip, pd->port, pd->id, sizeof(pd->id)); /* get new copy and cache it */ - if (len == 0) + if(printqueue) { - stat = HPMUD_R_IO_ERROR; - goto blackout; + len = device_id(pd->ip, pd->port, pd->id, sizeof(pd->id)); /* get new copy and cache it */ + if (len == 0) + { + stat = HPMUD_R_IO_ERROR; + goto blackout; + } } } - /* Make sure uri model matches device id model. */ - hpmud_get_uri_model(pd->uri, uri_model, sizeof(uri_model)); - hpmud_get_model(pd->id, model, sizeof(model)); - if (strcmp(uri_model, model) != 0) + if(printqueue) { - stat = HPMUD_R_INVALID_URI; /* different device plugged in */ - BUG("invalid uri model %s != %s\n", uri_model, model); - goto blackout; + /* Make sure uri model matches device id model. */ + hpmud_get_uri_model(pd->uri, uri_model, sizeof(uri_model)); + hpmud_get_model(pd->id, model, sizeof(model)); + if (strcmp(uri_model, model) != 0) + { + stat = HPMUD_R_INVALID_URI; /* different device plugged in */ + BUG("invalid uri model %s != %s\n", uri_model, model); + goto blackout; + } } stat = HPMUD_R_OK; @@ -488,6 +501,7 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_s_channel_open(mud_ break; case HPMUD_LEDM_SCAN_CHANNEL: case HPMUD_EWS_LEDM_CHANNEL: + case HPMUD_ESCL_SCAN_CHANNEL: port = 8080; pin.sin_port = htons(port); if ((pc->socket = socket(AF_INET, SOCK_STREAM, 0)) == -1) @@ -552,7 +566,7 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_s_channel_close(mud close(pc->socket); /* Delay for back-to-back scanning using scanimage. Otherwise next channel_open(HPMUD_SCAN_CHANNEL) can fail. */ - sleep(1); + usleep(100000); } pc->socket = -1; @@ -678,185 +692,6 @@ bugout: return stat; } -/* Convert "www.google.com" to "3www6google3com". */ -static int convert_name_to_dns(const char *name, int name_size, unsigned char *dns_name) -{ - int i, x=0; - unsigned 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 */ -} - -/* - * Lookup IP for MDNS host name. - * MDNS host name example: "npi7c8a3e" (LaserJet p2055dn) - */ -enum HPMUD_RESULT hpmud_mdns_lookup(const char *host_name, int sec_timeout, char *ip) -{ - struct sockaddr_in send_addr; - struct sockaddr_in recv_addr; - struct sockaddr_in addr; - socklen_t addrlen; - struct timeval tmo; - fd_set master; - fd_set readfd; - int i, len, n, host_len, yes=1; - int maxfd, ret; - int udp_socket; - char recvbuffer[256], host[256]; - unsigned char dnsquery[256]={0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; - unsigned char tail[] = {0x0, 0x1, 0x0, 0x1}; - unsigned char loop=0, ttl=255; - enum HPMUD_RESULT stat = HPMUD_R_IO_ERROR; - - DBG("mdns lookup '%s'\n", host_name); - - if(host_name == 0 || host_name[0] == 0) - return HPMUD_R_INVALID_MDNS; - - 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; - } - - /* Convert host name to mdns host name. */ - host_len = snprintf(host, sizeof(host), "%s.local", host_name) + 1; - - /* Create dns message. (header + question) */ - n = convert_name_to_dns(host, host_len, dnsquery+12); - memcpy(dnsquery+12+n, tail, sizeof(tail)); - n = 12+n+sizeof(tail); - - i=0; - while (1) - { - - DBG("send socket=%d len=%d\n", udp_socket, n); - DBG_DUMP(dnsquery, n); - - 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); - sendto(udp_socket, dnsquery, n, 0, (struct sockaddr *)&send_addr, sizeof(send_addr)); - - FD_ZERO(&master); - FD_SET(udp_socket, &master); - maxfd = udp_socket; - tmo.tv_sec = 0; - tmo.tv_usec = 500000; - - readfd = master; - ret = select(maxfd+1, &readfd, NULL, NULL, &tmo); - BUG("In while after select ret=%d maxfd=%d tmo=%d\n", ret, maxfd, tmo); - - if (ret < 0) - { - BUG("error mdns lookup %s: %m\n", host); - goto bugout; - } - if (ret == 0) - { - goto retry; - } - else - { - bzero(&addr, sizeof(addr)); - addrlen = sizeof(addr); - if ((len = recvfrom(udp_socket, recvbuffer, sizeof(recvbuffer), 0, (struct sockaddr *)&addr, &addrlen)) < 0) - { - BUG("error mdns lookup %s: %m\n", host); - goto bugout; - } - - /* Make sure reply is from specified host. */ - if (strncasecmp((const char *)dnsquery+12, (const char *)recvbuffer+12, n)==0) - break; - BUG("error mdns lookup %s: bad hostname in reply from ip=%s port=%d\n", host, inet_ntoa(addr.sin_addr), ntohs(addr.sin_port)); - } - -retry: - if (i++ >= 2 * sec_timeout) - { - BUG("error timeout mdns lookup %s\n", host); - goto bugout; - } - - BUG("mdns lookup %s retry %d...\n", host, i); - } - - strcpy(ip, inet_ntoa(addr.sin_addr)); - - DBG("recv socket=%d len=%d port=%d ip=%s\n", udp_socket, len, ntohs(addr.sin_port), ip); - DBG_DUMP(recvbuffer, len); - - stat = HPMUD_R_OK; - -bugout: - - if (udp_socket >= 0) - close(udp_socket); - - return stat; -} - enum HPMUD_RESULT hpmud_make_net_uri(const char *ip, int port, char *uri, int uri_size, int *bytes_read) { char id[1024]; @@ -917,7 +752,7 @@ enum HPMUD_RESULT hpmud_make_mdns_uri(const char *host, int port, char *uri, int goto bugout; } - if (hpmud_mdns_lookup(host, HPMUD_MDNS_TIMEOUT, ip) != HPMUD_R_OK) + if (mdns_lookup(host, ip) != MDNS_STATUS_OK) { BUG("invalid host %s, check firewall UDP/5353 or try using IP\n", host); stat = HPMUD_R_INVALID_MDNS; @@ -928,9 +763,9 @@ enum HPMUD_RESULT hpmud_make_mdns_uri(const char *host, int port, char *uri, int { hpmud_get_model(id, model, sizeof(model)); if (port == 1) - *bytes_read = snprintf(uri, uri_size, "hp:/net/%s?zc=%s", model, host); + *bytes_read = snprintf(uri, uri_size, "hp:/net/%s?zc=%s", model, host); else - *bytes_read = snprintf(uri, uri_size, "hp:/net/%s?zc=%s&port=%d", model, host, port); + *bytes_read = snprintf(uri, uri_size, "hp:/net/%s?zc=%s&port=%d", model, host, port); } else { @@ -944,6 +779,7 @@ enum HPMUD_RESULT hpmud_make_mdns_uri(const char *host, int port, char *uri, int bugout: return stat; } + #endif /* HAVE_LIBNETSNMP */ diff --git a/io/hpmud/jd.h b/io/hpmud/jd.h index 0062e7b3d..348f22bb4 100644 --- a/io/hpmud/jd.h +++ b/io/hpmud/jd.h @@ -2,7 +2,7 @@ jd.h - JetDirect support for multi-point transport driver - (c) 2004-2007 Copyright Hewlett-Packard Development Company, LP + (c) 2004-2007 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 diff --git a/io/hpmud/mlc.c b/io/hpmud/mlc.c index e8b97846a..b25604519 100644 --- a/io/hpmud/mlc.c +++ b/io/hpmud/mlc.c @@ -2,7 +2,7 @@ mlc.c - MLC support for multi-point tranport driver - (c) 2004-2007 Copyright Hewlett-Packard Development Company, LP + (c) 2004-2007 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 diff --git a/io/hpmud/mlc.h b/io/hpmud/mlc.h index afc6b22a7..a19effa07 100644 --- a/io/hpmud/mlc.h +++ b/io/hpmud/mlc.h @@ -2,7 +2,7 @@ mlc.h - MLC support for multi-point transport driver - (c) 2004-2007 Copyright Hewlett-Packard Development Company, LP + (c) 2004-2007 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 diff --git a/io/hpmud/model.c b/io/hpmud/model.c index 5856c2b87..4ea89907d 100644 --- a/io/hpmud/model.c +++ b/io/hpmud/model.c @@ -2,7 +2,7 @@ model.c - model parser for hplip devices - (c) 2006-2007 Copyright Hewlett-Packard Development Company, LP + (c) 2006-2007 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 diff --git a/io/hpmud/musb.c b/io/hpmud/musb.c index 4f889addd..a64158b9a 100644 --- a/io/hpmud/musb.c +++ b/io/hpmud/musb.c @@ -2,7 +2,7 @@ musb.c - USB support for multi-point transport driver - (c) 2010 - 2014 Copyright Hewlett-Packard Development Company, LP + (c) 2010 - 2014 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 @@ -97,21 +97,22 @@ static char *fd_name[MAX_FD] = "ff/1/0", "ff/cc/0", "ff/2/10", + "ff/9/1", }; static int fd_class[MAX_FD] = { - 0,0x7,0x7,0x7,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, + 0,0x7,0x7,0x7,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, }; static int fd_subclass[MAX_FD] = { - 0,0x1,0x1,0x1,0x1,0x2,0x3,0xff,0xd4,0x4,0x1,0xcc,0x2, + 0,0x1,0x1,0x1,0x1,0x2,0x3,0xff,0xd4,0x4,0x1,0xcc,0x2,0x9, }; static int fd_protocol[MAX_FD] = { - 0,0x2,0x3,0x4,0x1,0x1,0x1,0xff,0,0x1,0,0,0x10, + 0,0x2,0x3,0x4,0x1,0x1,0x1,0xff,0,0x1,0,0,0x10,0x1, }; static const unsigned char venice_power_on[] = {0x1b, '%','P','u','i','f','p','.','p','o','w','e','r',' ','1',';', @@ -515,6 +516,8 @@ static int claim_interface(libusb_device *dev, file_descriptor *pfd) goto bugout; } + if(pfd->alt_setting) + { if (libusb_set_interface_alt_setting(pfd->hd, pfd->interface, pfd->alt_setting)) { libusb_release_interface(pfd->hd, pfd->interface); @@ -522,6 +525,7 @@ static int claim_interface(libusb_device *dev, file_descriptor *pfd) pfd->hd = NULL; BUG("invalid set_altinterface %s altset=%d: %m\n", fd_name[pfd->fd], pfd->alt_setting); goto bugout; + } } pfd->write_active=0; @@ -929,14 +933,14 @@ static int new_channel(mud_device *pd, int index, const char *sn) index == HPMUD_SOAPSCAN_CHANNEL || index == HPMUD_SOAPFAX_CHANNEL || index == HPMUD_MARVELL_SCAN_CHANNEL || index == HPMUD_MARVELL_FAX_CHANNEL || index == HPMUD_LEDM_SCAN_CHANNEL || index == HPMUD_MARVELL_EWS_CHANNEL || - index == HPMUD_IPP_CHANNEL) { + index == HPMUD_IPP_CHANNEL || index == HPMUD_IPP_CHANNEL2 || index == HPMUD_ESCL_SCAN_CHANNEL) { pd->channel[index].vf = musb_comp_channel_vf; } else if (pd->io_mode == HPMUD_RAW_MODE || pd->io_mode == HPMUD_UNI_MODE) { - pd->channel[index].vf = musb_raw_channel_vf; + pd->channel[index].vf = musb_raw_channel_vf; } else if (pd->io_mode == HPMUD_MLC_GUSHER_MODE || pd->io_mode == HPMUD_MLC_MISER_MODE) { - pd->channel[index].vf = musb_mlc_channel_vf; + pd->channel[index].vf = musb_mlc_channel_vf; } else { pd->channel[index].vf = musb_dot4_channel_vf; @@ -981,6 +985,7 @@ static void write_thread(file_descriptor *pfd) if (ep < 0) { BUG("invalid bulk out endpoint\n"); + pfd->write_return = -ENOTCONN; goto bugout; } @@ -1414,12 +1419,12 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_raw_channel_close if (( ep = get_in_ep(libusb_dev, fd_table[fd].config, fd_table[fd].interface, fd_table[fd].alt_setting, LIBUSB_TRANSFER_TYPE_BULK)) >= 0) { - libusb_clear_halt(fd_table[fd].hd, ep); + //libusb_clear_halt(fd_table[fd].hd, ep); } if (( ep = get_out_ep(libusb_dev, fd_table[fd].config, fd_table[fd].interface, fd_table[fd].alt_setting, LIBUSB_TRANSFER_TYPE_BULK)) >= 0) { - libusb_clear_halt(fd_table[fd].hd, ep); + //libusb_clear_halt(fd_table[fd].hd, ep); } release_interface(&fd_table[fd]); @@ -1448,7 +1453,7 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_raw_channel_write BUG("unable to write data %s: %d second io timeout\n", msp->device[pc->dindex].uri, sec_timeout); } else - BUG("unable to write data %s: %m\n", msp->device[pc->dindex].uri); + BUG("unable to write data (len = %d) %s: %m\n", msp->device[pc->dindex].uri, len); goto bugout; } size-=len; @@ -1530,6 +1535,7 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_comp_channel_open fd = FD_ff_1_0; break; case HPMUD_LEDM_SCAN_CHANNEL: //using vendor specific C/S/P codes for fax too + case HPMUD_ESCL_SCAN_CHANNEL: fd = FD_ff_cc_0; break; case HPMUD_MARVELL_EWS_CHANNEL: @@ -1538,6 +1544,9 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_comp_channel_open case HPMUD_IPP_CHANNEL: fd = FD_7_1_4; break; + case HPMUD_IPP_CHANNEL2: + fd = FD_ff_9_1; + break; default: stat = HPMUD_R_INVALID_SN; BUG("invalid %s channel=%d\n", pc->sn, pc->index); @@ -2019,7 +2028,7 @@ bugout: * USB probe devices, walk the USB bus(s) looking for HP products. */ -int __attribute__ ((visibility ("hidden"))) musb_probe_devices(char *lst, int lst_size, int *cnt) +int __attribute__ ((visibility ("hidden"))) musb_probe_devices(char *lst, int lst_size, int *cnt, enum HPMUD_DEVICE_TYPE devtype) { libusb_context *ctx = NULL; libusb_device **list; /*List of connected USB devices */ @@ -2073,6 +2082,11 @@ int __attribute__ ((visibility ("hidden"))) musb_probe_devices(char *lst, int ls { if (altptr->bInterfaceClass == LIBUSB_CLASS_PRINTER ) /* Printer */ { + if( (devtype == HPMUD_PRINTER) && (altptr->bInterfaceProtocol != 0x02) ) + { + continue; /*Check for only print interface (7/1/2) */ + } + libusb_open(dev, &hd); if (hd == NULL) { diff --git a/io/hpmud/musb.h b/io/hpmud/musb.h index 2e8318140..6e370e08b 100644 --- a/io/hpmud/musb.h +++ b/io/hpmud/musb.h @@ -2,7 +2,7 @@ musb.h - USB support for multi-point transport driver - (c) 2010-2014 Copyright Hewlett-Packard Development Company, LP + (c) 2010-2014 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 @@ -54,6 +54,7 @@ enum FD_ID FD_ff_1_0, /* Marvell fax support*/ FD_ff_cc_0, FD_ff_2_10, + FD_ff_9_1, MAX_FD }; @@ -125,7 +126,7 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_dot4_channel_clos enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_dot4_channel_write(struct _mud_channel *pc, const void *buf, int length, int sec_timeout, int *bytes_wrote); enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_dot4_channel_read(struct _mud_channel *pc, void *buf, int length, int sec_timeout, int *bytes_read); -int __attribute__ ((visibility ("hidden"))) musb_probe_devices(char *lst, int lst_size, int *cnt); +int __attribute__ ((visibility ("hidden"))) musb_probe_devices(char *lst, int lst_size, int *cnt, enum HPMUD_DEVICE_TYPE devtype); int __attribute__ ((visibility ("hidden"))) power_up(struct _mud_device *pd, int fd); #endif // _MUSB_H diff --git a/io/hpmud/musb_libusb01.c b/io/hpmud/musb_libusb01.c index 7366754d5..19678025a 100644 --- a/io/hpmud/musb_libusb01.c +++ b/io/hpmud/musb_libusb01.c @@ -2,7 +2,7 @@ musb.c - USB support for multi-point transport driver - (c) 2010 Copyright Hewlett-Packard Development Company, LP + (c) 2010 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 @@ -95,21 +95,22 @@ static char *fd_name[MAX_FD] = "ff/1/0", "ff/cc/0", "ff/2/10", + "ff/9/1", }; static int fd_class[MAX_FD] = { - 0,0x7,0x7,0x7,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, + 0,0x7,0x7,0x7,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, }; static int fd_subclass[MAX_FD] = { - 0,0x1,0x1,0x1,0x1,0x2,0x3,0xff,0xd4,0x4,0x1,0xcc,0x2, + 0,0x1,0x1,0x1,0x1,0x2,0x3,0xff,0xd4,0x4,0x1,0xcc,0x2,0x9, }; static int fd_protocol[MAX_FD] = { - 0,0x2,0x3,0x4,0x1,0x1,0x1,0xff,0,0x1,0,0,0x10, + 0,0x2,0x3,0x4,0x1,0x1,0x1,0xff,0,0x1,0,0,0x10,0x1, }; static const unsigned char venice_power_on[] = {0x1b, '%','P','u','i','f','p','.','p','o','w','e','r',' ','1',';', @@ -195,6 +196,30 @@ static int is_interface(struct usb_device *dev, int dclass) return 0; /* no interface found */ } + +/* Check for USB interface descriptor with print interface. */ +static int is_printer(struct usb_device *dev) +{ + struct usb_interface_descriptor *pi; + int i, j, k; + + for (i=0; i<dev->descriptor.bNumConfigurations; i++) + { + for (j=0; j<dev->config[i].bNumInterfaces; j++) + { + for (k=0; k<dev->config[i].interface[j].num_altsetting; k++) + { + pi = &dev->config[i].interface[j].altsetting[k]; + if (pi->bInterfaceClass == 0x07 && pi->bInterfaceProtocol == 0x02) + { + return 1; /* found interface */ + } + } + } + } + return 0; /* no interface found */ +} + /* Write HP vendor-specific ECP channel message. */ static int write_ecp_channel(file_descriptor *pfd, int value) { @@ -911,7 +936,7 @@ static int new_channel(mud_device *pd, int index, const char *sn) index == HPMUD_SOAPSCAN_CHANNEL || index == HPMUD_SOAPFAX_CHANNEL || index == HPMUD_MARVELL_SCAN_CHANNEL || index == HPMUD_MARVELL_FAX_CHANNEL || index == HPMUD_LEDM_SCAN_CHANNEL || index == HPMUD_MARVELL_EWS_CHANNEL || - index == HPMUD_IPP_CHANNEL) { + index == HPMUD_IPP_CHANNEL || index == HPMUD_IPP_CHANNEL2 || index == HPMUD_ESCL_SCAN_CHANNEL) { pd->channel[index].vf = musb_comp_channel_vf; } else if (pd->io_mode == HPMUD_RAW_MODE || pd->io_mode == HPMUD_UNI_MODE) { @@ -962,6 +987,7 @@ static void write_thread(file_descriptor *pfd) if ((ep = get_out_ep(libusb_device, pfd->config, pfd->interface, pfd->alt_setting, USB_ENDPOINT_TYPE_BULK)) < 0) { BUG("invalid bulk out endpoint\n"); + pfd->write_return = -ENOTCONN; goto bugout; } @@ -1427,7 +1453,7 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_raw_channel_write BUG("unable to write data %s: %d second io timeout\n", msp->device[pc->dindex].uri, sec_timeout); } else - BUG("unable to write data %s: %m\n", msp->device[pc->dindex].uri); + BUG("unable to write data %s (len = %d): %m\n", msp->device[pc->dindex].uri, len); goto bugout; } size-=len; @@ -1509,6 +1535,7 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_comp_channel_open fd = FD_ff_1_0; break; case HPMUD_LEDM_SCAN_CHANNEL: //using vendor specific C/S/P codes for fax too + case HPMUD_ESCL_SCAN_CHANNEL: fd = FD_ff_cc_0; break; case HPMUD_MARVELL_EWS_CHANNEL: @@ -1517,6 +1544,9 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_comp_channel_open case HPMUD_IPP_CHANNEL: fd = FD_7_1_4; break; + case HPMUD_IPP_CHANNEL2: + fd = FD_ff_9_1; + break; default: stat = HPMUD_R_INVALID_SN; BUG("invalid %s channel=%d\n", pc->sn, pc->index); @@ -2016,7 +2046,7 @@ bugout: * USB probe devices, walk the USB bus(s) looking for HP products. */ -int __attribute__ ((visibility ("hidden"))) musb_probe_devices(char *lst, int lst_size, int *cnt) +int __attribute__ ((visibility ("hidden"))) musb_probe_devices(char *lst, int lst_size, int *cnt, enum HPMUD_DEVICE_TYPE devtype) { struct usb_bus *bus; struct usb_device *dev; @@ -2043,6 +2073,11 @@ int __attribute__ ((visibility ("hidden"))) musb_probe_devices(char *lst, int ls if (dev->descriptor.idVendor == 0x3f0 && is_interface(dev, 7)) { + if((devtype == HPMUD_PRINTER) && !is_printer(dev)) + { + continue; /*Skip all HP devices which do not have print interface*/ + } + if((hd = usb_open(dev)) == NULL) { BUG("Invalid usb_open: %m\n"); diff --git a/io/hpmud/pml.c b/io/hpmud/pml.c index 4e0b61b0e..98e705528 100644 --- a/io/hpmud/pml.c +++ b/io/hpmud/pml.c @@ -6,7 +6,7 @@ interface sits on top of the hpmud core interface. The system interface does not use the hpmud memory map file system. - (c) 2004-2007 Copyright Hewlett-Packard Development Company, LP + (c) 2004-2007 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 diff --git a/io/hpmud/pml.h b/io/hpmud/pml.h index 188d584c9..ab8b6d79a 100644 --- a/io/hpmud/pml.h +++ b/io/hpmud/pml.h @@ -2,7 +2,7 @@ pml.h - get/set pml api for hpmud - (c) 2004-2007 Copyright Hewlett-Packard Development Company, LP + (c) 2004-2007 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 @@ -20,7 +20,7 @@ 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. - (c) 2003-2004 Copyright Hewlett-Packard Development Company, LP + (c) 2003-2004 Copyright HP Development Company, LP \*****************************************************************************/ diff --git a/io/hpmud/pp.c b/io/hpmud/pp.c index 61b638092..74c5fdcb4 100644 --- a/io/hpmud/pp.c +++ b/io/hpmud/pp.c @@ -2,7 +2,7 @@ pp.c - parallel port support for multi-point transport driver - (c) 2004-2007 Copyright Hewlett-Packard Development Company, LP + (c) 2004-2007 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 diff --git a/io/hpmud/pp.h b/io/hpmud/pp.h index 5a5198f85..501fb932c 100644 --- a/io/hpmud/pp.h +++ b/io/hpmud/pp.h @@ -2,7 +2,7 @@ pp.h - parallel port support for multi-point transport driver - (c) 2004-2007 Copyright Hewlett-Packard Development Company, LP + (c) 2004-2007 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 diff --git a/io/mudext/hpmudext.c b/io/mudext/hpmudext.c index 91882f323..975fe48e6 100644 --- a/io/mudext/hpmudext.c +++ b/io/mudext/hpmudext.c @@ -1,7 +1,7 @@ /*****************************************************************************\ hpmudext - Python extension for HP multi-point transport driver (HPMUD) - (c) Copyright 2010 Hewlett-Packard Development Company, L.P. + (c) Copyright 2015 HP Development Company, L.P. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -313,8 +313,8 @@ static PyObject *make_zc_uri(PyObject *self, PyObject *args) char *hn; int port; char uri[HPMUD_BUFFER_SIZE]; - enum HPMUD_RESULT result = HPMUD_R_OK; int bytes_read = 0; + enum HPMUD_RESULT result = HPMUD_R_OK; if (!PyArg_ParseTuple(args, "si", &hn, &port)) return NULL; @@ -336,14 +336,17 @@ static PyObject *make_zc_uri(PyObject *self, PyObject *args) static PyObject *get_zc_ip_address(PyObject *self, PyObject *args) { char *hn; - char ip[HPMUD_BUFFER_SIZE]; + char ip[HPMUD_BUFFER_SIZE] = {0,}; enum HPMUD_RESULT result = HPMUD_R_OK; if (!PyArg_ParseTuple(args, "s", &hn)) return NULL; Py_BEGIN_ALLOW_THREADS - result = hpmud_mdns_lookup(hn, HPMUD_MDNS_TIMEOUT, ip); + + if(mdns_lookup(hn, ip) != MDNS_STATUS_OK) + result = HPMUD_R_INVALID_MDNS; + Py_END_ALLOW_THREADS return Py_BuildValue("(is)", result, ip); @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/ipdefs.h b/ip/ipdefs.h index 6611c6a97..c55f947e4 100644 --- a/ip/ipdefs.h +++ b/ip/ipdefs.h @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/ipmain.c b/ip/ipmain.c index 250d84e08..7f0e06875 100644 --- a/ip/ipmain.c +++ b/ip/ipmain.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xbi2gray.c b/ip/xbi2gray.c index a25081157..d4d365b53 100644 --- a/ip/xbi2gray.c +++ b/ip/xbi2gray.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xchgbpp.c b/ip/xchgbpp.c index dd8a45420..758bf1f45 100644 --- a/ip/xchgbpp.c +++ b/ip/xchgbpp.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xcolrspc.c b/ip/xcolrspc.c index 98a60b869..fe73b6ab0 100644 --- a/ip/xcolrspc.c +++ b/ip/xcolrspc.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xconvolve.c b/ip/xconvolve.c index 56d420d3c..6164b32f2 100644 --- a/ip/xconvolve.c +++ b/ip/xconvolve.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xcrop.c b/ip/xcrop.c index 2613b9890..5de538a0b 100644 --- a/ip/xcrop.c +++ b/ip/xcrop.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xfakemono.c b/ip/xfakemono.c index e21a862df..682f127fd 100644 --- a/ip/xfakemono.c +++ b/ip/xfakemono.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xform.h b/ip/xform.h index 4ce48299c..8836a234f 100644 --- a/ip/xform.h +++ b/ip/xform.h @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xgamma.c b/ip/xgamma.c index 4058b91a0..bce49d245 100644 --- a/ip/xgamma.c +++ b/ip/xgamma.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xgray2bi.c b/ip/xgray2bi.c index 1946e1b4c..67f521f42 100644 --- a/ip/xgray2bi.c +++ b/ip/xgray2bi.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xgrayout.c b/ip/xgrayout.c index aa379a66f..9f1d6c5bc 100644 --- a/ip/xgrayout.c +++ b/ip/xgrayout.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xinvert.c b/ip/xinvert.c index a187fa91d..9ce99b8cc 100644 --- a/ip/xinvert.c +++ b/ip/xinvert.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xjpg_dct.c b/ip/xjpg_dct.c index b20e17e07..63f021bc8 100644 --- a/ip/xjpg_dct.c +++ b/ip/xjpg_dct.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xjpg_dct.h b/ip/xjpg_dct.h index 15fedb8a6..7dc90f37d 100644 --- a/ip/xjpg_dct.h +++ b/ip/xjpg_dct.h @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xjpg_dec.c b/ip/xjpg_dec.c index 507e11aaf..cb855fb70 100644 --- a/ip/xjpg_dec.c +++ b/ip/xjpg_dec.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xjpg_enc.c b/ip/xjpg_enc.c index a65bddb8d..031a50b40 100644 --- a/ip/xjpg_enc.c +++ b/ip/xjpg_enc.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xjpg_fix.c b/ip/xjpg_fix.c index 709fcac41..ed55e4ee9 100644 --- a/ip/xjpg_fix.c +++ b/ip/xjpg_fix.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xjpg_huf.c b/ip/xjpg_huf.c index 93735771b..5d110a64c 100644 --- a/ip/xjpg_huf.c +++ b/ip/xjpg_huf.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xjpg_huf.h b/ip/xjpg_huf.h index 1dd4be37e..b5d5055d2 100644 --- a/ip/xjpg_huf.h +++ b/ip/xjpg_huf.h @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xjpg_mrk.h b/ip/xjpg_mrk.h index 29aecc9bc..2a2b1063d 100644 --- a/ip/xjpg_mrk.h +++ b/ip/xjpg_mrk.h @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xmatrix.c b/ip/xmatrix.c index 4bff39a50..52dc5fd28 100644 --- a/ip/xmatrix.c +++ b/ip/xmatrix.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xrotate.c b/ip/xrotate.c index 130b05ab3..0e07d6aab 100644 --- a/ip/xrotate.c +++ b/ip/xrotate.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xsaturation.c b/ip/xsaturation.c index 472dfda9c..7d190e5e6 100644 --- a/ip/xsaturation.c +++ b/ip/xsaturation.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xscale.c b/ip/xscale.c index 0dbd5c7de..54315c442 100644 --- a/ip/xscale.c +++ b/ip/xscale.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xskel.c b/ip/xskel.c index 930af944a..2866e7227 100644 --- a/ip/xskel.c +++ b/ip/xskel.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xtable.c b/ip/xtable.c index 35c85a234..44fe43701 100644 --- a/ip/xtable.c +++ b/ip/xtable.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xthumb.c b/ip/xthumb.c index f5fb33a19..705b35fc1 100644 --- a/ip/xthumb.c +++ b/ip/xthumb.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xtiff.c b/ip/xtiff.c index e1338e549..ac362b8a8 100644 --- a/ip/xtiff.c +++ b/ip/xtiff.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xtonemap.c b/ip/xtonemap.c index a92080a5f..607c23e17 100644 --- a/ip/xtonemap.c +++ b/ip/xtonemap.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL diff --git a/ip/xyxtract.c b/ip/xyxtract.c index b5156e4e3..f4e89d667 100644 --- a/ip/xyxtract.c +++ b/ip/xyxtract.c @@ -1,6 +1,6 @@ /* libhpojip -- HP OfficeJet image-processing library. */ -/* Copyright (C) 1995-2002 Hewlett-Packard Company +/* Copyright (C) 1995-2002 HP Company * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. * - * In addition, as a special exception, Hewlett-Packard Company + * In addition, as a special exception, HP Company * gives permission to link the code of this program with any * version of the OpenSSL library which is distributed under a * license identical to that listed in the included LICENSE.OpenSSL @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/linefeedcal.py b/linefeedcal.py index b0a8f62e5..d99d9c541 100755 --- a/linefeedcal.py +++ b/linefeedcal.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/logcapture.py b/logcapture.py index 54be3a49c..2b47f2f4f 100755 --- a/logcapture.py +++ b/logcapture.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2014 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/makecopies.py b/makecopies.py index 964d221e4..3463f3b9c 100755 --- a/makecopies.py +++ b/makecopies.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/makeuri.py b/makeuri.py index fcd34ceb6..2838f5773 100755 --- a/makeuri.py +++ b/makeuri.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pcard/__init__.py b/pcard/__init__.py index 97d3c89a2..1ab2ca6a2 100644 --- a/pcard/__init__.py +++ b/pcard/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pcard/fat.c b/pcard/fat.c index 888bccceb..caa383f7c 100644 --- a/pcard/fat.c +++ b/pcard/fat.c @@ -2,7 +2,7 @@ fat.c - FAT12/FAT16 file system - (c) 2004 Copyright Hewlett-Packard Development Company, LP + (c) 2004 Copyright HP Development Company, LP This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/pcard/fat.h b/pcard/fat.h index 7b347b4c8..b7cb34524 100644 --- a/pcard/fat.h +++ b/pcard/fat.h @@ -2,7 +2,7 @@ fat.h - FAT12/FAT16 file system - (c) 2004 Copyright Hewlett-Packard Development Company, LP + (c) 2004 Copyright HP Development Company, LP This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/pcard/pcardext/pcardext.c b/pcard/pcardext/pcardext.c index 047098463..c1a8273e4 100644 --- a/pcard/pcardext/pcardext.c +++ b/pcard/pcardext/pcardext.c @@ -1,7 +1,7 @@ /*****************************************************************************\ pcardext - Python extension for HP photocard services - (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. + (c) Copyright 2003-2015 HP Development Company, L.P. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/pcard/photocard.py b/pcard/photocard.py index e76d61083..913dc4e98 100644 --- a/pcard/photocard.py +++ b/pcard/photocard.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pcard/ptest.c b/pcard/ptest.c index 6ef516f28..8aba73c51 100644 --- a/pcard/ptest.c +++ b/pcard/ptest.c @@ -2,7 +2,7 @@ ptest.c - HP MFP photo card file manager - (c) 2004 Copyright Hewlett-Packard Development Company, LP + (c) 2004 Copyright HP Development Company, LP This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -318,7 +318,7 @@ bugout: void usage() { fprintf(stdout, "HP MFP Photo Card File Manager %s\n", VERSION); - fprintf(stdout, "(c) 2004-2007 Copyright Hewlett-Packard Development Company, LP\n"); + fprintf(stdout, "(c) 2004-2007 Copyright HP Development Company, LP\n"); fprintf(stdout, "usage: ptest [-v] [-u uri] -c ls [-p path] (list directory)\n"); fprintf(stdout, " ptest [-v] [-u uri] -c read -p path (read file to stdout)\n"); fprintf(stdout, " ptest [-v] [-u uri] -c rm -p path (delete file)\n"); diff --git a/pcard/ptest.h b/pcard/ptest.h index db30d7eab..52202a63b 100644 --- a/pcard/ptest.h +++ b/pcard/ptest.h @@ -2,7 +2,7 @@ ptest.h - HP MFP photo card file manager - (c) 2004 Copyright Hewlett-Packard Development Company, LP + (c) 2004 Copyright HP Development Company, LP This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/pkservice.py b/pkservice.py index a554cfee4..711a6426f 100755 --- a/pkservice.py +++ b/pkservice.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/plugins/Deskjet_460.py b/plugins/Deskjet_460.py index d0e51e4e5..e6cd669ae 100644 --- a/plugins/Deskjet_460.py +++ b/plugins/Deskjet_460.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/plugins/Officejet_H470.py b/plugins/Officejet_H470.py index d0e51e4e5..e6cd669ae 100644 --- a/plugins/Officejet_H470.py +++ b/plugins/Officejet_H470.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/plugins/__init__.py b/plugins/__init__.py index 97d3c89a2..1ab2ca6a2 100644 --- a/plugins/__init__.py +++ b/plugins/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/plugins/dj450.py b/plugins/dj450.py index d0e51e4e5..e6cd669ae 100644 --- a/plugins/dj450.py +++ b/plugins/dj450.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/plugins/powersettings.py b/plugins/powersettings.py index 0981a7323..1481e44f7 100644 --- a/plugins/powersettings.py +++ b/plugins/powersettings.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/plugins/powersettings2.py b/plugins/powersettings2.py index 2721f53d6..914d6b038 100644 --- a/plugins/powersettings2.py +++ b/plugins/powersettings2.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/plugins/powersettingsdialog.py b/plugins/powersettingsdialog.py index 0bc680655..9e83234ff 100644 --- a/plugins/powersettingsdialog.py +++ b/plugins/powersettingsdialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ppd/hpcups/apollo-2100.ppd.gz b/ppd/hpcups/apollo-2100.ppd.gz Binary files differindex 01df243e8..e73013cd8 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 8c21abdd9..d83211977 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 b84e4059a..5283d6d85 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 44e0eff0e..f32eeb509 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 b09a81b7e..55514047a 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 46a7d61cb..3034b2b12 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 9cf50e45b..169051b17 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 109c7029b..3f432a745 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 d416fdbaa..e8cecfcf6 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 5b8b1ce16..26a6a5f63 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 bf047a83b..4a70651a2 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 1ab19f9db..0e9918645 100644 --- a/ppd/hpcups/hp-915.ppd.gz +++ b/ppd/hpcups/hp-915.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_1000.ppd.gz b/ppd/hpcups/hp-business_inkjet_1000.ppd.gz Binary files differindex 38701f75a..22107f729 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 1291e4615..3c0753c0d 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 0f2abf1c3..94c26cf94 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 cb658765a..cb19e434d 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 77a98a5b9..a7eaf7c1d 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 c6bd9eb5d..b7f6a6d28 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 2f6de3171..af8292c5e 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 9c2daa70a..5a7a94e3b 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 462ea5441..9af75e682 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 536de2fd6..7d0b1e5a2 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 fa54777d4..7b3153267 100644 --- a/ppd/hpcups/hp-business_inkjet_3000-pcl3.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_3000-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_inkjet_cp1700.ppd.gz b/ppd/hpcups/hp-color_inkjet_cp1700.ppd.gz Binary files differindex 247d2eb67..e42a4d4c8 100644 --- a/ppd/hpcups/hp-color_inkjet_cp1700.ppd.gz +++ b/ppd/hpcups/hp-color_inkjet_cp1700.ppd.gz diff --git a/ppd/hpcups/hp-color_inkjet_printer_cp1700.ppd.gz b/ppd/hpcups/hp-color_inkjet_printer_cp1700.ppd.gz Binary files differindex baf210a0f..be1aebbd5 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 74a60ad76..ccbbdc0ee 100644 --- a/ppd/hpcups/hp-color_laserjet_1600.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_1600.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_2500-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_2500-pcl3.ppd.gz Binary files differindex cfd49bc81..24f0c2273 100644 --- a/ppd/hpcups/hp-color_laserjet_2500-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_2500-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_2500_series.ppd.gz b/ppd/hpcups/hp-color_laserjet_2500_series.ppd.gz Binary files differindex d6c8efb79..d90461ffc 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 3ccc650d9..f63ef3cdb 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 cb6572a1c..93a395f64 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 fe1f46127..5cb0667c7 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 4fa49a35a..95e899a8a 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 00e117855..502691ef0 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 2c0bf86e9..3633b61b3 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 3286bb18c..d65629abb 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 dd884486b..08bb23561 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 168c74db7..7994d838d 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 8d912e506..7e340056a 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 9ddeb570b..d603532ae 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 3b84726bc..d9d127e66 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 ede17c3fc..e471d8fac 100644 --- a/ppd/hpcups/hp-color_laserjet_4600-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_4600-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_4600_series.ppd.gz b/ppd/hpcups/hp-color_laserjet_4600_series.ppd.gz Binary files differindex 15356ecad..555b5767c 100644 --- a/ppd/hpcups/hp-color_laserjet_4600_series.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_4600_series.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_4610-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4610-pcl3.ppd.gz Binary files differindex 236f97906..16a73fc5a 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 35be2cfa5..8171b0e2d 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 71d407415..da65d0533 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 7177f2e3c..fb354f7ae 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 23ea2c0fd..bf55e57bc 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 64d13fa81..fa55febd0 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 6348152f4..325779ed8 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 1e8f40117..4a6095a95 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 641f73dc2..9ae22ab09 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 1770220dd..ab89911f2 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 4b4e53527..f042d48ab 100644 --- a/ppd/hpcups/hp-color_laserjet_9500-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_9500-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_9500_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_9500_mfp-pcl3.ppd.gz Binary files differindex 74ea2f7cf..db191b401 100644 --- a/ppd/hpcups/hp-color_laserjet_9500_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_9500_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz Binary files differindex 40187d337..e7c2a59b4 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 eae1a0693..ff653dee6 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 2e8b8e0f9..e12f7f784 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 bf93c9d9a..de724070a 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 30444ce97..f14bacaed 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 f4033a3ce..4baf23562 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 e7eeb9c53..4cce963d9 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 576b951b3..a07ec83b5 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 0bcf85d73..31139fcbb 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 9dce914a1..0987c30f7 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 69048af78..d2e4199f2 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 f59e60e4a..0405cacf6 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 4b8dd3554..445a6e151 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 ec9e577d6..d4784002e 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 477c0c5fb..578ba6b3f 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 655187b79..36020e43c 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 b2a0fc8ae..5d324f62d 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 e2d454d0b..654005f40 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 9088dba9d..914f51ce6 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 9db481a2c..7eca5ee6f 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 4bc5825f2..6c8346d20 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 e9c036447..0fa1d996c 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 c0761e8fd..ea887ba86 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 dc27b9343..56f68eb5c 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 7d3ff3321..3eba897c1 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 7a0627ae1..916040d78 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 ddef980b5..129cb75d3 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 58af04e00..4a925356a 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 0e0679f99..f34fdb416 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 bdb6416f3..d0b81dc35 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 0c193a3eb..822c49d95 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 c8c913965..3f92a4eb7 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 91e90eeee..2176c1c40 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 673de2915..8ccada315 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 657f8a71a..d45a25940 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 dcfc47e87..210810c85 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 680ea48ef..e03fa2c88 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 d3d2a5877..0858de3ec 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 3607ac461..c8939ad9d 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 6566fffe0..7743474ee 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 b99d9b519..89206977c 100644 --- a/ppd/hpcups/hp-deskjet_1125.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1125.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1200c.ppd.gz b/ppd/hpcups/hp-deskjet_1200c.ppd.gz Binary files differindex 6b8ffd3c2..b61552b82 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 809e12d28..b83e9e3f8 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 7cd885e26..6ba3c0a6c 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 f4718eab8..e60d2f873 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 444e1a1c5..3ad261a24 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 0effd8dae..2e0b04156 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 ec5109045..69edd3851 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 0ccf5ad2e..2c3b72458 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 868c0fcab..156672d5d 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 2be04e63c..2fb6f63ea 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 29a40dce7..38fd84a28 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_2510_series.ppd.gz b/ppd/hpcups/hp-deskjet_2510_series.ppd.gz Binary files differindex 3a08ae923..a9016b7a3 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 a1061ea1a..2a2e43bba 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 110101036..321548186 100644 --- a/ppd/hpcups/hp-deskjet_2540_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2540_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2640_series.ppd.gz b/ppd/hpcups/hp-deskjet_2640_series.ppd.gz Binary files differindex f90d9c8fe..1e7ecfaa8 100644 --- a/ppd/hpcups/hp-deskjet_2640_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2640_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz b/ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz Binary files differindex a5b356bbb..ff36dfc1b 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 8ada93acf..cc6cf5678 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 2810b8070..2ea65abd3 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 741a09d09..54db6a5e1 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 fa4f95356..060266c72 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 5935fbd88..2dfdc49b5 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 497599539..b497a7686 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 4e3b41652..c0e7f5be5 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 255796c04..8078c464d 100644 --- a/ppd/hpcups/hp-deskjet_3450.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3450.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3500.ppd.gz b/ppd/hpcups/hp-deskjet_3500.ppd.gz Binary files differindex 6a1b327ae..63be268fc 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 0d43a5c92..ce9bed8de 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 e7b8450be..964b2ea16 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 a4561788f..cc2bd388d 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 8df8a97ab..3e97b90bb 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 5710762d3..2e419afca 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 aa415595a..e2c90a83a 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 42df3dda6..66e8c1971 100644 --- a/ppd/hpcups/hp-deskjet_3650.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3650.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3740.ppd.gz b/ppd/hpcups/hp-deskjet_3740.ppd.gz Binary files differindex 8d6c73b8e..69b0ad8f5 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 16d2d732d..80767ea58 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 77be46244..1436be0b9 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 3bade7d3b..de3021352 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 a85e953eb..a8795519e 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 6338b7dbf..818f785f1 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 989962835..0a120e386 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 29c4809b2..75ce28d15 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 900a030fa..04aba7e12 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 7ef4c8ef8..cb7c27b7c 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 9b5017eac..47cfa3129 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 9e119503d..9e39f3eaa 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 4fcfd9106..7c15955ca 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 3e1263cfd..18ea29d45 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 7581a18fe..e9783f59a 100644 --- a/ppd/hpcups/hp-deskjet_400l.ppd.gz +++ b/ppd/hpcups/hp-deskjet_400l.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_4510_series.ppd.gz b/ppd/hpcups/hp-deskjet_4510_series.ppd.gz Binary files differindex 0503d791c..9172bb075 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 differnew file mode 100644 index 000000000..7ae5f2b6d --- /dev/null +++ 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 154d3008a..34656f2de 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 bcf1932aa..d9b1eb0a6 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 c6419df0a..0f6544be6 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 bd37a9872..c8a62fef4 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 differnew file mode 100644 index 000000000..928455991 --- /dev/null +++ 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 differnew file mode 100644 index 000000000..8e85758ee --- /dev/null +++ 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 6ca060874..bf5206e1d 100644 --- a/ppd/hpcups/hp-deskjet_500.ppd.gz +++ b/ppd/hpcups/hp-deskjet_500.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_500c.ppd.gz b/ppd/hpcups/hp-deskjet_500c.ppd.gz Binary files differindex b3e335244..926956684 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 9f589ba53..28090463b 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 cdd7157e4..f0cd1089c 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 042ea8424..c20972016 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 8c8cf765f..f9bcf3a0c 100644 --- a/ppd/hpcups/hp-deskjet_520.ppd.gz +++ b/ppd/hpcups/hp-deskjet_520.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_540.ppd.gz b/ppd/hpcups/hp-deskjet_540.ppd.gz Binary files differindex 96ff08998..077e8fe2f 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 939b53aad..584ecf796 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 f698475e3..40a575504 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 be52485d7..c53f0bb27 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 ce80003f2..f96694ec3 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 bdc74fa60..f379e56c7 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 e561259a9..6e204e9e0 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 differnew file mode 100644 index 000000000..9794c8438 --- /dev/null +++ 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 bd1e8433d..4f134c209 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 differnew file mode 100644 index 000000000..e669132cd --- /dev/null +++ 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 8259e7401..eca9f6611 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 30238336d..c455da690 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 3cfae7735..7ad3865c8 100644 --- a/ppd/hpcups/hp-deskjet_5700.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5700.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5800.ppd.gz b/ppd/hpcups/hp-deskjet_5800.ppd.gz Binary files differindex d800e76f7..5f5dbf1b9 100644 --- a/ppd/hpcups/hp-deskjet_5800.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5800.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5850.ppd.gz b/ppd/hpcups/hp-deskjet_5850.ppd.gz Binary files differindex 6032dd70e..6ff7b20c8 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 6beb83a22..114514f04 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 0c3481f82..7d7d3bf79 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 91cb394e0..90dd173fd 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 7e34bfa13..b480cd1c4 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 83f13c4e3..72708ec1e 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 90e91c91b..e8d9d793d 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 1ffef0ac3..989d2ce89 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 d3eb7a4a2..f6eba8742 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 5cbda4f4c..6cfb807db 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 7e1f9fa6e..9399e812e 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 4af0114ce..8acd89de8 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 2a1b932d2..172dc929e 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 4a655edb1..39412b8af 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 27b83e4be..0c66c897e 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 90fc7d69c..d7571a87f 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 adf9745e5..07935cf0b 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 1ef1bb946..091da2fcf 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 a88607c23..1bb1b8927 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 d46e635e6..fe900424b 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 8db20ba2f..eb69beb60 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 da537bc4e..d2feedadb 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 b29508d17..57b5a6155 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 4fe89e6b0..8a731557c 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 8d9a300ce..1d24ef4a7 100644 --- a/ppd/hpcups/hp-deskjet_682.ppd.gz +++ b/ppd/hpcups/hp-deskjet_682.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_690.ppd.gz b/ppd/hpcups/hp-deskjet_690.ppd.gz Binary files differindex c4942fde6..a09482273 100644 --- a/ppd/hpcups/hp-deskjet_690.ppd.gz +++ b/ppd/hpcups/hp-deskjet_690.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_690c.ppd.gz b/ppd/hpcups/hp-deskjet_690c.ppd.gz Binary files differindex e28c6a63e..c8630061c 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 ba5fa7969..ee703f469 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 d27597b9f..1a05959cb 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 545695814..113cfd4d6 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 4796587d2..f9cddc766 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 a567a7ef7..4e2953c2b 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 f1ca7b979..7971d5aac 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 fc26cd100..304467e5e 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 1ff6dd147..fb70a0808 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 9463d47f3..dcac41377 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 356d6028a..917e50985 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 ca5ab01cf..d4c5b16f1 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 6b85f1a23..3db3ef5da 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 87610fda2..e3bf152c1 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 9d953d4e8..feee8a3b6 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 6f0e3a7d3..a727f11f2 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 874ff81cb..4f40da8ef 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 b143ab6ab..3e8b3f0b2 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 f653f2c65..f1cf1f110 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 eb3b20f86..251e8ab4a 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 5e4c6576f..32fe6d00a 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 4ea6c208a..b3ec99a9d 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 2855e50af..7e0323e18 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 01b623d4f..45849b52d 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 e3434b47f..abba3b75f 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 db826f3cb..49fd8c31a 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 dcde9ccf4..b5d03561f 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 93111f424..d676c4ae2 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 9b4f98f4c..b0d7ed420 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 c12779d2b..8e3a2c6f2 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 4dfb20cda..9890e0f83 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 417176589..07572634e 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 45dd5565e..3a6887b13 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 f521d8d5f..cb06df11b 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 343928040..3f8f97c04 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 32b10126d..9edf3ae32 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 8b3bbd1d0..452cd7f5e 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 9175bc968..65029e305 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 31e36b987..0536658de 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 d61063483..ae043cebb 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 74d2df28c..fb00ab745 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 9f38ac0ac..ea77e8327 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 9747d66c0..c046fb768 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 d00f81084..37f52f2be 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 95005ec81..26c7898e2 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 bea0edf91..2dbdc9347 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 d23bd7be0..6537f79e3 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 aeaae41bc..afad54a98 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 214a13cec..47ac12684 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 8bb3e0426..8685f0b3d 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 dc2d38639..bc3fd6c7c 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 14f32dbbb..fd54d53f6 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 8bad5b3fb..277ba3173 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 796cc44b6..696c2fb8c 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 0412c627e..083284435 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 36574e247..6170da4c7 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 8ece8fa3e..70fb36979 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 323f81430..7d9cbd692 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 127d62eaf..35ce1f188 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 0666f256d..638acacc4 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 34784ad51..6a3898a11 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 7760e9ee6..7c603bfa2 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 31f00f4a9..350bb89a5 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 146758780..ae40fefa4 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 9d1c649c5..823cc5af3 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 0276e9ace..e533e18b9 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 6b41f962c..9d2dc5e63 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 f892c7dcc..1ab2a41cd 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 81b1ec4ae..7ca117fc6 100644 --- a/ppd/hpcups/hp-deskjet_f4200_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f4200_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f4210_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4210_series.ppd.gz Binary files differindex f21bc8342..948d8dd46 100644 --- a/ppd/hpcups/hp-deskjet_f4210_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f4210_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f4213_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4213_series.ppd.gz Binary files differindex 094f72fa6..ef1f4268d 100644 --- a/ppd/hpcups/hp-deskjet_f4213_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f4213_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f4400_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4400_series.ppd.gz Binary files differindex c2f0f614b..8dc6789ae 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 abc741b87..150e3de75 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 6019e1ad4..796df6977 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 f2e34d334..bc08d766f 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 a9e2e493b..161e3ab2f 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 106c6e4de..8830e6de1 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 c9dd3359d..4e6528159 100644 --- a/ppd/hpcups/hp-deskjet_ink_advant_k209a-z.ppd.gz +++ b/ppd/hpcups/hp-deskjet_ink_advant_k209a-z.ppd.gz diff --git a/ppd/hpcups/hp-dj350.ppd.gz b/ppd/hpcups/hp-dj350.ppd.gz Binary files differindex b54c0df74..f1a18ea45 100644 --- a/ppd/hpcups/hp-dj350.ppd.gz +++ b/ppd/hpcups/hp-dj350.ppd.gz diff --git a/ppd/hpcups/hp-dj450.ppd.gz b/ppd/hpcups/hp-dj450.ppd.gz Binary files differindex 89f2ff403..afc8db22b 100644 --- a/ppd/hpcups/hp-dj450.ppd.gz +++ b/ppd/hpcups/hp-dj450.ppd.gz diff --git a/ppd/hpcups/hp-envy_100_d410_series.ppd.gz b/ppd/hpcups/hp-envy_100_d410_series.ppd.gz Binary files differindex 40db59b1c..9e45a144e 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 36f3c06fd..b1dc5f7c5 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 6a910cda3..4253781bd 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 64fadbf73..8030ebd28 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 eefcfdd68..3b4fc781e 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 fcd790603..d73059379 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_5530_series.ppd.gz b/ppd/hpcups/hp-envy_5530_series.ppd.gz Binary files differindex 76fda43a7..e119476a6 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 f2d048513..ae15271ac 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 8ae32c559..c8075938a 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 fb371bb65..d8fa1b5c2 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_7640_series.ppd.gz b/ppd/hpcups/hp-envy_7640_series.ppd.gz Binary files differindex a8e1b4ccb..1e1d46686 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-laserjet_1000.ppd.gz b/ppd/hpcups/hp-laserjet_1000.ppd.gz Binary files differindex 7be4e1728..c65ca1a8d 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 c29819ef5..accf42121 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 6b8663730..a7dfdafee 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 53838ffcc..b5d1949f9 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 8bcc6c3b9..7e2c3cc95 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 f7c827803..63bd7a910 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 6dff6ec48..cf0518df5 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 8ae422db2..b7b74c029 100644 --- a/ppd/hpcups/hp-laserjet_1022-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1022-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1022-zjs.ppd.gz b/ppd/hpcups/hp-laserjet_1022-zjs.ppd.gz Binary files differindex fcb49732d..da889befa 100644 --- a/ppd/hpcups/hp-laserjet_1022-zjs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1022-zjs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1022n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1022n-pcl3.ppd.gz Binary files differindex 66e175a88..bb674c003 100644 --- a/ppd/hpcups/hp-laserjet_1022n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1022n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1022n-zjs.ppd.gz b/ppd/hpcups/hp-laserjet_1022n-zjs.ppd.gz Binary files differindex ffab1b3a3..1968bb11f 100644 --- a/ppd/hpcups/hp-laserjet_1022n-zjs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1022n-zjs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1022nw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1022nw-pcl3.ppd.gz Binary files differindex 2f9fac58d..0fb2d0c88 100644 --- a/ppd/hpcups/hp-laserjet_1022nw-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1022nw-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1022nw-zjs.ppd.gz b/ppd/hpcups/hp-laserjet_1022nw-zjs.ppd.gz Binary files differindex 03590a82a..82e4150f3 100644 --- a/ppd/hpcups/hp-laserjet_1022nw-zjs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1022nw-zjs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1100.ppd.gz b/ppd/hpcups/hp-laserjet_1100.ppd.gz Binary files differindex 169fd4df2..b5b7d2dd6 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 d9e2e8c73..d5b29a79d 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 0a50d4cfb..699fdd69a 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 0e1a6e228..fc001e140 100644 --- a/ppd/hpcups/hp-laserjet_1150.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1150.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1160.ppd.gz b/ppd/hpcups/hp-laserjet_1160.ppd.gz Binary files differindex 7d50e2070..017dede6c 100644 --- a/ppd/hpcups/hp-laserjet_1160.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1160.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1160_series.ppd.gz b/ppd/hpcups/hp-laserjet_1160_series.ppd.gz Binary files differindex 016449c51..3840ee1fa 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 6354694ac..823aceadf 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 9da35d4d5..99364fda5 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 2915ed541..29a816711 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 50bbca045..012780f1b 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 8e78ee515..484a3c16f 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 c217ac300..9ba0d27c7 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 9244115b8..c45350702 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 8406dd105..79720ecda 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 409e93d9c..f1451f177 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 dc95ab950..d5e6749a9 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 5feab288d..aecb55d5f 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 0183de606..929a406c9 100644 --- a/ppd/hpcups/hp-laserjet_1320tn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1320tn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2100.ppd.gz b/ppd/hpcups/hp-laserjet_2100.ppd.gz Binary files differindex 5c89cef9c..9c0fae62e 100644 --- a/ppd/hpcups/hp-laserjet_2100.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2100.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2100_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2100_series-pcl3.ppd.gz Binary files differindex 9017953b8..89fcd74ab 100644 --- a/ppd/hpcups/hp-laserjet_2100_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2100_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2200-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2200-pcl3.ppd.gz Binary files differindex 602582aa2..cd5c6394e 100644 --- a/ppd/hpcups/hp-laserjet_2200-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2200-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2200_series.ppd.gz b/ppd/hpcups/hp-laserjet_2200_series.ppd.gz Binary files differindex 079052fbc..f584297c1 100644 --- a/ppd/hpcups/hp-laserjet_2200_series.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2200_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2300-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2300-pcl3.ppd.gz Binary files differindex bf22d1823..70b3ccd72 100644 --- a/ppd/hpcups/hp-laserjet_2300-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2300-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2300_series.ppd.gz b/ppd/hpcups/hp-laserjet_2300_series.ppd.gz Binary files differindex f52bc2e5a..f178b7e56 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 2876189fc..474530d22 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 fc22aee06..1e43665ee 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 409e556a6..0d0c108e1 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 422ade4b4..de08fb9a2 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 2ccb31589..9d0dd5f45 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 3889e83bf..a0db8dce9 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 9c51d5c8d..de9182482 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 939e967e7..7c6b2283a 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 f91065b11..607bf33ea 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 2ab2428d2..83dc53af4 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 866378c18..4869299e3 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 114c80581..8e660ecbe 100644 --- a/ppd/hpcups/hp-laserjet_3200.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3200.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3200m-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3200m-pcl3.ppd.gz Binary files differindex 294cc8432..22416cf63 100644 --- a/ppd/hpcups/hp-laserjet_3200m-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3200m-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3200se.ppd.gz b/ppd/hpcups/hp-laserjet_3200se.ppd.gz Binary files differindex fc6790e00..dfb16dfe9 100644 --- a/ppd/hpcups/hp-laserjet_3200se.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3200se.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3300_3310_3320-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3300_3310_3320-pcl3.ppd.gz Binary files differindex 3133151fd..d29d48e95 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 c78f555d2..ae1a25098 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 765fb0ae9..c289e96a8 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 de0a7ce4f..c93150b74 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 86ec8b1b6..574c1fd27 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 a572c2e79..582ca87cb 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 7aee41bd6..78abafeb1 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 74d0c103a..78ddfae14 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 18c2b88d9..1181e12ef 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 856da6df5..27c30a0f9 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 fa733e4f3..6f363ded8 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 d3eecfc18..2cad4f80e 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 8333beb7a..5fd9f58ea 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 0ab1a26a8..d3f109514 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 a16631907..f3023bc9d 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 ba7e846f1..961ea9e75 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 0dbd92b49..90fefec56 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 aa4d6951d..0b3737521 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 e5508d5d7..e0de1966f 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 c969898c3..42ef8f87c 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 522872ad9..64f097b7d 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 4b3268b40..1eb341fd1 100644 --- a/ppd/hpcups/hp-laserjet_4v-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4v-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5000.ppd.gz b/ppd/hpcups/hp-laserjet_5000.ppd.gz Binary files differindex ede34e883..d0f69be07 100644 --- a/ppd/hpcups/hp-laserjet_5000.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5000.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5000_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5000_series-pcl3.ppd.gz Binary files differindex 2d5a0f1d1..d4c3342f6 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 1619b7c1e..ec706f3e4 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 5f512af4f..c9c00dc33 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 5be703447..cae4ad19f 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 ddf5019a1..c1d9087de 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 fd7b834ed..0de062b92 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 1bc1c36db..942c564df 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 ab519fddd..344c22213 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 8e233df1d..4341e8a91 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 0951ecd55..bde10abb7 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 7b673965b..e4ceab613 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 bc6da4f60..900be0c8e 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 448e64fd1..80bcbba98 100644 --- a/ppd/hpcups/hp-laserjet_6p.ppd.gz +++ b/ppd/hpcups/hp-laserjet_6p.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_8000.ppd.gz b/ppd/hpcups/hp-laserjet_8000.ppd.gz Binary files differindex da7203437..81384ea1f 100644 --- a/ppd/hpcups/hp-laserjet_8000.ppd.gz +++ b/ppd/hpcups/hp-laserjet_8000.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_8000_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_8000_series-pcl3.ppd.gz Binary files differindex 78f4f0538..652610876 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 e23f493fc..260d8c3f2 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 1247a14e3..240bb9b35 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 cadc2ceeb..50bb4b9f2 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 4273be083..426c44aca 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 352e6459b..0f85aa2e0 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 b62487aa4..3a8a4e439 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 a47a9297e..9e0eec521 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 22e76a32e..1e353475b 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 a2fcd1fba..a54809990 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 c6d66cf45..1092ee922 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 21e895d7b..3b3c75053 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 4581a8e49..eed6a3024 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 ccf9340b6..596b51dc5 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 acdc2c0c3..4d37e7d14 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 10585e03e..f7e908aa3 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 a9609d5f7..e3d5eb1cd 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 3b6ce42dc..efc286d36 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 21b82ef32..4cb195746 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 addd020a7..6c2e3ce73 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 9c5305792..7dc196b32 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 e630b61b9..4005aaa1b 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 1f2187e9d..28a9e985c 100644 --- a/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cp_1025.ppd.gz b/ppd/hpcups/hp-laserjet_cp_1025.ppd.gz Binary files differindex 1430b386d..1211e5609 100644 --- a/ppd/hpcups/hp-laserjet_cp_1025.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cp_1025.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz b/ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz Binary files differindex 0a1a98f32..7862b7513 100644 --- a/ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1005.ppd.gz b/ppd/hpcups/hp-laserjet_m1005.ppd.gz Binary files differindex f85ea0470..1732827fe 100644 --- a/ppd/hpcups/hp-laserjet_m1005.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1005.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1120_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_m1120_mfp.ppd.gz Binary files differindex ad604e789..251daedfb 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 b47cdf1ef..199fc80a9 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 9219af699..14708a2c0 100644 --- a/ppd/hpcups/hp-laserjet_m1319f_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1319f_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz Binary files differindex 9960b4621..bf111a88c 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 214763204..0245f8945 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 cb5ba285d..85c96a549 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 4cee21f23..8ebb4e82a 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 1781bad77..c60fe697f 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 497906255..ded99eee3 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 ba7bfb46b..cd913c78a 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 8a8aaaaf2..e61e5c2f0 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 3cce30534..8c6586cbf 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 fa590f7f2..020f85460 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 934219054..5dd854e28 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 4100bf268..45479c1b3 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 8a4ccad61..749ea536c 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 f2b33779a..ee8dbea62 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 69be6a190..7d78b8334 100644 --- a/ppd/hpcups/hp-laserjet_m9059_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m9059_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1005.ppd.gz b/ppd/hpcups/hp-laserjet_p1005.ppd.gz Binary files differindex 1d8a5dad3..dbe9ddaf0 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 636bf9db1..168374ec1 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 e27ade7cb..2d776ab28 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 d9039bb4d..ec0293732 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 96c01ed19..884a4b70e 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 109f8332b..d9c5be387 100644 --- a/ppd/hpcups/hp-laserjet_p1505.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p1505.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1505n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p1505n-pcl3.ppd.gz Binary files differindex ba19c12b7..4491ffe2a 100644 --- a/ppd/hpcups/hp-laserjet_p1505n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p1505n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1505n-zxs.ppd.gz b/ppd/hpcups/hp-laserjet_p1505n-zxs.ppd.gz Binary files differindex 2e81b1710..d22d7ef6a 100644 --- a/ppd/hpcups/hp-laserjet_p1505n-zxs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p1505n-zxs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2014-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2014-pcl3.ppd.gz Binary files differindex a693031e6..d377c9dad 100644 --- a/ppd/hpcups/hp-laserjet_p2014-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2014-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2014-zxs.ppd.gz b/ppd/hpcups/hp-laserjet_p2014-zxs.ppd.gz Binary files differindex 7292d3b75..9facf1935 100644 --- a/ppd/hpcups/hp-laserjet_p2014-zxs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2014-zxs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2014n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2014n-pcl3.ppd.gz Binary files differindex 48b5af4c7..dbefdf6e4 100644 --- a/ppd/hpcups/hp-laserjet_p2014n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2014n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2014n-zxs.ppd.gz b/ppd/hpcups/hp-laserjet_p2014n-zxs.ppd.gz Binary files differindex bd6c213a7..9d52a2df2 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 71096ad85..57d840578 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 8362c2086..c28f2da64 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 9911c68a9..082a9843d 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 de13f58ae..fdb1c4bdb 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 2f8679b4b..43c19e066 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 c25e7cd60..f6a3bb785 100644 --- a/ppd/hpcups/hp-laserjet_p2035-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2035-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2035-zjs.ppd.gz b/ppd/hpcups/hp-laserjet_p2035-zjs.ppd.gz Binary files differindex 60fdb38a8..0f0000191 100644 --- a/ppd/hpcups/hp-laserjet_p2035-zjs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2035-zjs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2035n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2035n-pcl3.ppd.gz Binary files differindex caba848d3..238c7dd6c 100644 --- a/ppd/hpcups/hp-laserjet_p2035n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2035n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2035n-zjs.ppd.gz b/ppd/hpcups/hp-laserjet_p2035n-zjs.ppd.gz Binary files differindex 1781d1e78..21e19b559 100644 --- a/ppd/hpcups/hp-laserjet_p2035n-zjs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2035n-zjs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2055-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2055-pcl3.ppd.gz Binary files differindex f5aa12d75..c5828bb6c 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 58dfee4eb..2ec703a1a 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 798b1f8e2..bdb15bf86 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 9ca9150ea..876763215 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 dfdb2a6ff..9e253127a 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 428352a10..b5edce193 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 d779ee671..4dc87ddeb 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 a6bdab3da..47a7f3d61 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 0753c9246..8f2ccf35a 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 c423928c1..72098faad 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 2c639d575..d0c5a1af5 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 b101fab93..5edc9e720 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 386788595..00a298481 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 4e1c5eb49..2d11a0727 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 1e72037d1..c91bd7c77 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 213c74815..328faa0e4 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 c89a6d325..06929a850 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 4139fc03f..2f9f7737f 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 dce396f8a..adcc1888b 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 904428c12..b2fef136b 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 6cf5bb30d..1f648b1bf 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_m125nw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125nw.ppd.gz Binary files differindex 7733599f0..6ff2d9ff4 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 4315966fa..317e1e5e8 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_m125ra.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125ra.ppd.gz Binary files differindex 58ade53c7..49d5262fb 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m125ra.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125ra.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 70db4340a..ca7d1d126 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_m126a.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m126a.ppd.gz Binary files differindex cde1a9dd4..dcc6e8e84 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 b7a69ba9b..23e4241d7 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 8d1286320..270650bc4 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 53059cd9a..7cbbe015a 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_m127fw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz Binary files differindex db7938467..b6b976506 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 64b62ccc9..9f56b928a 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 3ec1b2872..61fda1457 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 def02c7f5..70979a1d9 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_professional_m1132_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz Binary files differindex 9bec98735..6f2402a9a 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 a87d0d676..5d573fa1c 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 ea55afe9c..83a8af5bd 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 19fcd1914..e8f1bd6c5 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 1183f4215..0409d8362 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 aedb1e2fb..67fb18128 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 d2f85a717..8e4936938 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 def342fc6..0e757313a 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 844e70a6d..e034bda0e 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 6b571ae8a..db3f78868 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 38043049c..f3937a5be 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 527d0e5a0..ca3a23289 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 e05a98c5f..177762707 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 04847160e..880338c40 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 49ca96bba..a7290db32 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 9bd6a3713..f880aeae7 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz Binary files differindex ac9ac1303..0e92c4b09 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1106.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1106.ppd.gz Binary files differindex f71a0966e..f4919f33e 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 b3f4baa85..430f6f441 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 2b9a44a61..bd055e7e1 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 65139061b..4ae681c34 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 bb2a72f1b..03b898e2d 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 4450ddc88..b06fe431b 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 e0e910daa..e0895576e 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 8d3a736fd..e04a54598 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 864721557..91a1daf89 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 b02994496..68d615259 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 d1b2b05df..58ce9e85d 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 47c42cb53..12af26b18 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 496eb3ac9..e8d7b7894 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 2c039d1fd..0afa0a430 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 5c393bae4..5abbec90f 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 97ffd496a..de60dd9a4 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 9d9430ba5..d890e65e6 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 0c00491f6..9ba38fcaf 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 24bc64f69..0fa89a0c9 100644 --- a/ppd/hpcups/hp-mopier_320-pcl3.ppd.gz +++ b/ppd/hpcups/hp-mopier_320-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-officejet.ppd.gz b/ppd/hpcups/hp-officejet.ppd.gz Binary files differindex 9f383b5f7..fa981e21a 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 7d868cbae..7d807f917 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 b71a0b4a1..952bc2d29 100644 --- a/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz +++ b/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz diff --git a/ppd/hpcups/hp-officejet_2620_series.ppd.gz b/ppd/hpcups/hp-officejet_2620_series.ppd.gz Binary files differindex 0e12d9c41..ca21943ef 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 a1c35b141..db354dd3f 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 14cc06f9f..522ef3114 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 97b602578..6c03c7af6 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 0ef8b5040..30440e973 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 33abf1b30..6bb7e4c38 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 eb060ff87..25ddabd52 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 7f307e4e0..61c33de92 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 49d710054..dc3e09f87 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 4b1963488..99c7cd38d 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 7bed7f164..84586ef7a 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 c29a1b208..f00940a7c 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 c1352587d..db92e151f 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 c67fb858b..11e070838 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 58a718d59..fdc879f5c 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 3af736099..02e4282aa 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 9a8a5cc0b..7df00d1b0 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 8149efab9..eb09d6d91 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 44ca26fe7..c7353dd21 100644 --- a/ppd/hpcups/hp-officejet_5100_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_5100_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_5105.ppd.gz b/ppd/hpcups/hp-officejet_5105.ppd.gz Binary files differindex 12b6be6ec..8fecb6896 100644 --- a/ppd/hpcups/hp-officejet_5105.ppd.gz +++ b/ppd/hpcups/hp-officejet_5105.ppd.gz diff --git a/ppd/hpcups/hp-officejet_5110.ppd.gz b/ppd/hpcups/hp-officejet_5110.ppd.gz Binary files differindex dae47a902..528d426fb 100644 --- a/ppd/hpcups/hp-officejet_5110.ppd.gz +++ b/ppd/hpcups/hp-officejet_5110.ppd.gz diff --git a/ppd/hpcups/hp-officejet_5110v.ppd.gz b/ppd/hpcups/hp-officejet_5110v.ppd.gz Binary files differindex 10c795a15..a31316222 100644 --- a/ppd/hpcups/hp-officejet_5110v.ppd.gz +++ b/ppd/hpcups/hp-officejet_5110v.ppd.gz diff --git a/ppd/hpcups/hp-officejet_5500_series.ppd.gz b/ppd/hpcups/hp-officejet_5500_series.ppd.gz Binary files differindex 23948c082..596189b58 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 3a6e39f49..f285380d0 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 07718e45a..e2cd544df 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 aabb8bbeb..801d33ef0 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 9fe743f0d..df101d62b 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 19a044609..e4bb04b82 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 145932751..17f4a55ff 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 cfd605818..4d364179a 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 92cb71554..0a84a8f4a 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 f7c6fff12..399004ab2 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 252d0987b..ada52c9f8 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 d81b5c495..b863f278c 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 ccdf0ec96..fffdf1bc6 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 6743e1216..9ee519dc4 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 cd9aa3a97..06c179b20 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 0d71f586e..3ec06be56 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 50c92b435..078085850 100644 --- a/ppd/hpcups/hp-officejet_6800.ppd.gz +++ b/ppd/hpcups/hp-officejet_6800.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7000_e809a.ppd.gz b/ppd/hpcups/hp-officejet_7000_e809a.ppd.gz Binary files differindex 2add4d52f..1674f30f9 100644 --- a/ppd/hpcups/hp-officejet_7000_e809a.ppd.gz +++ b/ppd/hpcups/hp-officejet_7000_e809a.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7000_e809a_series.ppd.gz b/ppd/hpcups/hp-officejet_7000_e809a_series.ppd.gz Binary files differindex 880d49be9..d06a77099 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 272dcc04c..be0568ea0 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 885a01297..f402a24de 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 f15e347d0..21d4e86bd 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 953c5678b..47c9ccd30 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 9a825d164..bd488bb99 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 5e0046539..e4098309d 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 5c2835f3b..fede491c2 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 bc6cc1fa3..4c84351c0 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_8040_series.ppd.gz b/ppd/hpcups/hp-officejet_8040_series.ppd.gz Binary files differindex 84660e602..a5740cc31 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_9100_series-pcl3.ppd.gz b/ppd/hpcups/hp-officejet_9100_series-pcl3.ppd.gz Binary files differindex 1c3595a2f..cc2b631d0 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 c89978743..e2eb3c60c 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 507ab6664..45651dcdf 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 9cf24b44f..c9c8c5658 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 1a7262c08..2dab8fac3 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 d71f560b7..919f7f1e4 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 2e72fafd7..8f58c37e3 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 63b3699ce..4f7ab9805 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 c89c08e4a..1eadd613d 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 6ee511a5d..998155c17 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 7e514b16d..48ee33758 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 b9377c1d3..f54beb19f 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 82572b66f..dd3215b6e 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 a7808923d..d0e43c2e4 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 e2b18826c..c884e9b15 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 8eea53769..ec6fbfe17 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 dd06ae389..151d05e65 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 bc269c0b7..c425e4209 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 2d2cd4253..da282ae8e 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 3fcb35bc5..4d4b2d20b 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 0241c6e96..e3a616a98 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 8ba01a485..fcd8c1dd5 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 5716145b2..52a1279f8 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 0d403a054..efe0c9b58 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 f7ceeb717..8f196ce9d 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 812018c6c..8009ed944 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 85a8ac980..bfd8f80d8 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 dc2c67e00..c4a0b2533 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_8000_a809.ppd.gz b/ppd/hpcups/hp-officejet_pro_8000_a809.ppd.gz Binary files differindex f1ebeccec..1ea414457 100644 --- a/ppd/hpcups/hp-officejet_pro_8000_a809.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8000_a809.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8100.ppd.gz b/ppd/hpcups/hp-officejet_pro_8100.ppd.gz Binary files differindex 6fcada36d..9f15cd0ab 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 170dddd84..f76eb995b 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 c1a44cf2c..4b7fd5ee7 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 d5bc1a351..8d05d0d80 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 d00e6f97b..757ad6559 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 d7b442409..2587b41a3 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 8961941f9..0ed51a0b4 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 dac7d85ac..f6a7bba08 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 56a61e153..26c04adaf 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 071f60ae0..5ce15c5f9 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 22e852bc8..0324b3339 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_k5300.ppd.gz b/ppd/hpcups/hp-officejet_pro_k5300.ppd.gz Binary files differindex 2f1a836e3..3bc57acea 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 d82edfeec..872d046e9 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 0515e9f54..535343edf 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 505fa2b5f..1a1b55607 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 cff15ceba..4167eb9ac 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 5dcbfd4fc..6dc9c5318 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 a25082642..2b71da5e8 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 5c4a4816d..25d08f27e 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 82ccaaaca..535d5e851 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 e092a8d21..d0fb00233 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 d3385a3cb..9a49773dc 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 205854003..4b1a0f845 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 dbc880034..fab11ccb7 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 2385e7624..5bb644007 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 52e347154..95871bf9e 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 a4f85b3d6..4d3618d5d 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 6999fb66d..5901cc7a7 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 69cd88f58..b7c607060 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 c77ee6a67..3064a9d23 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 2321781fb..f92dde802 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 12305ba26..8fad87d3e 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 608c8511e..2201cd807 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 77d389f0d..1b240ac56 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 7316b72ed..8374921b4 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 9dc317f7d..415d7ea57 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 8887ea26e..506ea3426 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 c7d93b720..977402644 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 63441df30..45caea230 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 952e6a71d..bbc91683c 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 ad33de55f..1a9e825f8 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 e06d6e59c..531b105bf 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 c97dea8eb..f811b8e06 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 ced6be9ab..e2304769d 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 ad8152238..c34ce6c14 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 89617b29d..39a0b4495 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 6faa3139a..a28bec25e 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 43e730715..132b1b860 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 f64dae43e..bfb2d7b56 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 04d97f5f6..9669b9331 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 d7f9f0b8a..f2d8cd00a 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 db6ec3434..5f6970880 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 5a8d19559..7bd040a2a 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 83605effd..ff91b52f6 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 428aa9b00..b9b4b168c 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 c04ae6576..fcc7a5d33 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 1388ed131..e6fb2a839 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 faadcd5ce..eb6db6997 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 80a670fd5..f0cf5fa3f 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 53bf58af1..cd08e02e6 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 c82ac54b6..245d47c2b 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 823363ef7..bb8565d4e 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 c799a9764..430d3bed4 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 b5bfd6643..36312a51b 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 2e34d888a..fdeafe35a 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 9d7e98e77..c70a86539 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 90d720f8b..923abdeb3 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 e93a4ff9b..ffc326d5b 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 74179e962..5f7e94da1 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 5a9a6da95..8146e236f 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 2536e812e..f37a3469c 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 435c5923f..b4e82898f 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 9c7b3cbce..9f1a7693c 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 e65c2f1cf..345adb2e9 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 4874ab1bc..d98fd865d 100644 --- a/ppd/hpcups/hp-photosmart_6520_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_6520_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7150.ppd.gz b/ppd/hpcups/hp-photosmart_7150.ppd.gz Binary files differindex 31fbaf34f..f0cefb6e0 100644 --- a/ppd/hpcups/hp-photosmart_7150.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7150.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7200_series.ppd.gz b/ppd/hpcups/hp-photosmart_7200_series.ppd.gz Binary files differindex 381475eae..2a29c7b8d 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 529c2dee3..9fe390432 100644 --- a/ppd/hpcups/hp-photosmart_7345.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7345.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7350.ppd.gz b/ppd/hpcups/hp-photosmart_7350.ppd.gz Binary files differindex b369da4c8..cb3773ed8 100644 --- a/ppd/hpcups/hp-photosmart_7350.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7350.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7400_series.ppd.gz b/ppd/hpcups/hp-photosmart_7400_series.ppd.gz Binary files differindex b97b8c934..9834e7ffd 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 023d34ff6..6658b6606 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 0145e3cd2..9ceb74bce 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 9e4185430..1d7711f89 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 a8b06e987..613e04756 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 b6632a5bb..a30bbc5d2 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 d034dce16..f5f6c3d4c 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 83262afc2..de1cb34fd 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 ed6fee1c3..5afef7a2a 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 27b824759..09251c708 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 177f6f347..0f4edbc65 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 d4abf1ec8..056d6a7fd 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 0dfb76006..f409c933c 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 c5cebd7fd..b8bf5a468 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 42f75f1fd..7fc70e618 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 dedddfc70..0991f8c1a 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 344bef2ac..479632d09 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 7affa1f04..8ca02e0a4 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 461f814e3..1a42d6880 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 12b732269..0932b9f7e 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 71f94694c..eda62a162 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 1563ea201..76b3fe5bb 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 c88aa257f..84fde7df2 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 b1c03c4c7..781b3626f 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 21c0d398c..fad6468c2 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 9f23b913d..c7d878216 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 e08ec76e1..d2dfce6f2 100644 --- a/ppd/hpcups/hp-photosmart_b010_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_b010_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_b109a-m.ppd.gz b/ppd/hpcups/hp-photosmart_b109a-m.ppd.gz Binary files differindex faf6a3f2f..707079895 100644 --- a/ppd/hpcups/hp-photosmart_b109a-m.ppd.gz +++ b/ppd/hpcups/hp-photosmart_b109a-m.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_b109a_series.ppd.gz b/ppd/hpcups/hp-photosmart_b109a_series.ppd.gz Binary files differindex 463cdc068..0fb4ce9c7 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 cb556b4e5..80c39d6f8 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 0ce32386f..307a17f72 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 d92f4f653..aa1c40bf6 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 b9a46524a..ab9f6da37 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 a0494c433..ea60d80a8 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 33b10cd6e..d2c1b60cd 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 ade0dbe0f..d341b7f90 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 a4dc36d07..da6a60f61 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 28f784727..6c919685e 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 002b54d17..00347939d 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 4f7aea142..f19e0ff1d 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 2c68ef481..b7ae31cb5 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 3bfb0c9de..4ff54c5d9 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 34aeec718..328dc4ea5 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 a17574133..ac4f7ffe1 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 eb73454de..5609f6a6e 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 ba83b3804..9e56131fd 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 2205c7935..d6424193a 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 f1e6a58ad..764ba4d3d 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 30af2133b..b1a54b204 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 63321bf67..7551acd24 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 bf6bcbf6c..4588464cd 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 cc5edf3bb..2107eea9b 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 a461ad918..418762f80 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 fbee8e971..13ec9c915 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 ea51a2b28..79b7f57ff 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 fc7e2fb2b..baf5f3514 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 0a967f08b..19da50701 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 a255a9a96..7e04f9bf8 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 ff4993678..516355d23 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 5efc6b7f3..924883f5e 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 b14039446..a2f7ee2fc 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 300141b2e..556f5f71e 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 0f8016606..4b78097c3 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 87846bbd1..a6487803e 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 5dd171ed0..8e07c85df 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 a8fd870fd..5fdbfb549 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 ddd177b9a..be6b3a0c0 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 9466b9a2c..b82edea11 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 0131acd63..64054be98 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 ac8de0ee0..e0c440d64 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 e30873270..0bda94cb6 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 714d088a6..d45780528 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 4a4315b20..93f8666e1 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 048721c5a..7e04912b4 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 af9f2bb6e..b5d513bc6 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 870cedbc0..d3715e267 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 07811154e..f3944c611 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 c98193006..79ea8ed5c 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 6a13c7faf..e88f88d18 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 02970f7e1..ae0cefadd 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 61da3d572..a64e01271 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 919e76046..ba9d4a3f9 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 23a319b4e..03205ab70 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 99aa8063b..d6a0927c7 100644 --- a/ppd/hpcups/hp-psc_1500_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1500_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_1510_series.ppd.gz b/ppd/hpcups/hp-psc_1510_series.ppd.gz Binary files differindex 2c8ecdaca..9160ae480 100644 --- a/ppd/hpcups/hp-psc_1510_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1510_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_1600_series.ppd.gz b/ppd/hpcups/hp-psc_1600_series.ppd.gz Binary files differindex 523305481..ca53624a3 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 e70ad74b6..711a34c27 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 2cfa6a29e..078c71615 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 b6f9444cd..1d6138512 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 631992d86..eb59a9c26 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 17fa46771..6f2f398ba 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 cc29c389b..7821ee54d 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 09a536b2c..db983897d 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 781d0c9c9..b56ce10aa 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 0b5648281..8458b93be 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 d237bc9ba..bd93131d8 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 cce1ea5a6..2e38b8ef8 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 9555620b8..14372aad4 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 15d6bc7fa..42b9ed24c 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 c502eb8eb..4d924777b 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 00df79031..80d0b1313 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 ffd03270c..5b125374a 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 1963ae3c8..802b75363 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 4ef22c3cd..d155aeef4 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 6c35117eb..2a8f6642e 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 11eaf42ee..4edba61a4 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 690bddd4a..4cd451c80 100644 --- a/ppd/hpcups/hp-psc_950xi.ppd.gz +++ b/ppd/hpcups/hp-psc_950xi.ppd.gz diff --git a/ppd/hpcups/hp-scanjet_pro_3500_f1.ppd.gz b/ppd/hpcups/hp-scanjet_pro_3500_f1.ppd.gz Binary files differnew file mode 100644 index 000000000..0f6df983c --- /dev/null +++ b/ppd/hpcups/hp-scanjet_pro_3500_f1.ppd.gz diff --git a/ppd/hpijs/hp-2000c-hpijs.ppd.gz b/ppd/hpijs/hp-2000c-hpijs.ppd.gz Binary files differindex 6a7cd5eed..0ed6764bd 100644 --- a/ppd/hpijs/hp-2000c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-2000c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-2500c-hpijs.ppd.gz b/ppd/hpijs/hp-2500c-hpijs.ppd.gz Binary files differindex 43aa32981..882e389b8 100644 --- a/ppd/hpijs/hp-2500c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-2500c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-910-hpijs.ppd.gz b/ppd/hpijs/hp-910-hpijs.ppd.gz Binary files differindex 3d3ccc1d1..c204f3c8c 100644 --- a/ppd/hpijs/hp-910-hpijs.ppd.gz +++ b/ppd/hpijs/hp-910-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-915-hpijs.ppd.gz b/ppd/hpijs/hp-915-hpijs.ppd.gz Binary files differindex e24f028e2..335b1fef5 100644 --- a/ppd/hpijs/hp-915-hpijs.ppd.gz +++ b/ppd/hpijs/hp-915-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_1000-hpijs.ppd.gz b/ppd/hpijs/hp-business_inkjet_1000-hpijs.ppd.gz Binary files differindex 0395ab66b..e1ecf2e72 100644 --- a/ppd/hpijs/hp-business_inkjet_1000-hpijs.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_1000-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_1100-hpijs.ppd.gz b/ppd/hpijs/hp-business_inkjet_1100-hpijs.ppd.gz Binary files differindex f61e77d25..535199878 100644 --- a/ppd/hpijs/hp-business_inkjet_1100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_1100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_1200-hpijs.ppd.gz b/ppd/hpijs/hp-business_inkjet_1200-hpijs.ppd.gz Binary files differindex 10727654a..816bfb9fd 100644 --- a/ppd/hpijs/hp-business_inkjet_1200-hpijs.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_1200-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2200-hpijs.ppd.gz b/ppd/hpijs/hp-business_inkjet_2200-hpijs.ppd.gz Binary files differindex 1d8aa3dd3..95855af60 100644 --- a/ppd/hpijs/hp-business_inkjet_2200-hpijs.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2200-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2230-hpijs.ppd.gz b/ppd/hpijs/hp-business_inkjet_2230-hpijs.ppd.gz Binary files differindex 213c995c3..a45a57936 100644 --- a/ppd/hpijs/hp-business_inkjet_2230-hpijs.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2230-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz Binary files differindex 321b887f2..2d466b8de 100644 --- a/ppd/hpijs/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2280-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-business_inkjet_2280-hpijs-pcl3.ppd.gz Binary files differindex 7eac69603..9b64993ca 100644 --- a/ppd/hpijs/hp-business_inkjet_2280-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2280-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2300-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-business_inkjet_2300-hpijs-pcl3.ppd.gz Binary files differindex 61f5f6cbb..0fab7c52b 100644 --- a/ppd/hpijs/hp-business_inkjet_2300-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2300-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2600-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-business_inkjet_2600-hpijs-pcl3.ppd.gz Binary files differindex 2112fcf4e..b1d1fd50a 100644 --- a/ppd/hpijs/hp-business_inkjet_2600-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2600-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2800-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-business_inkjet_2800-hpijs-pcl3.ppd.gz Binary files differindex 48adba333..a4a9a075b 100644 --- a/ppd/hpijs/hp-business_inkjet_2800-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2800-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz Binary files differindex 59c9382e8..02fe5728f 100644 --- a/ppd/hpijs/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_inkjet_cp1700-hpijs.ppd.gz b/ppd/hpijs/hp-color_inkjet_cp1700-hpijs.ppd.gz Binary files differindex f823d39b0..06c6dbf77 100644 --- a/ppd/hpijs/hp-color_inkjet_cp1700-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_inkjet_cp1700-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_inkjet_printer_cp1700-hpijs.ppd.gz b/ppd/hpijs/hp-color_inkjet_printer_cp1700-hpijs.ppd.gz Binary files differindex 932bd44fb..c77816966 100644 --- a/ppd/hpijs/hp-color_inkjet_printer_cp1700-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_inkjet_printer_cp1700-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_1600-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_1600-hpijs.ppd.gz Binary files differindex 31a7bb237..73d1aff22 100644 --- a/ppd/hpijs/hp-color_laserjet_1600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_1600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_2500-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_2500-hpijs-pcl3.ppd.gz Binary files differindex 5fed5bd04..3a0a8e95d 100644 --- a/ppd/hpijs/hp-color_laserjet_2500-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_2500-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_2500_series-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_2500_series-hpijs.ppd.gz Binary files differindex a8527b872..c7cdfbba0 100644 --- a/ppd/hpijs/hp-color_laserjet_2500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_2500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_2600n-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_2600n-hpijs.ppd.gz Binary files differindex 30d979688..381439dbc 100644 --- a/ppd/hpijs/hp-color_laserjet_2600n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_2600n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3000-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_3000-hpijs-pcl3.ppd.gz Binary files differindex 3984372db..27184cfd9 100644 --- a/ppd/hpijs/hp-color_laserjet_3000-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3000-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3500-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_3500-hpijs.ppd.gz Binary files differindex 1ecc2c2b5..f7e5e1283 100644 --- a/ppd/hpijs/hp-color_laserjet_3500-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3500-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3500n-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_3500n-hpijs.ppd.gz Binary files differindex 384139cfc..bb019d5fe 100644 --- a/ppd/hpijs/hp-color_laserjet_3500n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3500n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3550-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_3550-hpijs.ppd.gz Binary files differindex d668dd370..8ba2835c6 100644 --- a/ppd/hpijs/hp-color_laserjet_3550-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3550-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3550n-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_3550n-hpijs.ppd.gz Binary files differindex 4cd52f6f7..3c756b171 100644 --- a/ppd/hpijs/hp-color_laserjet_3550n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3550n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3600-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_3600-hpijs.ppd.gz Binary files differindex 999d74dfc..73a288adf 100644 --- a/ppd/hpijs/hp-color_laserjet_3600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3700-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_3700-hpijs-pcl3.ppd.gz Binary files differindex 7b107180f..a92ef4d26 100644 --- a/ppd/hpijs/hp-color_laserjet_3700-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3700-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3700n-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_3700n-hpijs.ppd.gz Binary files differindex 58ad25012..9847eeb24 100644 --- a/ppd/hpijs/hp-color_laserjet_3700n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3700n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3800-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_3800-hpijs-pcl3.ppd.gz Binary files differindex cb1444bff..f498be1aa 100644 --- a/ppd/hpijs/hp-color_laserjet_3800-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3800-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4500-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4500-hpijs-pcl3.ppd.gz Binary files differindex 5fd6d1e61..614d45d2b 100644 --- a/ppd/hpijs/hp-color_laserjet_4500-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4500-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4550-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4550-hpijs-pcl3.ppd.gz Binary files differindex 45db628b8..8d343161b 100644 --- a/ppd/hpijs/hp-color_laserjet_4550-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4550-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4600-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4600-hpijs-pcl3.ppd.gz Binary files differindex d86ee658c..dc248f3bd 100644 --- a/ppd/hpijs/hp-color_laserjet_4600-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4600-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4600_series-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_4600_series-hpijs.ppd.gz Binary files differindex 991a3b641..88ef40ca1 100644 --- a/ppd/hpijs/hp-color_laserjet_4600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4610-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4610-hpijs-pcl3.ppd.gz Binary files differindex 6c3c06097..942088506 100644 --- a/ppd/hpijs/hp-color_laserjet_4610-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4610-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4650-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4650-hpijs-pcl3.ppd.gz Binary files differindex b3d46bdf0..53504fc9f 100644 --- a/ppd/hpijs/hp-color_laserjet_4650-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4650-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz Binary files differindex f49ea10d4..874022baf 100644 --- a/ppd/hpijs/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4730mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4730mfp-hpijs-pcl3.ppd.gz Binary files differindex a84912692..bfd94721f 100644 --- a/ppd/hpijs/hp-color_laserjet_4730mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4730mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_5-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_5-hpijs.ppd.gz Binary files differindex 134f22734..5c60317bd 100644 --- a/ppd/hpijs/hp-color_laserjet_5-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_5-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_5500-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_5500-hpijs-pcl3.ppd.gz Binary files differindex a4f36ec82..4ba27a33b 100644 --- a/ppd/hpijs/hp-color_laserjet_5500-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_5500-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz Binary files differindex 777cd01ab..a278c64d2 100644 --- a/ppd/hpijs/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_5m-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_5m-hpijs-pcl3.ppd.gz Binary files differindex d34598242..093ec460c 100644 --- a/ppd/hpijs/hp-color_laserjet_5m-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_5m-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_8500-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_8500-hpijs-pcl3.ppd.gz Binary files differindex 44408c65c..05b850906 100644 --- a/ppd/hpijs/hp-color_laserjet_8500-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_8500-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_8550-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_8550-hpijs-pcl3.ppd.gz Binary files differindex 194689894..25d4894cd 100644 --- a/ppd/hpijs/hp-color_laserjet_8550-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_8550-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_9500-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_9500-hpijs-pcl3.ppd.gz Binary files differindex 8ae06330d..5b9447a64 100644 --- a/ppd/hpijs/hp-color_laserjet_9500-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_9500-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_9500_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_9500_mfp-hpijs-pcl3.ppd.gz Binary files differindex f06b40d73..753aec932 100644 --- a/ppd/hpijs/hp-color_laserjet_9500_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_9500_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm1312_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm1312_mfp-hpijs-pcl3.ppd.gz Binary files differindex c30959b8d..97adc9797 100644 --- a/ppd/hpijs/hp-color_laserjet_cm1312_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm1312_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm1312nfi_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm1312nfi_mfp-hpijs-pcl3.ppd.gz Binary files differindex 1370bd655..2b9339a25 100644 --- a/ppd/hpijs/hp-color_laserjet_cm1312nfi_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm1312nfi_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm2320_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm2320_mfp-hpijs-pcl3.ppd.gz Binary files differindex 52bc16d3c..682041e98 100644 --- a/ppd/hpijs/hp-color_laserjet_cm2320_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm2320_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm2320fxi_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm2320fxi_mfp-hpijs-pcl3.ppd.gz Binary files differindex 0ddbad2f9..9b3fa44ee 100644 --- a/ppd/hpijs/hp-color_laserjet_cm2320fxi_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm2320fxi_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd.gz Binary files differindex ba3f6a5fc..b8a2b8cab 100644 --- a/ppd/hpijs/hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm2320nf_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm2320nf_mfp-hpijs-pcl3.ppd.gz Binary files differindex 25fed4c2f..5056a3212 100644 --- a/ppd/hpijs/hp-color_laserjet_cm2320nf_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm2320nf_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz Binary files differindex c0e94d2bf..6e2c97d28 100644 --- a/ppd/hpijs/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm4540_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm4540_mfp-hpijs-pcl3.ppd.gz Binary files differindex f5593ef44..655289aa8 100644 --- a/ppd/hpijs/hp-color_laserjet_cm4540_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm4540_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm4730_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm4730_mfp-hpijs-pcl3.ppd.gz Binary files differindex 91af58a53..118ec907e 100644 --- a/ppd/hpijs/hp-color_laserjet_cm4730_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm4730_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm6030_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm6030_mfp-hpijs-pcl3.ppd.gz Binary files differindex 893fa623a..2aaec48ce 100644 --- a/ppd/hpijs/hp-color_laserjet_cm6030_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm6030_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm6040_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm6040_mfp-hpijs.ppd.gz Binary files differindex b0f1ca5dd..9ac10e6c5 100644 --- a/ppd/hpijs/hp-color_laserjet_cm6040_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm6040_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz Binary files differindex fd437c1e4..8d869bfad 100644 --- a/ppd/hpijs/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp1215-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp1215-hpijs.ppd.gz Binary files differindex b3466fd6d..af7c99a08 100644 --- a/ppd/hpijs/hp-color_laserjet_cp1215-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp1215-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp1217-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp1217-hpijs.ppd.gz Binary files differindex 071832219..6556d4759 100644 --- a/ppd/hpijs/hp-color_laserjet_cp1217-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp1217-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp1514n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp1514n-hpijs-pcl3.ppd.gz Binary files differindex 6a9e3b08a..2888e9303 100644 --- a/ppd/hpijs/hp-color_laserjet_cp1514n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp1514n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp1515n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp1515n-hpijs-pcl3.ppd.gz Binary files differindex 0bd2ce8ee..36fc84314 100644 --- a/ppd/hpijs/hp-color_laserjet_cp1515n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp1515n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp1518ni-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp1518ni-hpijs-pcl3.ppd.gz Binary files differindex 0c46b3679..dba1ebe96 100644 --- a/ppd/hpijs/hp-color_laserjet_cp1518ni-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp1518ni-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp2025-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp2025-hpijs-pcl3.ppd.gz Binary files differindex 725d386a2..74abc707c 100644 --- a/ppd/hpijs/hp-color_laserjet_cp2025-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp2025-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp2025dn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp2025dn-hpijs-pcl3.ppd.gz Binary files differindex bed984a09..5accc59ff 100644 --- a/ppd/hpijs/hp-color_laserjet_cp2025dn-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp2025dn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp2025n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp2025n-hpijs-pcl3.ppd.gz Binary files differindex 6d4c83136..2d36fa4c6 100644 --- a/ppd/hpijs/hp-color_laserjet_cp2025n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp2025n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz Binary files differindex 6e89a98eb..d64e0c805 100644 --- a/ppd/hpijs/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz Binary files differindex f68e25017..b573b6311 100644 --- a/ppd/hpijs/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz Binary files differindex 300ca2a3b..8d8fe60b0 100644 --- a/ppd/hpijs/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz Binary files differindex 161d694b4..983a552dd 100644 --- a/ppd/hpijs/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz Binary files differindex adfa452a0..d1ff73ee1 100644 --- a/ppd/hpijs/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz Binary files differindex 08afe2415..9fa166a75 100644 --- a/ppd/hpijs/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp5225-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp5225-hpijs-pcl3.ppd.gz Binary files differindex 7e0142cba..5def3878a 100644 --- a/ppd/hpijs/hp-color_laserjet_cp5225-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp5225-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz Binary files differindex d5cbe8688..680b6f5a8 100644 --- a/ppd/hpijs/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz Binary files differindex bcdcd2d1f..90cb69ec5 100644 --- a/ppd/hpijs/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp5520_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp5520_series-hpijs-pcl3.ppd.gz Binary files differindex f56ac122c..69d1fb82f 100644 --- a/ppd/hpijs/hp-color_laserjet_cp5520_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp5520_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz Binary files differindex 40c08d53d..143cbddbc 100644 --- a/ppd/hpijs/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_pro_mfp_m176n-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_pro_mfp_m176n-hpijs.ppd.gz Binary files differindex c78d86cb4..e795ceb54 100644 --- a/ppd/hpijs/hp-color_laserjet_pro_mfp_m176n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_pro_mfp_m176n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_pro_mfp_m177fw-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_pro_mfp_m177fw-hpijs.ppd.gz Binary files differindex 6b552bf4a..6fdd55a34 100644 --- a/ppd/hpijs/hp-color_laserjet_pro_mfp_m177fw-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_pro_mfp_m177fw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-cp1160-hpijs.ppd.gz b/ppd/hpijs/hp-cp1160-hpijs.ppd.gz Binary files differindex bba4708dd..5d0fd76c9 100644 --- a/ppd/hpijs/hp-cp1160-hpijs.ppd.gz +++ b/ppd/hpijs/hp-cp1160-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1000_j110_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1000_j110_series-hpijs.ppd.gz Binary files differindex 682c4e9ff..e96b22666 100644 --- a/ppd/hpijs/hp-deskjet_1000_j110_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1000_j110_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1010_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1010_series-hpijs.ppd.gz Binary files differindex 60f24894f..edaf52fb5 100644 --- a/ppd/hpijs/hp-deskjet_1010_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1010_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1050_j410_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1050_j410_series-hpijs.ppd.gz Binary files differindex 03ba62418..1ccc77b2b 100644 --- a/ppd/hpijs/hp-deskjet_1050_j410_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1050_j410_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1100-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1100-hpijs.ppd.gz Binary files differindex 8d202005f..ad8fe4364 100644 --- a/ppd/hpijs/hp-deskjet_1100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1110_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1110_series-hpijs.ppd.gz Binary files differindex 0b46e75ee..31982ab35 100644 --- a/ppd/hpijs/hp-deskjet_1110_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1110_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1120-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1120-hpijs.ppd.gz Binary files differindex e4d4a8af3..8e988a2ef 100644 --- a/ppd/hpijs/hp-deskjet_1120-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1120-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1125-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1125-hpijs.ppd.gz Binary files differindex 4f722347f..440c99548 100644 --- a/ppd/hpijs/hp-deskjet_1125-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1125-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1200c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1200c-hpijs.ppd.gz Binary files differindex bb6e2a6d2..6d9c5db0f 100644 --- a/ppd/hpijs/hp-deskjet_1200c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1200c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1220c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1220c-hpijs.ppd.gz Binary files differindex 7113cd11e..dd5c8afd1 100644 --- a/ppd/hpijs/hp-deskjet_1220c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1220c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1280-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1280-hpijs.ppd.gz Binary files differindex 73e563463..4576766a1 100644 --- a/ppd/hpijs/hp-deskjet_1280-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1280-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1510_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1510_series-hpijs.ppd.gz Binary files differindex 94014c9d3..9fb991f39 100644 --- a/ppd/hpijs/hp-deskjet_1510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1600c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1600c-hpijs.ppd.gz Binary files differindex 967739dac..df2bfc011 100644 --- a/ppd/hpijs/hp-deskjet_1600c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1600c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1600cm-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1600cm-hpijs.ppd.gz Binary files differindex 694063334..18e89ae47 100644 --- a/ppd/hpijs/hp-deskjet_1600cm-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1600cm-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1600cn-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1600cn-hpijs.ppd.gz Binary files differindex fb8711fad..2df22ca8a 100644 --- a/ppd/hpijs/hp-deskjet_1600cn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1600cn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_2000_j210_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_2000_j210_series-hpijs.ppd.gz Binary files differindex fa0a0a584..98c6575b0 100644 --- a/ppd/hpijs/hp-deskjet_2000_j210_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_2000_j210_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_2020_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_2020_series-hpijs.ppd.gz Binary files differindex cbde11adb..f32d89b39 100644 --- a/ppd/hpijs/hp-deskjet_2020_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_2020_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_2050_j510_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_2050_j510_series-hpijs.ppd.gz Binary files differindex 4ea9ef9ea..4f7a65ff1 100644 --- a/ppd/hpijs/hp-deskjet_2050_j510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_2050_j510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_2130_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_2130_series-hpijs.ppd.gz Binary files differindex f9df16d06..083ed7683 100644 --- a/ppd/hpijs/hp-deskjet_2130_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_2130_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_2510_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_2510_series-hpijs.ppd.gz Binary files differindex 99b1a5600..27617e295 100644 --- a/ppd/hpijs/hp-deskjet_2510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_2510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_2520_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_2520_series-hpijs.ppd.gz Binary files differindex 1a58a08e9..0072292e4 100644 --- a/ppd/hpijs/hp-deskjet_2520_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_2520_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_2540_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_2540_series-hpijs.ppd.gz Binary files differindex 79aa8d24f..d121d3c39 100644 --- a/ppd/hpijs/hp-deskjet_2540_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_2540_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_2640_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_2640_series-hpijs.ppd.gz Binary files differindex 6d4bdebc0..dc754dace 100644 --- a/ppd/hpijs/hp-deskjet_2640_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_2640_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3000_j310_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3000_j310_series-hpijs.ppd.gz Binary files differindex 6d2072621..456f469bc 100644 --- a/ppd/hpijs/hp-deskjet_3000_j310_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3000_j310_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3050_j610_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3050_j610_series-hpijs.ppd.gz Binary files differindex 51fbc687f..18fff3e99 100644 --- a/ppd/hpijs/hp-deskjet_3050_j610_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3050_j610_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3050a_j611_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3050a_j611_series-hpijs.ppd.gz Binary files differindex 6b54b6a2e..5f8c44127 100644 --- a/ppd/hpijs/hp-deskjet_3050a_j611_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3050a_j611_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3070_b611_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3070_b611_series-hpijs.ppd.gz Binary files differindex 948a33d4c..fb9e86843 100644 --- a/ppd/hpijs/hp-deskjet_3070_b611_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3070_b611_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3320-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3320-hpijs.ppd.gz Binary files differindex e704c9588..ed8e9887f 100644 --- a/ppd/hpijs/hp-deskjet_3320-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3320-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3325-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3325-hpijs.ppd.gz Binary files differindex 8ecfdffd1..6cb8b2e36 100644 --- a/ppd/hpijs/hp-deskjet_3325-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3325-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3420-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3420-hpijs.ppd.gz Binary files differindex db8ad5b2e..f296a670a 100644 --- a/ppd/hpijs/hp-deskjet_3420-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3420-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3425-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3425-hpijs.ppd.gz Binary files differindex ce4ca8524..1d8b31010 100644 --- a/ppd/hpijs/hp-deskjet_3425-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3425-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3450-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3450-hpijs.ppd.gz Binary files differindex b22c04778..2a6716286 100644 --- a/ppd/hpijs/hp-deskjet_3450-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3450-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3500-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3500-hpijs.ppd.gz Binary files differindex 8a08d5c94..a399a26ed 100644 --- a/ppd/hpijs/hp-deskjet_3500-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3500-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3510_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3510_series-hpijs.ppd.gz Binary files differindex a2ae171d9..50e4f4b6f 100644 --- a/ppd/hpijs/hp-deskjet_3510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3520_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3520_series-hpijs.ppd.gz Binary files differindex d8874df68..77a282673 100644 --- a/ppd/hpijs/hp-deskjet_3520_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3520_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3540_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3540_series-hpijs.ppd.gz Binary files differindex 46f570af8..431fe8565 100644 --- a/ppd/hpijs/hp-deskjet_3540_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3540_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3550-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3550-hpijs.ppd.gz Binary files differindex db0a62462..4ff4cea1c 100644 --- a/ppd/hpijs/hp-deskjet_3550-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3550-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3600-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3600-hpijs.ppd.gz Binary files differindex 706ba77f1..a19d7fe15 100644 --- a/ppd/hpijs/hp-deskjet_3600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3630_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3630_series-hpijs.ppd.gz Binary files differindex 215a25628..4f432bbc9 100644 --- a/ppd/hpijs/hp-deskjet_3630_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3630_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3650-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3650-hpijs.ppd.gz Binary files differindex 842c516e1..c2fb0a392 100644 --- a/ppd/hpijs/hp-deskjet_3650-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3650-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3740-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3740-hpijs.ppd.gz Binary files differindex f6f239b77..e04943912 100644 --- a/ppd/hpijs/hp-deskjet_3740-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3740-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3810-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3810-hpijs.ppd.gz Binary files differindex bed147d0a..fa393c573 100644 --- a/ppd/hpijs/hp-deskjet_3810-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3810-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3816-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3816-hpijs.ppd.gz Binary files differindex 4ee9e0bf0..4dd0be4b6 100644 --- a/ppd/hpijs/hp-deskjet_3816-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3816-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3819-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3819-hpijs.ppd.gz Binary files differindex 2f4014220..2cd6cf25e 100644 --- a/ppd/hpijs/hp-deskjet_3819-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3819-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3820-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3820-hpijs.ppd.gz Binary files differindex 1042a701b..81b6d8586 100644 --- a/ppd/hpijs/hp-deskjet_3820-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3820-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3822-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3822-hpijs.ppd.gz Binary files differindex 01373520d..215c1dd57 100644 --- a/ppd/hpijs/hp-deskjet_3822-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3822-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3830_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3830_series-hpijs.ppd.gz Binary files differindex 48ad002a7..ef294c9e3 100644 --- a/ppd/hpijs/hp-deskjet_3830_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3830_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3840-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3840-hpijs.ppd.gz Binary files differindex d51e299dc..9d39992aa 100644 --- a/ppd/hpijs/hp-deskjet_3840-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3840-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3870-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3870-hpijs.ppd.gz Binary files differindex 8d849f1dd..e5e324b3e 100644 --- a/ppd/hpijs/hp-deskjet_3870-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3870-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3900-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3900-hpijs.ppd.gz Binary files differindex 956b46b04..05e0637c5 100644 --- a/ppd/hpijs/hp-deskjet_3900-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3900-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3910-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3910-hpijs.ppd.gz Binary files differindex 9daae6b5d..d89a3b89a 100644 --- a/ppd/hpijs/hp-deskjet_3910-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3910-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3920-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3920-hpijs.ppd.gz Binary files differindex 086474f8a..b1d0c18ab 100644 --- a/ppd/hpijs/hp-deskjet_3920-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3920-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3940-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3940-hpijs.ppd.gz Binary files differindex b9d5e36f3..50f8472df 100644 --- a/ppd/hpijs/hp-deskjet_3940-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3940-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_400-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_400-hpijs.ppd.gz Binary files differindex 2406bd835..19f8c629c 100644 --- a/ppd/hpijs/hp-deskjet_400-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_400-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_400l-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_400l-hpijs.ppd.gz Binary files differindex d6f2e600e..c17a4dc76 100644 --- a/ppd/hpijs/hp-deskjet_400l-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_400l-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_4510_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_4510_series-hpijs.ppd.gz Binary files differindex 28eba4f5b..1e79677db 100644 --- a/ppd/hpijs/hp-deskjet_4510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_4510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_4530_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_4530_series-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..35c16168c --- /dev/null +++ b/ppd/hpijs/hp-deskjet_4530_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_460-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_460-hpijs.ppd.gz Binary files differindex 68fc2c747..7cc1d87c9 100644 --- a/ppd/hpijs/hp-deskjet_460-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_460-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_4610_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_4610_series-hpijs.ppd.gz Binary files differindex a8dafa192..151ebfd01 100644 --- a/ppd/hpijs/hp-deskjet_4610_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_4610_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_4620_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_4620_series-hpijs.ppd.gz Binary files differindex ac5540d67..9ecb2c99e 100644 --- a/ppd/hpijs/hp-deskjet_4620_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_4620_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_4640_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_4640_series-hpijs.ppd.gz Binary files differindex 9f6f54eb2..16749ef58 100644 --- a/ppd/hpijs/hp-deskjet_4640_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_4640_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_4670_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_4670_series-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..593699104 --- /dev/null +++ b/ppd/hpijs/hp-deskjet_4670_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_4720_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_4720_series-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..19bc4f43c --- /dev/null +++ b/ppd/hpijs/hp-deskjet_4720_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_500-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_500-hpijs.ppd.gz Binary files differindex 13e0650c2..a92b6edb1 100644 --- a/ppd/hpijs/hp-deskjet_500-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_500-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_500c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_500c-hpijs.ppd.gz Binary files differindex 7208f73ea..e53982d58 100644 --- a/ppd/hpijs/hp-deskjet_500c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_500c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_505j-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_505j-hpijs.ppd.gz Binary files differindex 1a491de57..dddd6134e 100644 --- a/ppd/hpijs/hp-deskjet_505j-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_505j-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_510-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_510-hpijs.ppd.gz Binary files differindex 3dbdc0e68..314179fdb 100644 --- a/ppd/hpijs/hp-deskjet_510-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_510-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5100-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5100-hpijs.ppd.gz Binary files differindex 78430e86f..cfbdcbec9 100644 --- a/ppd/hpijs/hp-deskjet_5100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_520-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_520-hpijs.ppd.gz Binary files differindex 0ca6981d3..b68d68fe1 100644 --- a/ppd/hpijs/hp-deskjet_520-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_520-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_540-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_540-hpijs.ppd.gz Binary files differindex af9ae94a9..801664a36 100644 --- a/ppd/hpijs/hp-deskjet_540-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_540-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5400_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5400_series-hpijs.ppd.gz Binary files differindex ef176bfec..abeb9da0c 100644 --- a/ppd/hpijs/hp-deskjet_5400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_550c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_550c-hpijs.ppd.gz Binary files differindex aecabc95e..e3a507e2a 100644 --- a/ppd/hpijs/hp-deskjet_550c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_550c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5520_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5520_series-hpijs.ppd.gz Binary files differindex 3ade49c4d..50f3dc10e 100644 --- a/ppd/hpijs/hp-deskjet_5520_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5520_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5550-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5550-hpijs.ppd.gz Binary files differindex e71b6e2f8..c8ce7ee7d 100644 --- a/ppd/hpijs/hp-deskjet_5550-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5550-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5551-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5551-hpijs.ppd.gz Binary files differindex 435b1730e..b550b323c 100644 --- a/ppd/hpijs/hp-deskjet_5551-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5551-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5552-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5552-hpijs.ppd.gz Binary files differindex 32e2433e1..c8046249d 100644 --- a/ppd/hpijs/hp-deskjet_5552-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5552-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5570_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5570_series-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..deb8838fc --- /dev/null +++ b/ppd/hpijs/hp-deskjet_5570_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5600-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5600-hpijs.ppd.gz Binary files differindex a30d80327..76f066097 100644 --- a/ppd/hpijs/hp-deskjet_5600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5640_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5640_series-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..2ad779819 --- /dev/null +++ b/ppd/hpijs/hp-deskjet_5640_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5650-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5650-hpijs.ppd.gz Binary files differindex 7c67b07ec..0ee50c93c 100644 --- a/ppd/hpijs/hp-deskjet_5650-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5650-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5652-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5652-hpijs.ppd.gz Binary files differindex 74a6f2979..64cff3a2c 100644 --- a/ppd/hpijs/hp-deskjet_5652-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5652-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5700-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5700-hpijs.ppd.gz Binary files differindex 2d0ec5cb0..2d7abc735 100644 --- a/ppd/hpijs/hp-deskjet_5700-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5700-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5800-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5800-hpijs.ppd.gz Binary files differindex 581f56789..ae7c164d5 100644 --- a/ppd/hpijs/hp-deskjet_5800-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5800-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5850-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5850-hpijs.ppd.gz Binary files differindex 2ef3cffad..3c4be287b 100644 --- a/ppd/hpijs/hp-deskjet_5850-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5850-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5900_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5900_series-hpijs.ppd.gz Binary files differindex 535aeb31a..5d9ee5140 100644 --- a/ppd/hpijs/hp-deskjet_5900_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5900_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_600-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_600-hpijs.ppd.gz Binary files differindex 8257d98e2..cd4866bf6 100644 --- a/ppd/hpijs/hp-deskjet_600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_610c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_610c-hpijs.ppd.gz Binary files differindex 5228184b5..208ac342b 100644 --- a/ppd/hpijs/hp-deskjet_610c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_610c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_610cl-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_610cl-hpijs.ppd.gz Binary files differindex 9d1729a04..b2c31a4d0 100644 --- a/ppd/hpijs/hp-deskjet_610cl-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_610cl-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6120-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6120-hpijs.ppd.gz Binary files differindex 5b7699b38..e2d803e03 100644 --- a/ppd/hpijs/hp-deskjet_6120-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6120-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6122-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6122-hpijs.ppd.gz Binary files differindex a41bf23f6..e79c8cf6f 100644 --- a/ppd/hpijs/hp-deskjet_6122-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6122-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6127-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6127-hpijs.ppd.gz Binary files differindex 946027d0d..42713383e 100644 --- a/ppd/hpijs/hp-deskjet_6127-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6127-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_612c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_612c-hpijs.ppd.gz Binary files differindex 3dbfea9d0..8ccdcf252 100644 --- a/ppd/hpijs/hp-deskjet_612c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_612c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_630c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_630c-hpijs.ppd.gz Binary files differindex a6c5eaef8..ab60b8c59 100644 --- a/ppd/hpijs/hp-deskjet_630c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_630c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_632c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_632c-hpijs.ppd.gz Binary files differindex f67ff0719..62ba7fade 100644 --- a/ppd/hpijs/hp-deskjet_632c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_632c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_640c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_640c-hpijs.ppd.gz Binary files differindex ecb4fd43d..ae940662f 100644 --- a/ppd/hpijs/hp-deskjet_640c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_640c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_648c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_648c-hpijs.ppd.gz Binary files differindex 1ca0563bc..c207d1616 100644 --- a/ppd/hpijs/hp-deskjet_648c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_648c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6500-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6500-hpijs.ppd.gz Binary files differindex f9b5b8af8..5d4b73f63 100644 --- a/ppd/hpijs/hp-deskjet_6500-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6500-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6520_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6520_series-hpijs.ppd.gz Binary files differindex 4f18984d8..1320684b7 100644 --- a/ppd/hpijs/hp-deskjet_6520_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6520_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_656c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_656c-hpijs.ppd.gz Binary files differindex ccd4226e5..2a95da57d 100644 --- a/ppd/hpijs/hp-deskjet_656c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_656c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_660-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_660-hpijs.ppd.gz Binary files differindex 5505cf603..385493b67 100644 --- a/ppd/hpijs/hp-deskjet_660-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_660-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6600-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6600-hpijs.ppd.gz Binary files differindex fc31d0bce..42adbe37a 100644 --- a/ppd/hpijs/hp-deskjet_6600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_670-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_670-hpijs.ppd.gz Binary files differindex 7a198aaed..00473164c 100644 --- a/ppd/hpijs/hp-deskjet_670-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_670-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_670c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_670c-hpijs.ppd.gz Binary files differindex bc8fa6ec8..0614f3219 100644 --- a/ppd/hpijs/hp-deskjet_670c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_670c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_670tv-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_670tv-hpijs.ppd.gz Binary files differindex e2643191f..d4a1af1dc 100644 --- a/ppd/hpijs/hp-deskjet_670tv-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_670tv-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_672c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_672c-hpijs.ppd.gz Binary files differindex 2ea674279..f38f3ee1f 100644 --- a/ppd/hpijs/hp-deskjet_672c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_672c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_680-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_680-hpijs.ppd.gz Binary files differindex 753d04aee..408caf622 100644 --- a/ppd/hpijs/hp-deskjet_680-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_680-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6800-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6800-hpijs.ppd.gz Binary files differindex 18835e29b..c0ef78f8f 100644 --- a/ppd/hpijs/hp-deskjet_6800-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6800-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_682-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_682-hpijs.ppd.gz Binary files differindex 2c272e972..d8b9d3790 100644 --- a/ppd/hpijs/hp-deskjet_682-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_682-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_690-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_690-hpijs.ppd.gz Binary files differindex 11061a9b2..76a2eeb20 100644 --- a/ppd/hpijs/hp-deskjet_690-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_690-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_690c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_690c-hpijs.ppd.gz Binary files differindex 39bcb731b..05efa2605 100644 --- a/ppd/hpijs/hp-deskjet_690c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_690c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_692-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_692-hpijs.ppd.gz Binary files differindex aa094517a..90345c7e9 100644 --- a/ppd/hpijs/hp-deskjet_692-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_692-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_693-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_693-hpijs.ppd.gz Binary files differindex 156cfa63c..23d415e45 100644 --- a/ppd/hpijs/hp-deskjet_693-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_693-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_694-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_694-hpijs.ppd.gz Binary files differindex e36648111..208ba5560 100644 --- a/ppd/hpijs/hp-deskjet_694-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_694-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6940_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6940_series-hpijs.ppd.gz Binary files differindex f87a01607..a33e9259e 100644 --- a/ppd/hpijs/hp-deskjet_6940_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6940_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_695-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_695-hpijs.ppd.gz Binary files differindex 2f95039d0..aa86f5805 100644 --- a/ppd/hpijs/hp-deskjet_695-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_695-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_697-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_697-hpijs.ppd.gz Binary files differindex de039186c..917cf6c91 100644 --- a/ppd/hpijs/hp-deskjet_697-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_697-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6980_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6980_series-hpijs.ppd.gz Binary files differindex a2fcc3cf0..64d492ab8 100644 --- a/ppd/hpijs/hp-deskjet_6980_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6980_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_810c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_810c-hpijs.ppd.gz Binary files differindex 4d0f0cf12..22ade1a9c 100644 --- a/ppd/hpijs/hp-deskjet_810c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_810c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_812c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_812c-hpijs.ppd.gz Binary files differindex ec7b1f0b7..352cedbae 100644 --- a/ppd/hpijs/hp-deskjet_812c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_812c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz Binary files differindex 3c7c872a4..c6a05ae76 100644 --- a/ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_816c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_816c-hpijs.ppd.gz Binary files differindex 38192305e..61269294f 100644 --- a/ppd/hpijs/hp-deskjet_816c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_816c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_825c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_825c-hpijs.ppd.gz Binary files differindex 623a69b86..e349d4743 100644 --- a/ppd/hpijs/hp-deskjet_825c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_825c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_830c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_830c-hpijs.ppd.gz Binary files differindex f6c9651fc..899be03e8 100644 --- a/ppd/hpijs/hp-deskjet_830c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_830c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_832c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_832c-hpijs.ppd.gz Binary files differindex 6ec95c55c..02efecc17 100644 --- a/ppd/hpijs/hp-deskjet_832c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_832c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_840c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_840c-hpijs.ppd.gz Binary files differindex 86e8c34ba..f5205d26a 100644 --- a/ppd/hpijs/hp-deskjet_840c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_840c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_841c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_841c-hpijs.ppd.gz Binary files differindex 4af3e6f0b..b9db29201 100644 --- a/ppd/hpijs/hp-deskjet_841c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_841c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_842c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_842c-hpijs.ppd.gz Binary files differindex 5d1104088..f0aa44d14 100644 --- a/ppd/hpijs/hp-deskjet_842c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_842c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_843c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_843c-hpijs.ppd.gz Binary files differindex 97ecfbdb1..e03cc1f57 100644 --- a/ppd/hpijs/hp-deskjet_843c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_843c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_845c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_845c-hpijs.ppd.gz Binary files differindex 80a085968..053bc2593 100644 --- a/ppd/hpijs/hp-deskjet_845c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_845c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_850c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_850c-hpijs.ppd.gz Binary files differindex 95ab2d548..a18178f75 100644 --- a/ppd/hpijs/hp-deskjet_850c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_850c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_855c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_855c-hpijs.ppd.gz Binary files differindex cb0fc9077..c48be0f41 100644 --- a/ppd/hpijs/hp-deskjet_855c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_855c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_870c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_870c-hpijs.ppd.gz Binary files differindex 916599d2d..5e8dee7a2 100644 --- a/ppd/hpijs/hp-deskjet_870c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_870c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_880c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_880c-hpijs.ppd.gz Binary files differindex afe414b24..3f74959a6 100644 --- a/ppd/hpijs/hp-deskjet_880c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_880c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_882c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_882c-hpijs.ppd.gz Binary files differindex cf1a5f4af..bcc63a536 100644 --- a/ppd/hpijs/hp-deskjet_882c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_882c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_890c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_890c-hpijs.ppd.gz Binary files differindex 1a630b626..9f0e1baec 100644 --- a/ppd/hpijs/hp-deskjet_890c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_890c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_895c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_895c-hpijs.ppd.gz Binary files differindex 8c0a6a90e..72b9303e6 100644 --- a/ppd/hpijs/hp-deskjet_895c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_895c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_916c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_916c-hpijs.ppd.gz Binary files differindex 1d1459b96..1da4474a1 100644 --- a/ppd/hpijs/hp-deskjet_916c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_916c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_920c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_920c-hpijs.ppd.gz Binary files differindex 7bfb6fca3..5f6195e74 100644 --- a/ppd/hpijs/hp-deskjet_920c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_920c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_9300-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_9300-hpijs.ppd.gz Binary files differindex bb95e08dd..faef3c108 100644 --- a/ppd/hpijs/hp-deskjet_9300-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_9300-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_930c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_930c-hpijs.ppd.gz Binary files differindex 04880bc72..c1f201ee4 100644 --- a/ppd/hpijs/hp-deskjet_930c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_930c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_932c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_932c-hpijs.ppd.gz Binary files differindex 659842009..e1990481a 100644 --- a/ppd/hpijs/hp-deskjet_932c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_932c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_933c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_933c-hpijs.ppd.gz Binary files differindex 189ccf7e6..a311710c6 100644 --- a/ppd/hpijs/hp-deskjet_933c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_933c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_934c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_934c-hpijs.ppd.gz Binary files differindex 94367b9d6..f69a885c8 100644 --- a/ppd/hpijs/hp-deskjet_934c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_934c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_935c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_935c-hpijs.ppd.gz Binary files differindex e1f976a3d..21253170e 100644 --- a/ppd/hpijs/hp-deskjet_935c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_935c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_940c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_940c-hpijs.ppd.gz Binary files differindex 9e2f821ae..e47fcc913 100644 --- a/ppd/hpijs/hp-deskjet_940c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_940c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_948c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_948c-hpijs.ppd.gz Binary files differindex 0b830cff9..63154ce7d 100644 --- a/ppd/hpijs/hp-deskjet_948c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_948c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_950c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_950c-hpijs.ppd.gz Binary files differindex a9a31909b..cbbbcaa2d 100644 --- a/ppd/hpijs/hp-deskjet_950c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_950c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_952c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_952c-hpijs.ppd.gz Binary files differindex c0c3048ba..ba67b5f67 100644 --- a/ppd/hpijs/hp-deskjet_952c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_952c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_955c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_955c-hpijs.ppd.gz Binary files differindex 0385667ba..2b4abb8a2 100644 --- a/ppd/hpijs/hp-deskjet_955c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_955c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_957c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_957c-hpijs.ppd.gz Binary files differindex e2d22a204..8822d46e3 100644 --- a/ppd/hpijs/hp-deskjet_957c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_957c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_959c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_959c-hpijs.ppd.gz Binary files differindex fd06a69e0..443b9681e 100644 --- a/ppd/hpijs/hp-deskjet_959c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_959c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_9600-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_9600-hpijs.ppd.gz Binary files differindex c5e048180..1e725f674 100644 --- a/ppd/hpijs/hp-deskjet_9600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_9600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_960c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_960c-hpijs.ppd.gz Binary files differindex b3cb21bd4..a93dd62f6 100644 --- a/ppd/hpijs/hp-deskjet_960c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_960c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_970c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_970c-hpijs.ppd.gz Binary files differindex 52533299b..25adcd7ed 100644 --- a/ppd/hpijs/hp-deskjet_970c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_970c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_975c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_975c-hpijs.ppd.gz Binary files differindex efad18e3d..f88b62f57 100644 --- a/ppd/hpijs/hp-deskjet_975c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_975c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_9800-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_9800-hpijs.ppd.gz Binary files differindex fcd0b7389..18d9bf9cb 100644 --- a/ppd/hpijs/hp-deskjet_9800-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_9800-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_980c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_980c-hpijs.ppd.gz Binary files differindex 9e2b5cee1..9bcf9253e 100644 --- a/ppd/hpijs/hp-deskjet_980c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_980c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_990c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_990c-hpijs.ppd.gz Binary files differindex 6f2b8baf2..14e53aedd 100644 --- a/ppd/hpijs/hp-deskjet_990c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_990c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_995c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_995c-hpijs.ppd.gz Binary files differindex cca371e4c..b7ee9266c 100644 --- a/ppd/hpijs/hp-deskjet_995c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_995c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d1300_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d1300_series-hpijs.ppd.gz Binary files differindex f586c2c6b..bba8f19c0 100644 --- a/ppd/hpijs/hp-deskjet_d1300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d1300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d1400_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d1400_series-hpijs.ppd.gz Binary files differindex d12507bbe..fd8fc29bc 100644 --- a/ppd/hpijs/hp-deskjet_d1400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d1400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d1500_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d1500_series-hpijs.ppd.gz Binary files differindex 9e7a65d6f..b6d8caad7 100644 --- a/ppd/hpijs/hp-deskjet_d1500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d1500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d1600_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d1600_series-hpijs.ppd.gz Binary files differindex 1963451a5..caf140c06 100644 --- a/ppd/hpijs/hp-deskjet_d1600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d1600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d2300_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d2300_series-hpijs.ppd.gz Binary files differindex f0c148b7f..178c69b92 100644 --- a/ppd/hpijs/hp-deskjet_d2300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d2300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d2400_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d2400_series-hpijs.ppd.gz Binary files differindex fded68207..19f954e9c 100644 --- a/ppd/hpijs/hp-deskjet_d2400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d2400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d2500_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d2500_series-hpijs.ppd.gz Binary files differindex 7e0599be9..3396efa83 100644 --- a/ppd/hpijs/hp-deskjet_d2500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d2500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d2600_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d2600_series-hpijs.ppd.gz Binary files differindex e5470e17c..55409313d 100644 --- a/ppd/hpijs/hp-deskjet_d2600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d2600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d4100_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d4100_series-hpijs.ppd.gz Binary files differindex 921c5628a..ecd0343eb 100644 --- a/ppd/hpijs/hp-deskjet_d4100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d4100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d4200_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d4200_series-hpijs.ppd.gz Binary files differindex edf906434..84ddc7c7c 100644 --- a/ppd/hpijs/hp-deskjet_d4200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d4200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d4300_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d4300_series-hpijs.ppd.gz Binary files differindex a1069251d..770db9755 100644 --- a/ppd/hpijs/hp-deskjet_d4300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d4300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d5500_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d5500_series-hpijs.ppd.gz Binary files differindex 27adf2441..8bb8914cc 100644 --- a/ppd/hpijs/hp-deskjet_d5500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d5500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d730-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d730-hpijs.ppd.gz Binary files differindex 845fc4d59..83e93fb4b 100644 --- a/ppd/hpijs/hp-deskjet_d730-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d730-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f2100_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f2100_series-hpijs.ppd.gz Binary files differindex 92e962639..61aafc6dd 100644 --- a/ppd/hpijs/hp-deskjet_f2100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f2100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f2200_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f2200_series-hpijs.ppd.gz Binary files differindex dc262330d..958e5d67c 100644 --- a/ppd/hpijs/hp-deskjet_f2200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f2200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f2400_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f2400_series-hpijs.ppd.gz Binary files differindex 6730eea0f..5deac05ac 100644 --- a/ppd/hpijs/hp-deskjet_f2400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f2400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f300_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f300_series-hpijs.ppd.gz Binary files differindex 331e51fe8..6a843916e 100644 --- a/ppd/hpijs/hp-deskjet_f300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f4100_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f4100_series-hpijs.ppd.gz Binary files differindex 513e3a792..2db2dc9e5 100644 --- a/ppd/hpijs/hp-deskjet_f4100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f4100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f4200_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f4200_series-hpijs.ppd.gz Binary files differindex 6e6166861..8e0274a8a 100644 --- a/ppd/hpijs/hp-deskjet_f4200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f4200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f4210_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f4210_series-hpijs.ppd.gz Binary files differindex 35206247d..0eb7bf96c 100644 --- a/ppd/hpijs/hp-deskjet_f4210_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f4210_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f4213_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f4213_series-hpijs.ppd.gz Binary files differindex 55c8c624d..0b9c9bb1f 100644 --- a/ppd/hpijs/hp-deskjet_f4213_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f4213_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f4400_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f4400_series-hpijs.ppd.gz Binary files differindex bbb3245f2..1c70d41bc 100644 --- a/ppd/hpijs/hp-deskjet_f4400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f4400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f4500_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f4500_series-hpijs.ppd.gz Binary files differindex bd6f6eaab..d728300a4 100644 --- a/ppd/hpijs/hp-deskjet_f4500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f4500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f735-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f735-hpijs.ppd.gz Binary files differindex bd55288d5..7c2777485 100644 --- a/ppd/hpijs/hp-deskjet_f735-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f735-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_ink_adv_2010_k010-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_ink_adv_2010_k010-hpijs.ppd.gz Binary files differindex 75174f57c..eeb429576 100644 --- a/ppd/hpijs/hp-deskjet_ink_adv_2010_k010-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_ink_adv_2010_k010-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_ink_adv_2060_k110-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_ink_adv_2060_k110-hpijs.ppd.gz Binary files differindex 053117cce..446893ef8 100644 --- a/ppd/hpijs/hp-deskjet_ink_adv_2060_k110-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_ink_adv_2060_k110-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz Binary files differindex 56b66aa9e..43446e860 100644 --- a/ppd/hpijs/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz Binary files differindex 5e476a5c2..efbc36dfc 100644 --- a/ppd/hpijs/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-dj350-hpijs.ppd.gz b/ppd/hpijs/hp-dj350-hpijs.ppd.gz Binary files differindex 2b5167979..fba47c765 100644 --- a/ppd/hpijs/hp-dj350-hpijs.ppd.gz +++ b/ppd/hpijs/hp-dj350-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-dj450-hpijs.ppd.gz b/ppd/hpijs/hp-dj450-hpijs.ppd.gz Binary files differindex 5c68a1db8..8a5f175da 100644 --- a/ppd/hpijs/hp-dj450-hpijs.ppd.gz +++ b/ppd/hpijs/hp-dj450-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-envy_100_d410_series-hpijs.ppd.gz b/ppd/hpijs/hp-envy_100_d410_series-hpijs.ppd.gz Binary files differindex 416b6395c..9b0156ff4 100644 --- a/ppd/hpijs/hp-envy_100_d410_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-envy_100_d410_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-envy_110_series-hpijs.ppd.gz b/ppd/hpijs/hp-envy_110_series-hpijs.ppd.gz Binary files differindex 6c86a6100..7c342d9d8 100644 --- a/ppd/hpijs/hp-envy_110_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-envy_110_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-envy_120_series-hpijs.ppd.gz b/ppd/hpijs/hp-envy_120_series-hpijs.ppd.gz Binary files differindex b54cd532b..f06c5149a 100644 --- a/ppd/hpijs/hp-envy_120_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-envy_120_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-envy_4500_series-hpijs.ppd.gz b/ppd/hpijs/hp-envy_4500_series-hpijs.ppd.gz Binary files differindex c8f0ca264..0cdb607e9 100644 --- a/ppd/hpijs/hp-envy_4500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-envy_4500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-envy_4510_series-hpijs.ppd.gz b/ppd/hpijs/hp-envy_4510_series-hpijs.ppd.gz Binary files differindex 74a147d38..325ca09bb 100644 --- a/ppd/hpijs/hp-envy_4510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-envy_4510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-envy_4520_series-hpijs.ppd.gz b/ppd/hpijs/hp-envy_4520_series-hpijs.ppd.gz Binary files differindex 72567ee90..4259f02ee 100644 --- a/ppd/hpijs/hp-envy_4520_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-envy_4520_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-envy_5530_series-hpijs.ppd.gz b/ppd/hpijs/hp-envy_5530_series-hpijs.ppd.gz Binary files differindex 63fe67602..a06c7e6ac 100644 --- a/ppd/hpijs/hp-envy_5530_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-envy_5530_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-envy_5540_series-hpijs.ppd.gz b/ppd/hpijs/hp-envy_5540_series-hpijs.ppd.gz Binary files differindex 470d8050b..0a20667ca 100644 --- a/ppd/hpijs/hp-envy_5540_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-envy_5540_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-envy_5640_series-hpijs.ppd.gz b/ppd/hpijs/hp-envy_5640_series-hpijs.ppd.gz Binary files differindex ea0b93fca..b54be8cbf 100644 --- a/ppd/hpijs/hp-envy_5640_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-envy_5640_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-envy_5660_series-hpijs.ppd.gz b/ppd/hpijs/hp-envy_5660_series-hpijs.ppd.gz Binary files differindex 2d4b7ed4d..f6ed1a306 100644 --- a/ppd/hpijs/hp-envy_5660_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-envy_5660_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-envy_7640_series-hpijs.ppd.gz b/ppd/hpijs/hp-envy_7640_series-hpijs.ppd.gz Binary files differindex eb8d064f9..a92d70835 100644 --- a/ppd/hpijs/hp-envy_7640_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-envy_7640_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1000-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1000-hpijs.ppd.gz Binary files differindex 714f0fe50..6b8a39c92 100644 --- a/ppd/hpijs/hp-laserjet_1000-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1000-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1005_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1005_series-hpijs.ppd.gz Binary files differindex c0331feb4..e9dcb3d13 100644 --- a/ppd/hpijs/hp-laserjet_1005_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1005_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1010-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1010-hpijs.ppd.gz Binary files differindex 291cd8306..094653ce7 100644 --- a/ppd/hpijs/hp-laserjet_1010-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1010-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1012-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1012-hpijs.ppd.gz Binary files differindex 2f1f1457e..741aa4ac1 100644 --- a/ppd/hpijs/hp-laserjet_1012-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1012-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1015-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1015-hpijs.ppd.gz Binary files differindex a1dd77278..46835df45 100644 --- a/ppd/hpijs/hp-laserjet_1015-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1015-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1018-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1018-hpijs.ppd.gz Binary files differindex 6e3e919db..23d8fb80b 100644 --- a/ppd/hpijs/hp-laserjet_1018-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1018-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1020-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1020-hpijs.ppd.gz Binary files differindex 8cf926826..6a21d9b31 100644 --- a/ppd/hpijs/hp-laserjet_1020-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1020-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1022-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1022-hpijs-pcl3.ppd.gz Binary files differindex f00bc3eb1..8c94d20cf 100644 --- a/ppd/hpijs/hp-laserjet_1022-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1022-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1022-hpijs-zjs.ppd.gz b/ppd/hpijs/hp-laserjet_1022-hpijs-zjs.ppd.gz Binary files differindex 4f532642e..bfaa08676 100644 --- a/ppd/hpijs/hp-laserjet_1022-hpijs-zjs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1022-hpijs-zjs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1022n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1022n-hpijs-pcl3.ppd.gz Binary files differindex 2f70f6e0d..9aec17f5e 100644 --- a/ppd/hpijs/hp-laserjet_1022n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1022n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1022n-hpijs-zjs.ppd.gz b/ppd/hpijs/hp-laserjet_1022n-hpijs-zjs.ppd.gz Binary files differindex 323f6ec31..16d4ee7e7 100644 --- a/ppd/hpijs/hp-laserjet_1022n-hpijs-zjs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1022n-hpijs-zjs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz Binary files differindex f30392a8f..b922959b8 100644 --- a/ppd/hpijs/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1022nw-hpijs-zjs.ppd.gz b/ppd/hpijs/hp-laserjet_1022nw-hpijs-zjs.ppd.gz Binary files differindex 9293c91dc..553adf874 100644 --- a/ppd/hpijs/hp-laserjet_1022nw-hpijs-zjs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1022nw-hpijs-zjs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1100-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1100-hpijs.ppd.gz Binary files differindex 0c8428c3a..cb622c6b2 100644 --- a/ppd/hpijs/hp-laserjet_1100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1100a-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1100a-hpijs.ppd.gz Binary files differindex 2603c44bf..cbd27f5a1 100644 --- a/ppd/hpijs/hp-laserjet_1100a-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1100a-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1100xi-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1100xi-hpijs.ppd.gz Binary files differindex 9ee062332..89fad3f05 100644 --- a/ppd/hpijs/hp-laserjet_1100xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1100xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1150-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1150-hpijs.ppd.gz Binary files differindex 75586b51e..4021a4ac9 100644 --- a/ppd/hpijs/hp-laserjet_1150-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1150-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1160-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1160-hpijs.ppd.gz Binary files differindex 10c9ba82b..db14a09c9 100644 --- a/ppd/hpijs/hp-laserjet_1160-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1160-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1160_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1160_series-hpijs.ppd.gz Binary files differindex b222e3b74..7512c042a 100644 --- a/ppd/hpijs/hp-laserjet_1160_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1160_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1200-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1200-hpijs-pcl3.ppd.gz Binary files differindex db30371b9..9a8d47a28 100644 --- a/ppd/hpijs/hp-laserjet_1200-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1200-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1200n-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1200n-hpijs.ppd.gz Binary files differindex bd1d2072f..7dd23538e 100644 --- a/ppd/hpijs/hp-laserjet_1200n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1200n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1220-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1220-hpijs-pcl3.ppd.gz Binary files differindex 7af726401..cfd8a44f8 100644 --- a/ppd/hpijs/hp-laserjet_1220-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1220-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1220se-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1220se-hpijs.ppd.gz Binary files differindex 2a492d5b1..d3df097ea 100644 --- a/ppd/hpijs/hp-laserjet_1220se-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1220se-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1300-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1300-hpijs-pcl3.ppd.gz Binary files differindex 03501a178..40645db22 100644 --- a/ppd/hpijs/hp-laserjet_1300-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1300-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1300n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1300n-hpijs-pcl3.ppd.gz Binary files differindex da12eb52a..4292fbba7 100644 --- a/ppd/hpijs/hp-laserjet_1300n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1300n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1300xi-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1300xi-hpijs-pcl3.ppd.gz Binary files differindex d391f93f4..466f8334a 100644 --- a/ppd/hpijs/hp-laserjet_1300xi-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1300xi-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1320-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1320-hpijs.ppd.gz Binary files differindex faf491de4..725ae046d 100644 --- a/ppd/hpijs/hp-laserjet_1320-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1320-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1320_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1320_series-hpijs-pcl3.ppd.gz Binary files differindex 4d720cb25..d3245644c 100644 --- a/ppd/hpijs/hp-laserjet_1320_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1320_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1320n-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1320n-hpijs.ppd.gz Binary files differindex f9740e2ab..1e37824df 100644 --- a/ppd/hpijs/hp-laserjet_1320n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1320n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1320nw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1320nw-hpijs.ppd.gz Binary files differindex 7a1887604..8ee1f0f8e 100644 --- a/ppd/hpijs/hp-laserjet_1320nw-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1320nw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1320tn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1320tn-hpijs.ppd.gz Binary files differindex b23f134a5..bdda334a0 100644 --- a/ppd/hpijs/hp-laserjet_1320tn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1320tn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2100-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_2100-hpijs.ppd.gz Binary files differindex 63d8be584..1ef37fef4 100644 --- a/ppd/hpijs/hp-laserjet_2100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz Binary files differindex 62c32d047..537bc7a17 100644 --- a/ppd/hpijs/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2200-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_2200-hpijs-pcl3.ppd.gz Binary files differindex a13609b04..41f595500 100644 --- a/ppd/hpijs/hp-laserjet_2200-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2200-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2200_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_2200_series-hpijs.ppd.gz Binary files differindex edb3dd55e..db7d4e4c2 100644 --- a/ppd/hpijs/hp-laserjet_2200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2300-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_2300-hpijs-pcl3.ppd.gz Binary files differindex 8be05e398..edf9357a0 100644 --- a/ppd/hpijs/hp-laserjet_2300-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2300-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2300_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_2300_series-hpijs.ppd.gz Binary files differindex 9b7fbfbba..cffe2c128 100644 --- a/ppd/hpijs/hp-laserjet_2300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2410-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_2410-hpijs-pcl3.ppd.gz Binary files differindex b04309e8e..9a86a34b1 100644 --- a/ppd/hpijs/hp-laserjet_2410-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2410-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2420-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_2420-hpijs-pcl3.ppd.gz Binary files differindex e25f357a5..83ccbc22d 100644 --- a/ppd/hpijs/hp-laserjet_2420-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2420-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2430-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_2430-hpijs-pcl3.ppd.gz Binary files differindex 06bbb7cf7..f184d97d9 100644 --- a/ppd/hpijs/hp-laserjet_2430-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2430-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3015-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3015-hpijs-pcl3.ppd.gz Binary files differindex 3507b7d14..8eaec3a6a 100644 --- a/ppd/hpijs/hp-laserjet_3015-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3015-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3020-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3020-hpijs-pcl3.ppd.gz Binary files differindex 39cc30e2e..318f33df2 100644 --- a/ppd/hpijs/hp-laserjet_3020-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3020-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3030-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3030-hpijs-pcl3.ppd.gz Binary files differindex 3bfe323ab..05e0e2e42 100644 --- a/ppd/hpijs/hp-laserjet_3030-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3030-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3050-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3050-hpijs-pcl3.ppd.gz Binary files differindex bf2e2c9fc..a6339750b 100644 --- a/ppd/hpijs/hp-laserjet_3050-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3050-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3052-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3052-hpijs-pcl3.ppd.gz Binary files differindex 3cc65466e..d5b1da424 100644 --- a/ppd/hpijs/hp-laserjet_3052-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3052-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3055-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3055-hpijs.ppd.gz Binary files differindex ca29ad8df..8349efd19 100644 --- a/ppd/hpijs/hp-laserjet_3055-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3055-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3100-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3100-hpijs.ppd.gz Binary files differindex c3bb94076..09f7eb39e 100644 --- a/ppd/hpijs/hp-laserjet_3100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3150-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3150-hpijs.ppd.gz Binary files differindex 80c9b4a7d..624f07f4e 100644 --- a/ppd/hpijs/hp-laserjet_3150-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3150-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3200-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3200-hpijs.ppd.gz Binary files differindex c87988814..5412afe5c 100644 --- a/ppd/hpijs/hp-laserjet_3200-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3200-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3200m-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3200m-hpijs-pcl3.ppd.gz Binary files differindex c39919dc0..287a8a260 100644 --- a/ppd/hpijs/hp-laserjet_3200m-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3200m-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3200se-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3200se-hpijs.ppd.gz Binary files differindex 60fda7a50..7d7491d99 100644 --- a/ppd/hpijs/hp-laserjet_3200se-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3200se-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz Binary files differindex 8189d2882..08b1f56d5 100644 --- a/ppd/hpijs/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3330-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3330-hpijs.ppd.gz Binary files differindex 1a05b8f88..feecdaf91 100644 --- a/ppd/hpijs/hp-laserjet_3330-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3330-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3380-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3380-hpijs-pcl3.ppd.gz Binary files differindex 110c4b77a..9503c2bb1 100644 --- a/ppd/hpijs/hp-laserjet_3380-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3380-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3390-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3390-hpijs-pcl3.ppd.gz Binary files differindex ce3f15330..0ec1b077b 100644 --- a/ppd/hpijs/hp-laserjet_3390-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3390-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3392-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3392-hpijs.ppd.gz Binary files differindex dcfa57884..f9aa92d9f 100644 --- a/ppd/hpijs/hp-laserjet_3392-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3392-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4000_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4000_series-hpijs-pcl3.ppd.gz Binary files differindex 24cf4758b..9f2f715f3 100644 --- a/ppd/hpijs/hp-laserjet_4000_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4000_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4050_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4050_series-hpijs-pcl3.ppd.gz Binary files differindex 6bcc9031c..8592f5382 100644 --- a/ppd/hpijs/hp-laserjet_4050_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4050_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4100_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4100_mfp-hpijs-pcl3.ppd.gz Binary files differindex ec00e12ac..2568ee5b1 100644 --- a/ppd/hpijs/hp-laserjet_4100_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4100_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4100_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4100_series-hpijs-pcl3.ppd.gz Binary files differindex b36cf1070..4bb89d14c 100644 --- a/ppd/hpijs/hp-laserjet_4100_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4100_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4150_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_4150_series-hpijs.ppd.gz Binary files differindex 692ccaa0d..a9548bd6d 100644 --- a/ppd/hpijs/hp-laserjet_4150_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4150_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4200-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4200-hpijs-pcl3.ppd.gz Binary files differindex 6d4c7084c..716f9fe3e 100644 --- a/ppd/hpijs/hp-laserjet_4200-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4200-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4240-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4240-hpijs-pcl3.ppd.gz Binary files differindex 85f8ef5fb..983da4657 100644 --- a/ppd/hpijs/hp-laserjet_4240-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4240-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4250-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4250-hpijs-pcl3.ppd.gz Binary files differindex 3782704d1..19a593af5 100644 --- a/ppd/hpijs/hp-laserjet_4250-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4250-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4300-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4300-hpijs-pcl3.ppd.gz Binary files differindex e5d576e1e..8529fdc8f 100644 --- a/ppd/hpijs/hp-laserjet_4300-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4300-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4345_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4345_mfp-hpijs-pcl3.ppd.gz Binary files differindex b6e7fcf64..be0cdfaf4 100644 --- a/ppd/hpijs/hp-laserjet_4345_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4345_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4350-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4350-hpijs-pcl3.ppd.gz Binary files differindex 0896fc0e0..ab4df2a31 100644 --- a/ppd/hpijs/hp-laserjet_4350-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4350-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4_plus-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4_plus-hpijs-pcl3.ppd.gz Binary files differindex d5c4ef74b..46f16f791 100644 --- a/ppd/hpijs/hp-laserjet_4_plus-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4_plus-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4l-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_4l-hpijs.ppd.gz Binary files differindex 34f0aec94..985cd6528 100644 --- a/ppd/hpijs/hp-laserjet_4l-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4l-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4ml-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_4ml-hpijs.ppd.gz Binary files differindex c044880fe..769f48f11 100644 --- a/ppd/hpijs/hp-laserjet_4ml-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4ml-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4mp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4mp-hpijs-pcl3.ppd.gz Binary files differindex 7809cc323..a1a561e92 100644 --- a/ppd/hpijs/hp-laserjet_4mp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4mp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4si-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4si-hpijs-pcl3.ppd.gz Binary files differindex 6ffb053d0..bf93f8446 100644 --- a/ppd/hpijs/hp-laserjet_4si-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4si-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4v-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4v-hpijs-pcl3.ppd.gz Binary files differindex 32d559ab0..3036f8e89 100644 --- a/ppd/hpijs/hp-laserjet_4v-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4v-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5000-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_5000-hpijs.ppd.gz Binary files differindex cc10018ea..fe038c743 100644 --- a/ppd/hpijs/hp-laserjet_5000-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5000-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz Binary files differindex d784995a3..9e2520f71 100644 --- a/ppd/hpijs/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz Binary files differindex 1f7647598..a42e44043 100644 --- a/ppd/hpijs/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5200-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5200-hpijs-pcl3.ppd.gz Binary files differindex d2dea74ff..bcd26bfe6 100644 --- a/ppd/hpijs/hp-laserjet_5200-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5200-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5200l-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5200l-hpijs-pcl3.ppd.gz Binary files differindex 21940e326..ca8fde692 100644 --- a/ppd/hpijs/hp-laserjet_5200l-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5200l-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5200lx-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_5200lx-hpijs.ppd.gz Binary files differindex d7fc71381..39428b2e1 100644 --- a/ppd/hpijs/hp-laserjet_5200lx-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5200lx-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5l-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_5l-hpijs.ppd.gz Binary files differindex 2893c2581..c08e2d6e7 100644 --- a/ppd/hpijs/hp-laserjet_5l-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5l-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5mp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5mp-hpijs-pcl3.ppd.gz Binary files differindex f1628ac6c..9e510e108 100644 --- a/ppd/hpijs/hp-laserjet_5mp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5mp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5p-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_5p-hpijs.ppd.gz Binary files differindex 2288d9827..b577900a9 100644 --- a/ppd/hpijs/hp-laserjet_5p-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5p-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5si-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5si-hpijs-pcl3.ppd.gz Binary files differindex a39334895..a1fe7da75 100644 --- a/ppd/hpijs/hp-laserjet_5si-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5si-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz Binary files differindex 8f1c3f5bb..14b957ef6 100644 --- a/ppd/hpijs/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_6l-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_6l-hpijs.ppd.gz Binary files differindex c32f929db..c19c49c7f 100644 --- a/ppd/hpijs/hp-laserjet_6l-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_6l-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_6mp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_6mp-hpijs-pcl3.ppd.gz Binary files differindex 86f5c7ede..c790147e3 100644 --- a/ppd/hpijs/hp-laserjet_6mp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_6mp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_6p-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_6p-hpijs.ppd.gz Binary files differindex e4784575f..bbcc0afff 100644 --- a/ppd/hpijs/hp-laserjet_6p-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_6p-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_8000-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_8000-hpijs.ppd.gz Binary files differindex 0a2e48d78..05bb1482d 100644 --- a/ppd/hpijs/hp-laserjet_8000-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_8000-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz Binary files differindex 26004027e..ba69cebc2 100644 --- a/ppd/hpijs/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_8100_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_8100_mfp-hpijs.ppd.gz Binary files differindex 57f54370c..85d4502c3 100644 --- a/ppd/hpijs/hp-laserjet_8100_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_8100_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz Binary files differindex c5691fac5..4fbe2ff1a 100644 --- a/ppd/hpijs/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_8150_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_8150_mfp-hpijs.ppd.gz Binary files differindex 58941c329..978ce20a5 100644 --- a/ppd/hpijs/hp-laserjet_8150_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_8150_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_8150_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_8150_series-hpijs-pcl3.ppd.gz Binary files differindex 907002cb5..6ddd8a989 100644 --- a/ppd/hpijs/hp-laserjet_8150_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_8150_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9000_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9000_mfp-hpijs-pcl3.ppd.gz Binary files differindex 34fe9efaf..69f2756b8 100644 --- a/ppd/hpijs/hp-laserjet_9000_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9000_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9000_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9000_series-hpijs-pcl3.ppd.gz Binary files differindex 28f7fb99f..d8fbfaaa0 100644 --- a/ppd/hpijs/hp-laserjet_9000_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9000_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9040-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9040-hpijs-pcl3.ppd.gz Binary files differindex f1c77433a..2b53ae485 100644 --- a/ppd/hpijs/hp-laserjet_9040-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9040-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9040_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9040_mfp-hpijs-pcl3.ppd.gz Binary files differindex 8ea84eae4..6a0e1bfd3 100644 --- a/ppd/hpijs/hp-laserjet_9040_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9040_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9050-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9050-hpijs-pcl3.ppd.gz Binary files differindex c60a3f74c..e9456131d 100644 --- a/ppd/hpijs/hp-laserjet_9050-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9050-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9050_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9050_mfp-hpijs-pcl3.ppd.gz Binary files differindex 514b071a5..46d4a1634 100644 --- a/ppd/hpijs/hp-laserjet_9050_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9050_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9055mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9055mfp-hpijs-pcl3.ppd.gz Binary files differindex cdd20a3f4..6de37af00 100644 --- a/ppd/hpijs/hp-laserjet_9055mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9055mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz Binary files differindex 4ddc168f2..b32f91a39 100644 --- a/ppd/hpijs/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1411fn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1411fn-hpijs-pcl3.ppd.gz Binary files differindex 007634617..a1717f996 100644 --- a/ppd/hpijs/hp-laserjet_cm1411fn-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cm1411fn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1412fn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1412fn-hpijs-pcl3.ppd.gz Binary files differindex 7badbb2a0..2edbcd080 100644 --- a/ppd/hpijs/hp-laserjet_cm1412fn-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cm1412fn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1413fn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1413fn-hpijs-pcl3.ppd.gz Binary files differindex 1c0e20364..2d7b8a33c 100644 --- a/ppd/hpijs/hp-laserjet_cm1413fn-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cm1413fn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1415fn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1415fn-hpijs-pcl3.ppd.gz Binary files differindex 0459a0fdf..30350d0ba 100644 --- a/ppd/hpijs/hp-laserjet_cm1415fn-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cm1415fn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1415fnw-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1415fnw-hpijs-pcl3.ppd.gz Binary files differindex aff1ae4bc..f30a39917 100644 --- a/ppd/hpijs/hp-laserjet_cm1415fnw-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cm1415fnw-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1416fnw-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1416fnw-hpijs-pcl3.ppd.gz Binary files differindex 8a9a9fd30..3896c97c6 100644 --- a/ppd/hpijs/hp-laserjet_cm1416fnw-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cm1416fnw-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1417fnw-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1417fnw-hpijs-pcl3.ppd.gz Binary files differindex 54831cf4b..560e0d4da 100644 --- a/ppd/hpijs/hp-laserjet_cm1417fnw-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cm1417fnw-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz Binary files differindex 8b02f96c2..1c38a600f 100644 --- a/ppd/hpijs/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cp1025-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_cp1025-hpijs.ppd.gz Binary files differindex b9bf666d5..990e6a8f3 100644 --- a/ppd/hpijs/hp-laserjet_cp1025-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cp1025-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cp1025nw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_cp1025nw-hpijs.ppd.gz Binary files differindex ce6f752e4..67d625649 100644 --- a/ppd/hpijs/hp-laserjet_cp1025nw-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cp1025nw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cp_1025-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_cp_1025-hpijs.ppd.gz Binary files differindex 08acf5e95..cfe47ef0d 100644 --- a/ppd/hpijs/hp-laserjet_cp_1025-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cp_1025-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cp_1025nw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_cp_1025nw-hpijs.ppd.gz Binary files differindex a786aed97..b0bb89f54 100644 --- a/ppd/hpijs/hp-laserjet_cp_1025nw-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cp_1025nw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1005-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_m1005-hpijs.ppd.gz Binary files differindex 7d17609b6..9d9cb61e4 100644 --- a/ppd/hpijs/hp-laserjet_m1005-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1005-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1120_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_m1120_mfp-hpijs.ppd.gz Binary files differindex 48f423f06..dfc192206 100644 --- a/ppd/hpijs/hp-laserjet_m1120_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1120_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1120n_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_m1120n_mfp-hpijs.ppd.gz Binary files differindex b815e1b90..169186235 100644 --- a/ppd/hpijs/hp-laserjet_m1120n_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1120n_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1319f_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_m1319f_mfp-hpijs.ppd.gz Binary files differindex 738a67caf..2fd4459d8 100644 --- a/ppd/hpijs/hp-laserjet_m1319f_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1319f_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz Binary files differindex 8c8b70b81..8a5d31970 100644 --- a/ppd/hpijs/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz Binary files differindex 5fe91bf72..d920982f4 100644 --- a/ppd/hpijs/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz Binary files differindex 41fc0f2b8..1bc0c651e 100644 --- a/ppd/hpijs/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz Binary files differindex e307286f6..b6c91a6b5 100644 --- a/ppd/hpijs/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m2727_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m2727_mfp-hpijs-pcl3.ppd.gz Binary files differindex 2b2734c86..7267adf29 100644 --- a/ppd/hpijs/hp-laserjet_m2727_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m2727_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz Binary files differindex d06a2982d..2c3317240 100644 --- a/ppd/hpijs/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz Binary files differindex 4a1e800c1..90971b840 100644 --- a/ppd/hpijs/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz Binary files differindex 6d7b66514..1a6f4c360 100644 --- a/ppd/hpijs/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz Binary files differindex 6020ecf7d..e27ab2fc7 100644 --- a/ppd/hpijs/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m5025_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m5025_mfp-hpijs-pcl3.ppd.gz Binary files differindex 7da6d090e..2c5b0f07a 100644 --- a/ppd/hpijs/hp-laserjet_m5025_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m5025_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz Binary files differindex e98f3dcb4..606e4fa1e 100644 --- a/ppd/hpijs/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz Binary files differindex 41ef8a283..84feebf01 100644 --- a/ppd/hpijs/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz Binary files differindex b0740248d..16129b722 100644 --- a/ppd/hpijs/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz Binary files differindex 27bc9937f..9b62db604 100644 --- a/ppd/hpijs/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz Binary files differindex a7ad015ce..64cf19eb1 100644 --- a/ppd/hpijs/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1005-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p1005-hpijs.ppd.gz Binary files differindex 45b2ba60f..01393fe8c 100644 --- a/ppd/hpijs/hp-laserjet_p1005-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1005-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1006-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p1006-hpijs.ppd.gz Binary files differindex f787b0c74..af2b7c6ba 100644 --- a/ppd/hpijs/hp-laserjet_p1006-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1006-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1007-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p1007-hpijs.ppd.gz Binary files differindex 316842973..2cdf3fae2 100644 --- a/ppd/hpijs/hp-laserjet_p1007-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1007-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1008-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p1008-hpijs.ppd.gz Binary files differindex 779909a01..6b3f18ed9 100644 --- a/ppd/hpijs/hp-laserjet_p1008-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1008-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1009-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p1009-hpijs.ppd.gz Binary files differindex ad321b383..3506bf5e1 100644 --- a/ppd/hpijs/hp-laserjet_p1009-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1009-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1505-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p1505-hpijs.ppd.gz Binary files differindex ccb51c40c..e3d08fe87 100644 --- a/ppd/hpijs/hp-laserjet_p1505-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1505-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1505n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p1505n-hpijs-pcl3.ppd.gz Binary files differindex 07b73a949..f462c43fb 100644 --- a/ppd/hpijs/hp-laserjet_p1505n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1505n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1505n-hpijs-zxs.ppd.gz b/ppd/hpijs/hp-laserjet_p1505n-hpijs-zxs.ppd.gz Binary files differindex 72c5ffa09..638412cd0 100644 --- a/ppd/hpijs/hp-laserjet_p1505n-hpijs-zxs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1505n-hpijs-zxs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2014-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2014-hpijs-pcl3.ppd.gz Binary files differindex 7b8331599..4e1015ab0 100644 --- a/ppd/hpijs/hp-laserjet_p2014-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2014-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2014-hpijs-zxs.ppd.gz b/ppd/hpijs/hp-laserjet_p2014-hpijs-zxs.ppd.gz Binary files differindex efb47fc40..d7e6b334d 100644 --- a/ppd/hpijs/hp-laserjet_p2014-hpijs-zxs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2014-hpijs-zxs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2014n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2014n-hpijs-pcl3.ppd.gz Binary files differindex 839cc00a5..4231763c0 100644 --- a/ppd/hpijs/hp-laserjet_p2014n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2014n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2014n-hpijs-zxs.ppd.gz b/ppd/hpijs/hp-laserjet_p2014n-hpijs-zxs.ppd.gz Binary files differindex 3743fa0d6..a733412c9 100644 --- a/ppd/hpijs/hp-laserjet_p2014n-hpijs-zxs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2014n-hpijs-zxs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz Binary files differindex 01b5a74ba..603ebe4fb 100644 --- a/ppd/hpijs/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2015d_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p2015d_series-hpijs.ppd.gz Binary files differindex a4e73ddd9..d1704fca8 100644 --- a/ppd/hpijs/hp-laserjet_p2015d_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2015d_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2015dn_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p2015dn_series-hpijs.ppd.gz Binary files differindex 97ad7eeb4..2188e24aa 100644 --- a/ppd/hpijs/hp-laserjet_p2015dn_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2015dn_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2015n_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p2015n_series-hpijs.ppd.gz Binary files differindex 8c76a2923..6c93a054d 100644 --- a/ppd/hpijs/hp-laserjet_p2015n_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2015n_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2015x_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p2015x_series-hpijs.ppd.gz Binary files differindex e28856a5c..eea2c42ee 100644 --- a/ppd/hpijs/hp-laserjet_p2015x_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2015x_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2035-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2035-hpijs-pcl3.ppd.gz Binary files differindex 9ef7c1726..75d1fda62 100644 --- a/ppd/hpijs/hp-laserjet_p2035-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2035-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2035-hpijs-zjs.ppd.gz b/ppd/hpijs/hp-laserjet_p2035-hpijs-zjs.ppd.gz Binary files differindex 4196605bd..0dcd61569 100644 --- a/ppd/hpijs/hp-laserjet_p2035-hpijs-zjs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2035-hpijs-zjs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz Binary files differindex 95598f350..41625fb33 100644 --- a/ppd/hpijs/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2035n-hpijs-zjs.ppd.gz b/ppd/hpijs/hp-laserjet_p2035n-hpijs-zjs.ppd.gz Binary files differindex d225bcda3..1156531a5 100644 --- a/ppd/hpijs/hp-laserjet_p2035n-hpijs-zjs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2035n-hpijs-zjs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2055-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2055-hpijs-pcl3.ppd.gz Binary files differindex a8d7f996b..85d3db0e4 100644 --- a/ppd/hpijs/hp-laserjet_p2055-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2055-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2055d-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2055d-hpijs-pcl3.ppd.gz Binary files differindex e32624f5c..16026f98b 100644 --- a/ppd/hpijs/hp-laserjet_p2055d-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2055d-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz Binary files differindex 555eeec29..94ea2d3b0 100644 --- a/ppd/hpijs/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2055x-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2055x-hpijs-pcl3.ppd.gz Binary files differindex f9cb2494c..be542200d 100644 --- a/ppd/hpijs/hp-laserjet_p2055x-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2055x-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p3004-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p3004-hpijs-pcl3.ppd.gz Binary files differindex 2a03f5e30..3bd12290a 100644 --- a/ppd/hpijs/hp-laserjet_p3004-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p3004-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p3005-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p3005-hpijs-pcl3.ppd.gz Binary files differindex bd012d121..388de233c 100644 --- a/ppd/hpijs/hp-laserjet_p3005-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p3005-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p3010_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p3010_series-hpijs-pcl3.ppd.gz Binary files differindex 921708420..afca600b1 100644 --- a/ppd/hpijs/hp-laserjet_p3010_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p3010_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4014-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4014-hpijs.ppd.gz Binary files differindex cd3afe482..a10d936b1 100644 --- a/ppd/hpijs/hp-laserjet_p4014-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4014-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4014dn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4014dn-hpijs.ppd.gz Binary files differindex 1d0a1a94d..23011ffb4 100644 --- a/ppd/hpijs/hp-laserjet_p4014dn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4014dn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4014n-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4014n-hpijs.ppd.gz Binary files differindex 2d77338e9..9bf8a1e56 100644 --- a/ppd/hpijs/hp-laserjet_p4014n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4014n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4015-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4015-hpijs.ppd.gz Binary files differindex 9bff8b5cd..08dc12714 100644 --- a/ppd/hpijs/hp-laserjet_p4015-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4015-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4015dn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4015dn-hpijs.ppd.gz Binary files differindex 1977e63e8..f775a9c67 100644 --- a/ppd/hpijs/hp-laserjet_p4015dn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4015dn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4015n-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4015n-hpijs.ppd.gz Binary files differindex 56b449d69..30d3f486f 100644 --- a/ppd/hpijs/hp-laserjet_p4015n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4015n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4015tn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4015tn-hpijs.ppd.gz Binary files differindex 22d0e0785..40143382f 100644 --- a/ppd/hpijs/hp-laserjet_p4015tn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4015tn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4015x-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4015x-hpijs.ppd.gz Binary files differindex 8a8536d24..cc8600e25 100644 --- a/ppd/hpijs/hp-laserjet_p4015x-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4015x-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4515-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4515-hpijs.ppd.gz Binary files differindex 082609e4a..b3e369839 100644 --- a/ppd/hpijs/hp-laserjet_p4515-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4515-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4515n-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4515n-hpijs.ppd.gz Binary files differindex 87946c0d7..20b37c96c 100644 --- a/ppd/hpijs/hp-laserjet_p4515n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4515n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4515tn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4515tn-hpijs.ppd.gz Binary files differindex a6b33c0bc..983d3c3c1 100644 --- a/ppd/hpijs/hp-laserjet_p4515tn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4515tn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4515x-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4515x-hpijs.ppd.gz Binary files differindex 91e71d186..a4a298581 100644 --- a/ppd/hpijs/hp-laserjet_p4515x-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4515x-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4515xm-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4515xm-hpijs.ppd.gz Binary files differindex a7358945d..a15b2b4c3 100644 --- a/ppd/hpijs/hp-laserjet_p4515xm-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4515xm-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m125a-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m125a-hpijs.ppd.gz Binary files differindex ef9792e92..4e0618e13 100644 --- a/ppd/hpijs/hp-laserjet_pro_mfp_m125a-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m125a-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m125nw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m125nw-hpijs.ppd.gz Binary files differindex 7ecf39b60..4c4968332 100644 --- a/ppd/hpijs/hp-laserjet_pro_mfp_m125nw-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m125nw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m125r-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m125r-hpijs.ppd.gz Binary files differindex 6b255a50a..c851317b2 100644 --- a/ppd/hpijs/hp-laserjet_pro_mfp_m125r-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m125r-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m125ra-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m125ra-hpijs.ppd.gz Binary files differindex 64c14098d..498cea3bf 100644 --- a/ppd/hpijs/hp-laserjet_pro_mfp_m125ra-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m125ra-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m125rnw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m125rnw-hpijs.ppd.gz Binary files differindex 6d1789a04..df2c07d07 100644 --- a/ppd/hpijs/hp-laserjet_pro_mfp_m125rnw-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m125rnw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m126a-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m126a-hpijs.ppd.gz Binary files differindex 5bfb79089..7ea4372a1 100644 --- a/ppd/hpijs/hp-laserjet_pro_mfp_m126a-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m126a-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m126nw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m126nw-hpijs.ppd.gz Binary files differindex 7de157e50..04e94f5ff 100644 --- a/ppd/hpijs/hp-laserjet_pro_mfp_m126nw-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m126nw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m127fn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m127fn-hpijs.ppd.gz Binary files differindex 377f95519..782def0be 100644 --- a/ppd/hpijs/hp-laserjet_pro_mfp_m127fn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m127fn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m127fp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m127fp-hpijs.ppd.gz Binary files differindex a7d61b98b..6a30ea065 100644 --- a/ppd/hpijs/hp-laserjet_pro_mfp_m127fp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m127fp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m127fw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m127fw-hpijs.ppd.gz Binary files differindex 7ff56e7d5..c6b8ec614 100644 --- a/ppd/hpijs/hp-laserjet_pro_mfp_m127fw-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m127fw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m128fn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m128fn-hpijs.ppd.gz Binary files differindex 1e888e438..1d3bf5c8b 100644 --- a/ppd/hpijs/hp-laserjet_pro_mfp_m128fn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m128fn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m128fp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m128fp-hpijs.ppd.gz Binary files differindex 8529a4c2b..3fe5c91a4 100644 --- a/ppd/hpijs/hp-laserjet_pro_mfp_m128fp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m128fp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_pro_mfp_m128fw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_pro_mfp_m128fw-hpijs.ppd.gz Binary files differindex 11e9ae768..bca4d0521 100644 --- a/ppd/hpijs/hp-laserjet_pro_mfp_m128fw-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_pro_mfp_m128fw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz Binary files differindex 9a3bce00a..ad257ece6 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz Binary files differindex 693208a0b..368db4ff0 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1137_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1137_mfp-hpijs.ppd.gz Binary files differindex 662300a1e..5c2fc4c44 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1137_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1137_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1138_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1138_mfp-hpijs.ppd.gz Binary files differindex 595dcebe2..9c6ccfcce 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1138_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1138_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1139_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1139_mfp-hpijs.ppd.gz Binary files differindex d316e220e..6b5feb183 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1139_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1139_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz Binary files differindex 38d6ffaf6..3c7aa36d8 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz Binary files differindex 7a1b1b46d..9e51c7eba 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz Binary files differindex be217ee71..3227944c3 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1216nfh_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1216nfh_mfp-hpijs.ppd.gz Binary files differindex 5730e4058..ac7b3de6a 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1216nfh_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1216nfh_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz Binary files differindex 8faba3e57..5baf2ef03 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1218nfg_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1218nfg_mfp-hpijs.ppd.gz Binary files differindex d6605f6b1..3a3a0be4e 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1218nfg_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1218nfg_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1218nfs_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1218nfs_mfp-hpijs.ppd.gz Binary files differindex 661f86c30..30d9eae48 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1218nfs_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1218nfs_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1219nf_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1219nf_mfp-hpijs.ppd.gz Binary files differindex 63d898035..0caa6d7a8 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1219nf_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1219nf_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1219nfg_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1219nfg_mfp-hpijs.ppd.gz Binary files differindex 2ab251c66..d1920ee01 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1219nfg_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1219nfg_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1219nfs_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1219nfs_mfp-hpijs.ppd.gz Binary files differindex e5aa6ccdd..7333e2e54 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1219nfs_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1219nfs_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1102-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1102-hpijs.ppd.gz Binary files differindex 8f7791dc3..1b34595a2 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1102-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1102-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz Binary files differindex a1a4580dc..638bfe040 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1106-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1106-hpijs.ppd.gz Binary files differindex 9767d07d6..9ee6ea815 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1106-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1106-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1106w-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1106w-hpijs.ppd.gz Binary files differindex 4f296f710..979dbe34f 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1106w-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1106w-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1107-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1107-hpijs.ppd.gz Binary files differindex 6e84c1928..f96de7c1e 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1107-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1107-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1107w-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1107w-hpijs.ppd.gz Binary files differindex 2233c0e3b..ca782506e 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1107w-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1107w-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1108-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1108-hpijs.ppd.gz Binary files differindex b32883daa..e854ae99a 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1108-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1108-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1108w-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1108w-hpijs.ppd.gz Binary files differindex 304ca89f3..eef3df0d3 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1108w-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1108w-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1109-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1109-hpijs.ppd.gz Binary files differindex b77bed47b..596328e60 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1109-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1109-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1109w-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1109w-hpijs.ppd.gz Binary files differindex d6acadfa6..9e1da2c31 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1109w-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1109w-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1566-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1566-hpijs.ppd.gz Binary files differindex 899b033ff..6a97e118f 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1566-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1566-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1567-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1567-hpijs.ppd.gz Binary files differindex 6f2ff9c27..43ac3d9a2 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1567-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1567-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1568-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1568-hpijs.ppd.gz Binary files differindex d3317ca3e..3ef3b063c 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1568-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1568-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1569-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1569-hpijs.ppd.gz Binary files differindex 314c6c8f9..1aa231718 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1569-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1569-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1606dn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1606dn-hpijs.ppd.gz Binary files differindex c4710dcd2..47131e2b3 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1606dn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1606dn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1607dn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1607dn-hpijs.ppd.gz Binary files differindex 4eaa0fd6b..25b79f985 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1607dn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1607dn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1608dn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1608dn-hpijs.ppd.gz Binary files differindex cb84147c8..5658bfab2 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1608dn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1608dn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1609dn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1609dn-hpijs.ppd.gz Binary files differindex d7f0b5d27..da560fe29 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1609dn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1609dn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p_1102w-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p_1102w-hpijs.ppd.gz Binary files differindex a93a5fa4d..5dd170beb 100644 --- a/ppd/hpijs/hp-laserjet_professional_p_1102w-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p_1102w-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-mopier_240-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-mopier_240-hpijs-pcl3.ppd.gz Binary files differindex 825013462..7c7a1e4bf 100644 --- a/ppd/hpijs/hp-mopier_240-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-mopier_240-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-mopier_320-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-mopier_320-hpijs-pcl3.ppd.gz Binary files differindex a0036343f..01eea742e 100644 --- a/ppd/hpijs/hp-mopier_320-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-mopier_320-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-officejet-hpijs.ppd.gz b/ppd/hpijs/hp-officejet-hpijs.ppd.gz Binary files differindex 2804ba3ed..b3f78488f 100644 --- a/ppd/hpijs/hp-officejet-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_100_mobile_l411-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_100_mobile_l411-hpijs.ppd.gz Binary files differindex 40522c0fe..584fc2571 100644 --- a/ppd/hpijs/hp-officejet_100_mobile_l411-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_100_mobile_l411-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_150_mobile_l511-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_150_mobile_l511-hpijs.ppd.gz Binary files differindex 58192e04e..db1fd3093 100644 --- a/ppd/hpijs/hp-officejet_150_mobile_l511-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_150_mobile_l511-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_2620_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_2620_series-hpijs.ppd.gz Binary files differindex 5d86c8633..3d3945c19 100644 --- a/ppd/hpijs/hp-officejet_2620_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_2620_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_3830_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_3830_series-hpijs.ppd.gz Binary files differindex 7f51fd54c..cb895254b 100644 --- a/ppd/hpijs/hp-officejet_3830_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_3830_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4000_k210-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4000_k210-hpijs.ppd.gz Binary files differindex 4f8ee2813..5ccd7bb7d 100644 --- a/ppd/hpijs/hp-officejet_4000_k210-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4000_k210-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4100_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4100_series-hpijs.ppd.gz Binary files differindex a942de450..5a9f9bd76 100644 --- a/ppd/hpijs/hp-officejet_4100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4105-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4105-hpijs.ppd.gz Binary files differindex f785a1ccb..0ce92f017 100644 --- a/ppd/hpijs/hp-officejet_4105-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4105-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4115_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4115_series-hpijs.ppd.gz Binary files differindex 4283e6626..955174b55 100644 --- a/ppd/hpijs/hp-officejet_4115_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4115_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4200_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4200_series-hpijs.ppd.gz Binary files differindex ce01deb50..7543e8106 100644 --- a/ppd/hpijs/hp-officejet_4200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4255-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4255-hpijs.ppd.gz Binary files differindex b3d33964f..e9700fe9b 100644 --- a/ppd/hpijs/hp-officejet_4255-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4255-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4300_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4300_series-hpijs.ppd.gz Binary files differindex d2c6d1d74..4f0417145 100644 --- a/ppd/hpijs/hp-officejet_4300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4400_k410-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4400_k410-hpijs.ppd.gz Binary files differindex 29275e416..5208730d8 100644 --- a/ppd/hpijs/hp-officejet_4400_k410-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4400_k410-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4500_g510a-f-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4500_g510a-f-hpijs.ppd.gz Binary files differindex d978c8563..4f4daa1a4 100644 --- a/ppd/hpijs/hp-officejet_4500_g510a-f-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4500_g510a-f-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4500_g510g-m-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4500_g510g-m-hpijs.ppd.gz Binary files differindex 8e40433d9..8b0d42755 100644 --- a/ppd/hpijs/hp-officejet_4500_g510g-m-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4500_g510g-m-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4500_g510n-z-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4500_g510n-z-hpijs.ppd.gz Binary files differindex af5b4b7c6..2d17aad24 100644 --- a/ppd/hpijs/hp-officejet_4500_g510n-z-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4500_g510n-z-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4500_k710-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4500_k710-hpijs.ppd.gz Binary files differindex 8358253a8..c74f5cdbf 100644 --- a/ppd/hpijs/hp-officejet_4500_k710-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4500_k710-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4610_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4610_series-hpijs.ppd.gz Binary files differindex 002547fe2..3eca9d19e 100644 --- a/ppd/hpijs/hp-officejet_4610_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4610_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4620_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4620_series-hpijs.ppd.gz Binary files differindex 4eb10d4e1..b1b6095c9 100644 --- a/ppd/hpijs/hp-officejet_4620_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4620_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4630_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4630_series-hpijs.ppd.gz Binary files differindex 44bf8aa95..3cb4641f3 100644 --- a/ppd/hpijs/hp-officejet_4630_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4630_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4650_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4650_series-hpijs.ppd.gz Binary files differindex f13c1e4e2..cb8080815 100644 --- a/ppd/hpijs/hp-officejet_4650_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4650_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_5100_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_5100_series-hpijs.ppd.gz Binary files differindex eaee5411c..ab4b9debb 100644 --- a/ppd/hpijs/hp-officejet_5100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_5100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_5105-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_5105-hpijs.ppd.gz Binary files differindex 4b12c9c7b..feee21d69 100644 --- a/ppd/hpijs/hp-officejet_5105-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_5105-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_5110-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_5110-hpijs.ppd.gz Binary files differindex 730c2f5ba..5046b620c 100644 --- a/ppd/hpijs/hp-officejet_5110-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_5110-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_5110v-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_5110v-hpijs.ppd.gz Binary files differindex 8b7abc1f0..4ce9f467a 100644 --- a/ppd/hpijs/hp-officejet_5110v-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_5110v-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_5500_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_5500_series-hpijs.ppd.gz Binary files differindex 4fc457ba4..b7498530b 100644 --- a/ppd/hpijs/hp-officejet_5500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_5500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_5600_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_5600_series-hpijs.ppd.gz Binary files differindex 5b6087fea..76e8885d1 100644 --- a/ppd/hpijs/hp-officejet_5600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_5600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_5740_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_5740_series-hpijs.ppd.gz Binary files differindex cc1e4a0b9..3f7946fb7 100644 --- a/ppd/hpijs/hp-officejet_5740_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_5740_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6000_e609a-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6000_e609a-hpijs.ppd.gz Binary files differindex bc1dd58f6..bb7f0f0d8 100644 --- a/ppd/hpijs/hp-officejet_6000_e609a-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6000_e609a-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6000_e609n-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6000_e609n-hpijs.ppd.gz Binary files differindex 74f2234c2..212369b9b 100644 --- a/ppd/hpijs/hp-officejet_6000_e609n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6000_e609n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6100-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6100-hpijs.ppd.gz Binary files differindex 071513396..d079924ee 100644 --- a/ppd/hpijs/hp-officejet_6100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6100_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6100_series-hpijs.ppd.gz Binary files differindex 2218a7a46..3f424bf31 100644 --- a/ppd/hpijs/hp-officejet_6100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6150_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6150_series-hpijs.ppd.gz Binary files differindex 82adbd893..da03c85a5 100644 --- a/ppd/hpijs/hp-officejet_6150_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6150_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6200_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6200_series-hpijs.ppd.gz Binary files differindex ac67128a9..d935fd40f 100644 --- a/ppd/hpijs/hp-officejet_6200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6300_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6300_series-hpijs.ppd.gz Binary files differindex 7571a7cb1..ed0769a6a 100644 --- a/ppd/hpijs/hp-officejet_6300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6500_e709a-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6500_e709a-hpijs.ppd.gz Binary files differindex 1ff307549..8602215b8 100644 --- a/ppd/hpijs/hp-officejet_6500_e709a-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6500_e709a-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6500_e709n-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6500_e709n-hpijs.ppd.gz Binary files differindex 9203f58e1..42dc8027a 100644 --- a/ppd/hpijs/hp-officejet_6500_e709n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6500_e709n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6500_e710a-f-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6500_e710a-f-hpijs.ppd.gz Binary files differindex 3d19544d4..0001c8f7e 100644 --- a/ppd/hpijs/hp-officejet_6500_e710a-f-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6500_e710a-f-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6500_e710n-z-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6500_e710n-z-hpijs.ppd.gz Binary files differindex e4f9697a6..5eeca27af 100644 --- a/ppd/hpijs/hp-officejet_6500_e710n-z-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6500_e710n-z-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6600-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6600-hpijs.ppd.gz Binary files differindex 6753f0e87..a76a89d19 100644 --- a/ppd/hpijs/hp-officejet_6600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6700-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6700-hpijs.ppd.gz Binary files differindex 2f47493f5..5f58dca1b 100644 --- a/ppd/hpijs/hp-officejet_6700-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6700-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6800-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6800-hpijs.ppd.gz Binary files differindex b8ec40f62..4718d17aa 100644 --- a/ppd/hpijs/hp-officejet_6800-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6800-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7000_e809a-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7000_e809a-hpijs.ppd.gz Binary files differindex 577c48e6d..897488bde 100644 --- a/ppd/hpijs/hp-officejet_7000_e809a-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7000_e809a-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7000_e809a_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7000_e809a_series-hpijs.ppd.gz Binary files differindex 4a80726cd..913965704 100644 --- a/ppd/hpijs/hp-officejet_7000_e809a_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7000_e809a_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7100_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7100_series-hpijs.ppd.gz Binary files differindex 4272b90a3..50de558a5 100644 --- a/ppd/hpijs/hp-officejet_7100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7110_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7110_series-hpijs.ppd.gz Binary files differindex 5084d0903..569d8ddbd 100644 --- a/ppd/hpijs/hp-officejet_7110_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7110_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7200_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7200_series-hpijs.ppd.gz Binary files differindex 5a7600efd..4bf1bbd59 100644 --- a/ppd/hpijs/hp-officejet_7200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7300_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7300_series-hpijs.ppd.gz Binary files differindex 356ca0ffe..2481a670a 100644 --- a/ppd/hpijs/hp-officejet_7300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7400_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7400_series-hpijs.ppd.gz Binary files differindex a9eea6b14..fc82d38ed 100644 --- a/ppd/hpijs/hp-officejet_7400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7500_e910-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7500_e910-hpijs.ppd.gz Binary files differindex 97e2e4467..8288cbb80 100644 --- a/ppd/hpijs/hp-officejet_7500_e910-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7500_e910-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7510_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7510_series-hpijs.ppd.gz Binary files differindex 00dc02fbc..e57ed1afb 100644 --- a/ppd/hpijs/hp-officejet_7510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7610_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7610_series-hpijs.ppd.gz Binary files differindex d75fcf622..f64d383c5 100644 --- a/ppd/hpijs/hp-officejet_7610_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7610_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_8040_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_8040_series-hpijs.ppd.gz Binary files differindex 8623503d3..b61d5f954 100644 --- a/ppd/hpijs/hp-officejet_8040_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_8040_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_9100_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-officejet_9100_series-hpijs-pcl3.ppd.gz Binary files differindex f7cbdb0a0..1f9a26e56 100644 --- a/ppd/hpijs/hp-officejet_9100_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-officejet_9100_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-officejet_d_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_d_series-hpijs.ppd.gz Binary files differindex 973773b62..9f0502d45 100644 --- a/ppd/hpijs/hp-officejet_d_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_d_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_g55-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_g55-hpijs.ppd.gz Binary files differindex a2d20faee..f5657be62 100644 --- a/ppd/hpijs/hp-officejet_g55-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_g55-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_g55xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_g55xi-hpijs.ppd.gz Binary files differindex 81b3d95ad..04ac25619 100644 --- a/ppd/hpijs/hp-officejet_g55xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_g55xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_g85-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_g85-hpijs.ppd.gz Binary files differindex 693595951..c0483cb67 100644 --- a/ppd/hpijs/hp-officejet_g85-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_g85-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_g85xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_g85xi-hpijs.ppd.gz Binary files differindex 04a9d2efc..3e22de450 100644 --- a/ppd/hpijs/hp-officejet_g85xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_g85xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_g95-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_g95-hpijs.ppd.gz Binary files differindex 66dd73a27..91bad91b3 100644 --- a/ppd/hpijs/hp-officejet_g95-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_g95-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_h470-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_h470-hpijs.ppd.gz Binary files differindex e3cf6b3d1..65af57bc9 100644 --- a/ppd/hpijs/hp-officejet_h470-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_h470-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j3500_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j3500_series-hpijs.ppd.gz Binary files differindex c64d9c58e..b01d3156f 100644 --- a/ppd/hpijs/hp-officejet_j3500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j3500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j3600_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j3600_series-hpijs.ppd.gz Binary files differindex 00d448ff0..e175c4484 100644 --- a/ppd/hpijs/hp-officejet_j3600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j3600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j4500_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j4500_series-hpijs.ppd.gz Binary files differindex c94fda596..c2e986240 100644 --- a/ppd/hpijs/hp-officejet_j4500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j4500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j4660_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j4660_series-hpijs.ppd.gz Binary files differindex ea5971a03..60b46b9c3 100644 --- a/ppd/hpijs/hp-officejet_j4660_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j4660_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j4680_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j4680_series-hpijs.ppd.gz Binary files differindex 898b0a486..1be6cb328 100644 --- a/ppd/hpijs/hp-officejet_j4680_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j4680_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j5500_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j5500_series-hpijs.ppd.gz Binary files differindex 92843563b..5d6e8b68b 100644 --- a/ppd/hpijs/hp-officejet_j5500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j5500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j5700_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j5700_series-hpijs.ppd.gz Binary files differindex 29f02c2f5..00e6e8b7e 100644 --- a/ppd/hpijs/hp-officejet_j5700_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j5700_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j6400_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j6400_series-hpijs.ppd.gz Binary files differindex b43b5d882..e9da7282e 100644 --- a/ppd/hpijs/hp-officejet_j6400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j6400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_k60-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_k60-hpijs.ppd.gz Binary files differindex 492ecf6b9..dc2fb1b4b 100644 --- a/ppd/hpijs/hp-officejet_k60-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_k60-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_k60xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_k60xi-hpijs.ppd.gz Binary files differindex be5b183d7..40450f311 100644 --- a/ppd/hpijs/hp-officejet_k60xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_k60xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_k7100-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_k7100-hpijs.ppd.gz Binary files differindex fdbdffc84..f39935cc2 100644 --- a/ppd/hpijs/hp-officejet_k7100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_k7100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_k80-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_k80-hpijs.ppd.gz Binary files differindex 8c04cc573..ee8fdfabc 100644 --- a/ppd/hpijs/hp-officejet_k80-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_k80-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_k80xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_k80xi-hpijs.ppd.gz Binary files differindex b032ad405..33be48648 100644 --- a/ppd/hpijs/hp-officejet_k80xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_k80xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_lx-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_lx-hpijs.ppd.gz Binary files differindex 9eaee46d1..631ae61c4 100644 --- a/ppd/hpijs/hp-officejet_lx-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_lx-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_1150c-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_1150c-hpijs.ppd.gz Binary files differindex 6a0e656e8..3608b2d17 100644 --- a/ppd/hpijs/hp-officejet_pro_1150c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_1150c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_1170c_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_1170c_series-hpijs.ppd.gz Binary files differindex c3c5580af..f73b77f69 100644 --- a/ppd/hpijs/hp-officejet_pro_1170c_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_1170c_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_3610-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_3610-hpijs.ppd.gz Binary files differindex 9274d2d9b..6958398e6 100644 --- a/ppd/hpijs/hp-officejet_pro_3610-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_3610-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_3620-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_3620-hpijs.ppd.gz Binary files differindex 94dd0fe36..c7040fa0b 100644 --- a/ppd/hpijs/hp-officejet_pro_3620-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_3620-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_6230-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_6230-hpijs.ppd.gz Binary files differindex 360537bc4..9510218a7 100644 --- a/ppd/hpijs/hp-officejet_pro_6230-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_6230-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_6830-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_6830-hpijs.ppd.gz Binary files differindex 8b524a97a..d808966b2 100644 --- a/ppd/hpijs/hp-officejet_pro_6830-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_6830-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8000_a809-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8000_a809-hpijs.ppd.gz Binary files differindex 03144a0a1..acb0c5a3f 100644 --- a/ppd/hpijs/hp-officejet_pro_8000_a809-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8000_a809-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8100-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8100-hpijs.ppd.gz Binary files differindex 871aed7ff..1e70d643f 100644 --- a/ppd/hpijs/hp-officejet_pro_8100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8500_a909a-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8500_a909a-hpijs.ppd.gz Binary files differindex a2fe294f6..f441017f5 100644 --- a/ppd/hpijs/hp-officejet_pro_8500_a909a-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8500_a909a-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8500_a909g-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8500_a909g-hpijs.ppd.gz Binary files differindex e88d4903c..7ed8be270 100644 --- a/ppd/hpijs/hp-officejet_pro_8500_a909g-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8500_a909g-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8500_a909n-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8500_a909n-hpijs.ppd.gz Binary files differindex 9f702ca18..8d87d54da 100644 --- a/ppd/hpijs/hp-officejet_pro_8500_a909n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8500_a909n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8500_a910-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8500_a910-hpijs.ppd.gz Binary files differindex ffa51de60..59b8babfc 100644 --- a/ppd/hpijs/hp-officejet_pro_8500_a910-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8500_a910-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8600-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8600-hpijs.ppd.gz Binary files differindex e9b4dd0e9..586c47f42 100644 --- a/ppd/hpijs/hp-officejet_pro_8600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8610-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8610-hpijs.ppd.gz Binary files differindex 498d05eaa..a6c50e3c9 100644 --- a/ppd/hpijs/hp-officejet_pro_8610-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8610-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8620-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8620-hpijs.ppd.gz Binary files differindex ba6f5e4ac..89df22ce6 100644 --- a/ppd/hpijs/hp-officejet_pro_8620-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8620-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8630-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8630-hpijs.ppd.gz Binary files differindex 102e22170..19194b24e 100644 --- a/ppd/hpijs/hp-officejet_pro_8630-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8630-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8640-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8640-hpijs.ppd.gz Binary files differindex c353666ad..b8d5e81eb 100644 --- a/ppd/hpijs/hp-officejet_pro_8640-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8640-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8660-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8660-hpijs.ppd.gz Binary files differindex dd418736d..d46c75e9b 100644 --- a/ppd/hpijs/hp-officejet_pro_8660-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8660-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_k5300-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_k5300-hpijs.ppd.gz Binary files differindex ad813382a..192fd1734 100644 --- a/ppd/hpijs/hp-officejet_pro_k5300-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_k5300-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_k5400-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_k5400-hpijs.ppd.gz Binary files differindex 7db544516..2a713f524 100644 --- a/ppd/hpijs/hp-officejet_pro_k5400-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_k5400-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_k550-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_k550-hpijs.ppd.gz Binary files differindex e624ef691..a09be6938 100644 --- a/ppd/hpijs/hp-officejet_pro_k550-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_k550-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_k850-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_k850-hpijs.ppd.gz Binary files differindex e07f4d9b7..2433bbcc7 100644 --- a/ppd/hpijs/hp-officejet_pro_k850-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_k850-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_k8600-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_k8600-hpijs.ppd.gz Binary files differindex 9c6dfb87b..48906ede4 100644 --- a/ppd/hpijs/hp-officejet_pro_k8600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_k8600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_l7300-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_l7300-hpijs.ppd.gz Binary files differindex 5c87f33b9..4e43c1765 100644 --- a/ppd/hpijs/hp-officejet_pro_l7300-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_l7300-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_l7400-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_l7400-hpijs.ppd.gz Binary files differindex 5a2a84ac5..34b950c9d 100644 --- a/ppd/hpijs/hp-officejet_pro_l7400-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_l7400-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_l7500-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_l7500-hpijs.ppd.gz Binary files differindex a4ff32c85..eb39ec6ae 100644 --- a/ppd/hpijs/hp-officejet_pro_l7500-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_l7500-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_l7600-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_l7600-hpijs.ppd.gz Binary files differindex 7cea159b9..5d19b3da6 100644 --- a/ppd/hpijs/hp-officejet_pro_l7600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_l7600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_l7700-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_l7700-hpijs.ppd.gz Binary files differindex 0685bacf2..1fac91c57 100644 --- a/ppd/hpijs/hp-officejet_pro_l7700-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_l7700-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r40-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r40-hpijs.ppd.gz Binary files differindex e48955e2c..09bcf795c 100644 --- a/ppd/hpijs/hp-officejet_r40-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r40-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r40xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r40xi-hpijs.ppd.gz Binary files differindex 31156442c..23df2dbe4 100644 --- a/ppd/hpijs/hp-officejet_r40xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r40xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r45-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r45-hpijs.ppd.gz Binary files differindex 9f6f54488..b68ea0d13 100644 --- a/ppd/hpijs/hp-officejet_r45-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r45-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r60-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r60-hpijs.ppd.gz Binary files differindex 54ffed6c5..51bc53186 100644 --- a/ppd/hpijs/hp-officejet_r60-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r60-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r65-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r65-hpijs.ppd.gz Binary files differindex 8e7a87236..2ffb107ea 100644 --- a/ppd/hpijs/hp-officejet_r65-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r65-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r80-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r80-hpijs.ppd.gz Binary files differindex 0b29da344..ddb8d9ffb 100644 --- a/ppd/hpijs/hp-officejet_r80-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r80-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r80xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r80xi-hpijs.ppd.gz Binary files differindex 715a1ef3d..9fe0a3f70 100644 --- a/ppd/hpijs/hp-officejet_r80xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r80xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_300-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_300-hpijs.ppd.gz Binary files differindex 3c31afbdf..a0ae592e4 100644 --- a/ppd/hpijs/hp-officejet_series_300-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_300-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_310-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_310-hpijs.ppd.gz Binary files differindex 0a017a465..c72ec8593 100644 --- a/ppd/hpijs/hp-officejet_series_310-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_310-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_320-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_320-hpijs.ppd.gz Binary files differindex b0b806e1a..a6a2b3135 100644 --- a/ppd/hpijs/hp-officejet_series_320-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_320-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_330-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_330-hpijs.ppd.gz Binary files differindex e60dabe99..51ee3b0d6 100644 --- a/ppd/hpijs/hp-officejet_series_330-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_330-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_350-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_350-hpijs.ppd.gz Binary files differindex 17f21bc6a..88c24e991 100644 --- a/ppd/hpijs/hp-officejet_series_350-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_350-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_520-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_520-hpijs.ppd.gz Binary files differindex 645ea9b6b..9890152c1 100644 --- a/ppd/hpijs/hp-officejet_series_520-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_520-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_570-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_570-hpijs.ppd.gz Binary files differindex 2cc51e98f..758e3c2d9 100644 --- a/ppd/hpijs/hp-officejet_series_570-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_570-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_580-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_580-hpijs.ppd.gz Binary files differindex 220f55bf3..efd9a9057 100644 --- a/ppd/hpijs/hp-officejet_series_580-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_580-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_590-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_590-hpijs.ppd.gz Binary files differindex ef8d2b4e9..460aea016 100644 --- a/ppd/hpijs/hp-officejet_series_590-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_590-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_600-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_600-hpijs.ppd.gz Binary files differindex 2ab9517d9..d95c2133b 100644 --- a/ppd/hpijs/hp-officejet_series_600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_610-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_610-hpijs.ppd.gz Binary files differindex b9f856055..626973fcd 100644 --- a/ppd/hpijs/hp-officejet_series_610-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_610-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_630-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_630-hpijs.ppd.gz Binary files differindex abb383d92..d6b637bea 100644 --- a/ppd/hpijs/hp-officejet_series_630-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_630-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_700-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_700-hpijs.ppd.gz Binary files differindex 786399421..7932b9dd6 100644 --- a/ppd/hpijs/hp-officejet_series_700-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_700-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_710-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_710-hpijs.ppd.gz Binary files differindex 8d87beaff..481f51b5d 100644 --- a/ppd/hpijs/hp-officejet_series_710-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_710-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_720-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_720-hpijs.ppd.gz Binary files differindex e3d1de98a..8bf61eb72 100644 --- a/ppd/hpijs/hp-officejet_series_720-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_720-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_725-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_725-hpijs.ppd.gz Binary files differindex 907aeb713..584381882 100644 --- a/ppd/hpijs/hp-officejet_series_725-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_725-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_t_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_t_series-hpijs.ppd.gz Binary files differindex 3418e2760..644dc84a4 100644 --- a/ppd/hpijs/hp-officejet_t_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_t_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_v30-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_v30-hpijs.ppd.gz Binary files differindex 000cae615..69b6abc3a 100644 --- a/ppd/hpijs/hp-officejet_v30-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_v30-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_v40-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_v40-hpijs.ppd.gz Binary files differindex 52ee26e31..63ec81e75 100644 --- a/ppd/hpijs/hp-officejet_v40-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_v40-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_v40xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_v40xi-hpijs.ppd.gz Binary files differindex 761da24a6..d13599f83 100644 --- a/ppd/hpijs/hp-officejet_v40xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_v40xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_v45-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_v45-hpijs.ppd.gz Binary files differindex d19d0dab2..deb08d54f 100644 --- a/ppd/hpijs/hp-officejet_v45-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_v45-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_100-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_100-hpijs.ppd.gz Binary files differindex f6a912a4d..a496b265c 100644 --- a/ppd/hpijs/hp-photosmart_100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_1115-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_1115-hpijs.ppd.gz Binary files differindex 48d00dec1..7559898c0 100644 --- a/ppd/hpijs/hp-photosmart_1115-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_1115-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_1215-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_1215-hpijs.ppd.gz Binary files differindex c7b6bc65d..f41148ece 100644 --- a/ppd/hpijs/hp-photosmart_1215-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_1215-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_1218-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_1218-hpijs.ppd.gz Binary files differindex 522182113..bb7211bde 100644 --- a/ppd/hpijs/hp-photosmart_1218-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_1218-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_130-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_130-hpijs.ppd.gz Binary files differindex cbc60e163..95f6b7e79 100644 --- a/ppd/hpijs/hp-photosmart_130-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_130-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_1315-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_1315-hpijs.ppd.gz Binary files differindex e6db52ced..97f006546 100644 --- a/ppd/hpijs/hp-photosmart_1315-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_1315-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_140_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_140_series-hpijs.ppd.gz Binary files differindex 447663efc..d106f889d 100644 --- a/ppd/hpijs/hp-photosmart_140_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_140_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_230-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_230-hpijs.ppd.gz Binary files differindex 5435e077c..9b2f729c7 100644 --- a/ppd/hpijs/hp-photosmart_230-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_230-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_240_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_240_series-hpijs.ppd.gz Binary files differindex f81d05fa5..dea7f9d1a 100644 --- a/ppd/hpijs/hp-photosmart_240_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_240_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_2570_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_2570_series-hpijs.ppd.gz Binary files differindex cf8b72609..103859d53 100644 --- a/ppd/hpijs/hp-photosmart_2570_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_2570_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_2600_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_2600_series-hpijs.ppd.gz Binary files differindex c1d713d98..d4370a0fd 100644 --- a/ppd/hpijs/hp-photosmart_2600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_2600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_2700_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_2700_series-hpijs.ppd.gz Binary files differindex c7461ffc9..eb2802597 100644 --- a/ppd/hpijs/hp-photosmart_2700_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_2700_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_3100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_3100_series-hpijs.ppd.gz Binary files differindex 3c977d0ae..588fbc24f 100644 --- a/ppd/hpijs/hp-photosmart_3100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_3100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_3200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_3200_series-hpijs.ppd.gz Binary files differindex b01c74e5f..e3284e84b 100644 --- a/ppd/hpijs/hp-photosmart_3200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_3200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_320_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_320_series-hpijs.ppd.gz Binary files differindex e1c852410..6b78fba76 100644 --- a/ppd/hpijs/hp-photosmart_320_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_320_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_3300_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_3300_series-hpijs.ppd.gz Binary files differindex 60c7dbcf2..742d8d6b9 100644 --- a/ppd/hpijs/hp-photosmart_3300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_3300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_330_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_330_series-hpijs.ppd.gz Binary files differindex 627d36c6b..b1bae219a 100644 --- a/ppd/hpijs/hp-photosmart_330_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_330_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_370_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_370_series-hpijs.ppd.gz Binary files differindex 15ba71335..d2ea4fdc9 100644 --- a/ppd/hpijs/hp-photosmart_370_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_370_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_380_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_380_series-hpijs.ppd.gz Binary files differindex 6eee74044..17f9ac746 100644 --- a/ppd/hpijs/hp-photosmart_380_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_380_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_420_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_420_series-hpijs.ppd.gz Binary files differindex 9bde8af11..fbce5dcfb 100644 --- a/ppd/hpijs/hp-photosmart_420_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_420_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_470_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_470_series-hpijs.ppd.gz Binary files differindex fb13fcae6..b1d263171 100644 --- a/ppd/hpijs/hp-photosmart_470_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_470_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_5510_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_5510_series-hpijs.ppd.gz Binary files differindex 363fef7ba..02d48ff1d 100644 --- a/ppd/hpijs/hp-photosmart_5510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_5510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_5510d_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_5510d_series-hpijs.ppd.gz Binary files differindex c0b260d3b..68d135574 100644 --- a/ppd/hpijs/hp-photosmart_5510d_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_5510d_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_5520_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_5520_series-hpijs.ppd.gz Binary files differindex 3b903f482..ebe02fa33 100644 --- a/ppd/hpijs/hp-photosmart_5520_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_5520_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_6510_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_6510_series-hpijs.ppd.gz Binary files differindex 93bd17410..ba918f044 100644 --- a/ppd/hpijs/hp-photosmart_6510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_6510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_6520_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_6520_series-hpijs.ppd.gz Binary files differindex 47e940a5b..9099d44fb 100644 --- a/ppd/hpijs/hp-photosmart_6520_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_6520_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7150-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7150-hpijs.ppd.gz Binary files differindex fb554c030..829b8459c 100644 --- a/ppd/hpijs/hp-photosmart_7150-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7150-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7200_series-hpijs.ppd.gz Binary files differindex c86ea30cf..e9f8bf942 100644 --- a/ppd/hpijs/hp-photosmart_7200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7345-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7345-hpijs.ppd.gz Binary files differindex 180fef705..6a2be57a3 100644 --- a/ppd/hpijs/hp-photosmart_7345-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7345-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7350-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7350-hpijs.ppd.gz Binary files differindex 387348215..974e00226 100644 --- a/ppd/hpijs/hp-photosmart_7350-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7350-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7400_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7400_series-hpijs.ppd.gz Binary files differindex 56fac58ae..51fdb8a04 100644 --- a/ppd/hpijs/hp-photosmart_7400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7510_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7510_series-hpijs.ppd.gz Binary files differindex 81a2dd3b3..d1bbf59eb 100644 --- a/ppd/hpijs/hp-photosmart_7510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7520_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7520_series-hpijs.ppd.gz Binary files differindex 428c910bf..fc9d60f3d 100644 --- a/ppd/hpijs/hp-photosmart_7520_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7520_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7550-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7550-hpijs.ppd.gz Binary files differindex f8281f657..1fe9bf360 100644 --- a/ppd/hpijs/hp-photosmart_7550-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7550-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7600_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7600_series-hpijs.ppd.gz Binary files differindex 186475f71..0fe4013f5 100644 --- a/ppd/hpijs/hp-photosmart_7600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7700_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7700_series-hpijs.ppd.gz Binary files differindex 049043d11..d63db2ff3 100644 --- a/ppd/hpijs/hp-photosmart_7700_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7700_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7800_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7800_series-hpijs.ppd.gz Binary files differindex 2154c6187..e4308da51 100644 --- a/ppd/hpijs/hp-photosmart_7800_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7800_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7900_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7900_series-hpijs.ppd.gz Binary files differindex c6c55b646..37a997671 100644 --- a/ppd/hpijs/hp-photosmart_7900_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7900_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_8000_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_8000_series-hpijs.ppd.gz Binary files differindex 5ca90ea18..65b21406a 100644 --- a/ppd/hpijs/hp-photosmart_8000_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_8000_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_8100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_8100_series-hpijs.ppd.gz Binary files differindex b677f2066..f0b2a89db 100644 --- a/ppd/hpijs/hp-photosmart_8100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_8100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_8200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_8200_series-hpijs.ppd.gz Binary files differindex 2076c3da7..2a1ca7d41 100644 --- a/ppd/hpijs/hp-photosmart_8200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_8200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_8400_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_8400_series-hpijs.ppd.gz Binary files differindex b9906c77c..23b0b47cc 100644 --- a/ppd/hpijs/hp-photosmart_8400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_8400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_8700_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_8700_series-hpijs.ppd.gz Binary files differindex a397a9fc9..c3e20d46f 100644 --- a/ppd/hpijs/hp-photosmart_8700_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_8700_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a310_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a310_series-hpijs.ppd.gz Binary files differindex 7ae384852..4b37d2498 100644 --- a/ppd/hpijs/hp-photosmart_a310_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a310_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a320_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a320_series-hpijs.ppd.gz Binary files differindex 1f9f49a0c..bbc5f9ac7 100644 --- a/ppd/hpijs/hp-photosmart_a320_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a320_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a430_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a430_series-hpijs.ppd.gz Binary files differindex 146be10be..1d0ee6df2 100644 --- a/ppd/hpijs/hp-photosmart_a430_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a430_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a440_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a440_series-hpijs.ppd.gz Binary files differindex 582694ccc..429341494 100644 --- a/ppd/hpijs/hp-photosmart_a440_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a440_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a510_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a510_series-hpijs.ppd.gz Binary files differindex f4ce91383..6fce45c89 100644 --- a/ppd/hpijs/hp-photosmart_a510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a520_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a520_series-hpijs.ppd.gz Binary files differindex 759afabe7..6e6e3fa8b 100644 --- a/ppd/hpijs/hp-photosmart_a520_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a520_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a530_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a530_series-hpijs.ppd.gz Binary files differindex 027578da0..d4a8ea783 100644 --- a/ppd/hpijs/hp-photosmart_a530_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a530_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a610_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a610_series-hpijs.ppd.gz Binary files differindex b0dd7a6df..131eed036 100644 --- a/ppd/hpijs/hp-photosmart_a610_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a610_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a620_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a620_series-hpijs.ppd.gz Binary files differindex e358879b3..9aae6f20b 100644 --- a/ppd/hpijs/hp-photosmart_a620_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a620_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a630_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a630_series-hpijs.ppd.gz Binary files differindex bef4c6bd2..d3b606537 100644 --- a/ppd/hpijs/hp-photosmart_a630_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a630_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a640_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a640_series-hpijs.ppd.gz Binary files differindex 6216cabc3..56b1419a3 100644 --- a/ppd/hpijs/hp-photosmart_a640_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a640_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a710_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a710_series-hpijs.ppd.gz Binary files differindex 68695cbee..c5337d225 100644 --- a/ppd/hpijs/hp-photosmart_a710_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a710_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a820_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a820_series-hpijs.ppd.gz Binary files differindex 3d5a02ce8..6421dfdf0 100644 --- a/ppd/hpijs/hp-photosmart_a820_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a820_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_b010_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_b010_series-hpijs.ppd.gz Binary files differindex 04c26235a..03b1596a1 100644 --- a/ppd/hpijs/hp-photosmart_b010_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_b010_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_b109a-m-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_b109a-m-hpijs.ppd.gz Binary files differindex 5668cf38c..9dc85d938 100644 --- a/ppd/hpijs/hp-photosmart_b109a-m-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_b109a-m-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_b109a_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_b109a_series-hpijs.ppd.gz Binary files differindex 21d1bd4d0..77f074a87 100644 --- a/ppd/hpijs/hp-photosmart_b109a_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_b109a_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_b110_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_b110_series-hpijs.ppd.gz Binary files differindex 284d2cf42..7a6724252 100644 --- a/ppd/hpijs/hp-photosmart_b110_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_b110_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_b8500_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_b8500_series-hpijs.ppd.gz Binary files differindex a33f8e656..11c958059 100644 --- a/ppd/hpijs/hp-photosmart_b8500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_b8500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c309a_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c309a_series-hpijs.ppd.gz Binary files differindex b4baa0162..03239c49b 100644 --- a/ppd/hpijs/hp-photosmart_c309a_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c309a_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c3100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c3100_series-hpijs.ppd.gz Binary files differindex a852192ed..dc1165d30 100644 --- a/ppd/hpijs/hp-photosmart_c3100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c3100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4100_series-hpijs.ppd.gz Binary files differindex 7509fda73..2a87c7686 100644 --- a/ppd/hpijs/hp-photosmart_c4100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4200_series-hpijs.ppd.gz Binary files differindex 45a2d091a..21e9a4cd9 100644 --- a/ppd/hpijs/hp-photosmart_c4200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4340_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4340_series-hpijs.ppd.gz Binary files differindex abc94f086..59e63dda0 100644 --- a/ppd/hpijs/hp-photosmart_c4340_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4340_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4380_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4380_series-hpijs.ppd.gz Binary files differindex e765d521d..4ca6ee81b 100644 --- a/ppd/hpijs/hp-photosmart_c4380_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4380_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz Binary files differindex 0cd9a38b7..69ff345f1 100644 --- a/ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4500_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4500_series-hpijs.ppd.gz Binary files differindex 7b1dd6d98..78079910e 100644 --- a/ppd/hpijs/hp-photosmart_c4500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4600_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4600_series-hpijs.ppd.gz Binary files differindex bd2db8d56..60816bc64 100644 --- a/ppd/hpijs/hp-photosmart_c4600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4700_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4700_series-hpijs.ppd.gz Binary files differindex 3614027a6..eda44a317 100644 --- a/ppd/hpijs/hp-photosmart_c4700_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4700_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c5100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c5100_series-hpijs.ppd.gz Binary files differindex 3040c0c3f..8f6cc8412 100644 --- a/ppd/hpijs/hp-photosmart_c5100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c5100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c5200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c5200_series-hpijs.ppd.gz Binary files differindex d5886fe83..51b62d262 100644 --- a/ppd/hpijs/hp-photosmart_c5200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c5200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c5300_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c5300_series-hpijs.ppd.gz Binary files differindex e9d2f8e91..8c8ca5754 100644 --- a/ppd/hpijs/hp-photosmart_c5300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c5300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c5500_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c5500_series-hpijs.ppd.gz Binary files differindex 1dd48a131..ee141d1b5 100644 --- a/ppd/hpijs/hp-photosmart_c5500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c5500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c6100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c6100_series-hpijs.ppd.gz Binary files differindex b3e844e4a..c1676e147 100644 --- a/ppd/hpijs/hp-photosmart_c6100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c6100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c6200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c6200_series-hpijs.ppd.gz Binary files differindex f408abd1b..1f611b515 100644 --- a/ppd/hpijs/hp-photosmart_c6200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c6200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c6300_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c6300_series-hpijs.ppd.gz Binary files differindex 1d4ae7201..098e59e8d 100644 --- a/ppd/hpijs/hp-photosmart_c6300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c6300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c7100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c7100_series-hpijs.ppd.gz Binary files differindex c267eba44..646d7fd62 100644 --- a/ppd/hpijs/hp-photosmart_c7100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c7100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c7200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c7200_series-hpijs.ppd.gz Binary files differindex 766281b6d..9ccaa291b 100644 --- a/ppd/hpijs/hp-photosmart_c7200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c7200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c8100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c8100_series-hpijs.ppd.gz Binary files differindex cdbc24d8a..b91cc3c25 100644 --- a/ppd/hpijs/hp-photosmart_c8100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c8100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d110_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d110_series-hpijs.ppd.gz Binary files differindex 142a6a77e..05a3c5e37 100644 --- a/ppd/hpijs/hp-photosmart_d110_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d110_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d5060_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d5060_series-hpijs.ppd.gz Binary files differindex 25b1b57ca..ef896ad46 100644 --- a/ppd/hpijs/hp-photosmart_d5060_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d5060_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d5100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d5100_series-hpijs.ppd.gz Binary files differindex 79e02bbb2..b94d434e8 100644 --- a/ppd/hpijs/hp-photosmart_d5100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d5100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d5300_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d5300_series-hpijs.ppd.gz Binary files differindex a8890e6df..d1fe62179 100644 --- a/ppd/hpijs/hp-photosmart_d5300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d5300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d5400_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d5400_series-hpijs.ppd.gz Binary files differindex b45dcdfa7..488fe7c11 100644 --- a/ppd/hpijs/hp-photosmart_d5400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d5400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d6100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d6100_series-hpijs.ppd.gz Binary files differindex d4e9f84da..7b2960980 100644 --- a/ppd/hpijs/hp-photosmart_d6100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d6100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d7100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d7100_series-hpijs.ppd.gz Binary files differindex 9af19a9df..a48a47b58 100644 --- a/ppd/hpijs/hp-photosmart_d7100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d7100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d7200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d7200_series-hpijs.ppd.gz Binary files differindex af21bcec3..7dcad878e 100644 --- a/ppd/hpijs/hp-photosmart_d7200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d7200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d7300_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d7300_series-hpijs.ppd.gz Binary files differindex 659868fe6..b030043d2 100644 --- a/ppd/hpijs/hp-photosmart_d7300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d7300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d7400_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d7400_series-hpijs.ppd.gz Binary files differindex 982540652..9917ffe93 100644 --- a/ppd/hpijs/hp-photosmart_d7400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d7400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d7500_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d7500_series-hpijs.ppd.gz Binary files differindex ecc94b187..2ac39b5d8 100644 --- a/ppd/hpijs/hp-photosmart_d7500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d7500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_estn_c510_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_estn_c510_series-hpijs.ppd.gz Binary files differindex 7251968e6..4a3a72f86 100644 --- a/ppd/hpijs/hp-photosmart_estn_c510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_estn_c510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_ink_adv_k510-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_ink_adv_k510-hpijs.ppd.gz Binary files differindex dc90781ec..5deb99f12 100644 --- a/ppd/hpijs/hp-photosmart_ink_adv_k510-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_ink_adv_k510-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_p1000-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_p1000-hpijs.ppd.gz Binary files differindex 6f99dfcfb..d6842f817 100644 --- a/ppd/hpijs/hp-photosmart_p1000-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_p1000-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_p1100-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_p1100-hpijs.ppd.gz Binary files differindex 971b5deac..709b37e44 100644 --- a/ppd/hpijs/hp-photosmart_p1100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_p1100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_plus_b209a-m-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_plus_b209a-m-hpijs.ppd.gz Binary files differindex 7622a3b3b..5af3cc1b1 100644 --- a/ppd/hpijs/hp-photosmart_plus_b209a-m-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_plus_b209a-m-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_plus_b210_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_plus_b210_series-hpijs.ppd.gz Binary files differindex 73a39a205..702bb894c 100644 --- a/ppd/hpijs/hp-photosmart_plus_b210_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_plus_b210_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz Binary files differindex 51743987e..2bd831944 100644 --- a/ppd/hpijs/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_prem_c310_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_prem_c310_series-hpijs.ppd.gz Binary files differindex 580695ccf..f259d171e 100644 --- a/ppd/hpijs/hp-photosmart_prem_c310_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_prem_c310_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_prem_c410_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_prem_c410_series-hpijs.ppd.gz Binary files differindex 3e6977e56..249805c4d 100644 --- a/ppd/hpijs/hp-photosmart_prem_c410_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_prem_c410_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_premium_c309g-m-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_premium_c309g-m-hpijs.ppd.gz Binary files differindex d5f6188d0..f2133e536 100644 --- a/ppd/hpijs/hp-photosmart_premium_c309g-m-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_premium_c309g-m-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_pro_b8300_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_pro_b8300_series-hpijs.ppd.gz Binary files differindex 0c2221ee2..8fab3ecc5 100644 --- a/ppd/hpijs/hp-photosmart_pro_b8300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_pro_b8300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_pro_b8800_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_pro_b8800_series-hpijs.ppd.gz Binary files differindex 027a13d8d..7d0c5d63d 100644 --- a/ppd/hpijs/hp-photosmart_pro_b8800_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_pro_b8800_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz Binary files differindex 200e4b6fc..a02f22121 100644 --- a/ppd/hpijs/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-printer_scanner_copier_300-hpijs.ppd.gz b/ppd/hpijs/hp-printer_scanner_copier_300-hpijs.ppd.gz Binary files differindex 3b5e8b3b1..88763a97d 100644 --- a/ppd/hpijs/hp-printer_scanner_copier_300-hpijs.ppd.gz +++ b/ppd/hpijs/hp-printer_scanner_copier_300-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1000_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1000_series-hpijs.ppd.gz Binary files differindex 0b7fb63fa..1f6c14025 100644 --- a/ppd/hpijs/hp-psc_1000_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1000_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1100_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1100_series-hpijs.ppd.gz Binary files differindex d475ce482..85df0c7f2 100644 --- a/ppd/hpijs/hp-psc_1100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1200_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1200_series-hpijs.ppd.gz Binary files differindex a5b7660b7..2a1200b3a 100644 --- a/ppd/hpijs/hp-psc_1200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1300_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1300_series-hpijs.ppd.gz Binary files differindex 0d21842e2..db2581078 100644 --- a/ppd/hpijs/hp-psc_1300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1310_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1310_series-hpijs.ppd.gz Binary files differindex dc92c4fc0..7b4911da8 100644 --- a/ppd/hpijs/hp-psc_1310_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1310_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1358_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1358_series-hpijs.ppd.gz Binary files differindex 176895889..07931abb7 100644 --- a/ppd/hpijs/hp-psc_1358_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1358_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1400_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1400_series-hpijs.ppd.gz Binary files differindex e726f51d5..7fcfa3d1e 100644 --- a/ppd/hpijs/hp-psc_1400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1500_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1500_series-hpijs.ppd.gz Binary files differindex 311b2884d..5e4d9f220 100644 --- a/ppd/hpijs/hp-psc_1500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1510_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1510_series-hpijs.ppd.gz Binary files differindex 9ca32a4c2..5e637ad6c 100644 --- a/ppd/hpijs/hp-psc_1510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1600_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1600_series-hpijs.ppd.gz Binary files differindex f8035e6a7..dccda2174 100644 --- a/ppd/hpijs/hp-psc_1600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2100_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2100_series-hpijs.ppd.gz Binary files differindex 89be8473c..b36073d59 100644 --- a/ppd/hpijs/hp-psc_2100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2150_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2150_series-hpijs.ppd.gz Binary files differindex 249a343a4..51a0f477d 100644 --- a/ppd/hpijs/hp-psc_2150_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2150_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2170_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2170_series-hpijs.ppd.gz Binary files differindex ee52a7858..ab0031d4b 100644 --- a/ppd/hpijs/hp-psc_2170_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2170_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2200_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2200_series-hpijs.ppd.gz Binary files differindex 8b853e06e..c27174ace 100644 --- a/ppd/hpijs/hp-psc_2200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2210_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2210_series-hpijs.ppd.gz Binary files differindex 094ffc2e0..e64adfaa5 100644 --- a/ppd/hpijs/hp-psc_2210_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2210_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2300_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2300_series-hpijs.ppd.gz Binary files differindex 44f33820b..7697984a0 100644 --- a/ppd/hpijs/hp-psc_2300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2350_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2350_series-hpijs.ppd.gz Binary files differindex f1d112ed5..7cd587704 100644 --- a/ppd/hpijs/hp-psc_2350_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2350_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2400_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2400_series-hpijs.ppd.gz Binary files differindex 67caaddd4..543151dec 100644 --- a/ppd/hpijs/hp-psc_2400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2500_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2500_series-hpijs.ppd.gz Binary files differindex 732a2ff59..b0c4d9273 100644 --- a/ppd/hpijs/hp-psc_2500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_500-hpijs.ppd.gz b/ppd/hpijs/hp-psc_500-hpijs.ppd.gz Binary files differindex aaecf4efb..a9a173f47 100644 --- a/ppd/hpijs/hp-psc_500-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_500-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_720-hpijs.ppd.gz b/ppd/hpijs/hp-psc_720-hpijs.ppd.gz Binary files differindex 3235f385a..1a75519ec 100644 --- a/ppd/hpijs/hp-psc_720-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_720-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_750-hpijs.ppd.gz b/ppd/hpijs/hp-psc_750-hpijs.ppd.gz Binary files differindex 2c88eb054..37ddacf10 100644 --- a/ppd/hpijs/hp-psc_750-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_750-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_750xi-hpijs.ppd.gz b/ppd/hpijs/hp-psc_750xi-hpijs.ppd.gz Binary files differindex e477039df..6c3b69112 100644 --- a/ppd/hpijs/hp-psc_750xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_750xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_760-hpijs.ppd.gz b/ppd/hpijs/hp-psc_760-hpijs.ppd.gz Binary files differindex 8ba7f1591..6c8ff5f05 100644 --- a/ppd/hpijs/hp-psc_760-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_760-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_780-hpijs.ppd.gz b/ppd/hpijs/hp-psc_780-hpijs.ppd.gz Binary files differindex 805787836..f051a5ef2 100644 --- a/ppd/hpijs/hp-psc_780-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_780-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_780xi-hpijs.ppd.gz b/ppd/hpijs/hp-psc_780xi-hpijs.ppd.gz Binary files differindex 3dc3a0c55..a740861f0 100644 --- a/ppd/hpijs/hp-psc_780xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_780xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_900_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_900_series-hpijs.ppd.gz Binary files differindex a003f19df..ca3e01e06 100644 --- a/ppd/hpijs/hp-psc_900_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_900_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_920-hpijs.ppd.gz b/ppd/hpijs/hp-psc_920-hpijs.ppd.gz Binary files differindex 14c559e9c..51b656b77 100644 --- a/ppd/hpijs/hp-psc_920-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_920-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_950-hpijs.ppd.gz b/ppd/hpijs/hp-psc_950-hpijs.ppd.gz Binary files differindex a296a9408..2728ea15e 100644 --- a/ppd/hpijs/hp-psc_950-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_950-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_950vr-hpijs.ppd.gz b/ppd/hpijs/hp-psc_950vr-hpijs.ppd.gz Binary files differindex bb44b8f00..d52757bb3 100644 --- a/ppd/hpijs/hp-psc_950vr-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_950vr-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz b/ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz Binary files differindex 66db6c9ee..5e16a12c4 100644 --- a/ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-scanjet_pro_3500_f1-hpijs.ppd.gz b/ppd/hpijs/hp-scanjet_pro_3500_f1-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..ce094d166 --- /dev/null +++ b/ppd/hpijs/hp-scanjet_pro_3500_f1-hpijs.ppd.gz @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/printsettings.py b/printsettings.py index ac6a1a1ac..781f74416 100755 --- a/printsettings.py +++ b/printsettings.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/prnt/__init__.py b/prnt/__init__.py index 41cd78c5c..ba246ed0f 100644 --- a/prnt/__init__.py +++ b/prnt/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/prnt/backend/hp.c b/prnt/backend/hp.c index b822a0206..07713b208 100644 --- a/prnt/backend/hp.c +++ b/prnt/backend/hp.c @@ -2,7 +2,7 @@ hp.c - hp cups backend - (c) 2004-2008 Copyright Hewlett-Packard Development Company, LP + (c) 2004-2008 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 @@ -495,7 +495,7 @@ static int device_discovery() int cnt=0, bytes_read, r=1; enum HPMUD_RESULT stat; - stat = hpmud_probe_devices(HPMUD_BUS_ALL, buf, sizeof(buf), &cnt, &bytes_read); + stat = hpmud_probe_printers(HPMUD_BUS_ALL, buf, sizeof(buf), &cnt, &bytes_read); if (stat != HPMUD_R_OK) goto bugout; @@ -717,7 +717,7 @@ int main(int argc, char *argv[]) if ((arg[0] == '-') && (arg[1] == 'h')) { fprintf(stdout, "HP Linux Imaging and Printing System\nCUPS Backend %s\n", VERSION); - fprintf(stdout, "(c) 2003-2008 Copyright Hewlett-Packard Development Company, LP\n"); + fprintf(stdout, "(c) 2003-2008 Copyright HP Development Company, LP\n"); exit(0); } } diff --git a/prnt/colorcal.py b/prnt/colorcal.py index a162ca5d9..f997ce950 100644 --- a/prnt/colorcal.py +++ b/prnt/colorcal.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/prnt/cups.py b/prnt/cups.py index f3c4dca79..8134a7424 100644 --- a/prnt/cups.py +++ b/prnt/cups.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/prnt/cupsext/cupsext.c b/prnt/cupsext/cupsext.c index c0855c86b..88e27c07d 100644 --- a/prnt/cupsext/cupsext.c +++ b/prnt/cupsext/cupsext.c @@ -1,7 +1,7 @@ /* cupsext - Python extension class for CUPS 1.1+ -(c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +(c) Copyright 2003-2015 HP Development Company, L.P. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -47,7 +47,7 @@ notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. Neither the name of Hewlett-Packard nor the names of its +3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/drv/hpcups.drv.in b/prnt/drv/hpcups.drv.in index e613a99af..aa7f09bce 100644 --- a/prnt/drv/hpcups.drv.in +++ b/prnt/drv/hpcups.drv.in @@ -267,7 +267,7 @@ #define Version "$_VERSION" // Copyright for all drivers... -Copyright "(c) 2008 Copyright Hewlett-Packard Development Company, LP" +Copyright "(c) 2008 Copyright HP Development Company, LP" // Driver version Version $Version @@ -5827,6 +5827,15 @@ Manufacturer "HP" Attribute "Product" "" "(HP Envy 5644 E-all-in-one)" } { + ModelName "HP Deskjet 5640 Series" + Attribute "NickName" "" "HP Deskjet 5640 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 5640 Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 5640 series;DES:deskjet 5640 series;" + PCFileName "hp-deskjet_5640_series.ppd" + Attribute "Product" "" "(HP Deskjet Ink Advantage 5640 All-in-one Printer Series)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 5645 All-in-one Printer)" + } + { ModelName "HP Envy 5660 Series" Attribute "NickName" "" "HP Envy 5660 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Envy 5660 Series" @@ -6177,8 +6186,20 @@ Manufacturer "HP" PCFileName "hp-envy_5540_series.ppd" Attribute "Product" "" "(HP Envy 5540 All-in-one Printer Series)" Attribute "Product" "" "(HP Envy 5540 All-in-one Printer)" + Attribute "Product" "" "(HP Envy 5542 All-in-one Printer)" + Attribute "Product" "" "(HP Envy 5543 All-in-one Printer)" + Attribute "Product" "" "(HP Envy 5544 All-in-one Printer)" Attribute "Product" "" "(HP Envy 5545 All-in-one Printer)" } + { + ModelName "HP Deskjet 5570 Series" + Attribute "NickName" "" "HP Deskjet 5570 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 5570 Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 5570 series;DES:deskjet 5570 series;" + PCFileName "hp-deskjet_5570_series.ppd" + Attribute "Product" "" "(HP Deskjet Ink Advantage 5570 All-in-one)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 5575 All-in-one)" + } } // End CopperheadIPH15 @@ -10657,6 +10678,18 @@ Manufacturer "HP" Attribute "Product" "" "(HP Envy 4520 All-in-one Printer Series)" Attribute "Product" "" "(HP Envy 4520 All-in-one Printer)" Attribute "Product" "" "(HP Envy 4522 All-in-one Printer)" + Attribute "Product" "" "(HP Envy 4523 All-in-one Printer)" + Attribute "Product" "" "(HP Envy 4524 All-in-one Printer)" + } + { + ModelName "HP Deskjet 4530 Series" + Attribute "NickName" "" "HP Deskjet 4530 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 4530 Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 4530 series;DES:deskjet 4530 series;" + PCFileName "hp-deskjet_4530_series.ppd" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4530 All-in-one)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4535 All-in-one)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4536 All-in-one)" } { ModelName "HP Officejet 4650 Series" @@ -10667,8 +10700,19 @@ Manufacturer "HP" Attribute "Product" "" "(HP Officejet 4650 All-in-one Printer Series)" Attribute "Product" "" "(HP Officejet 4650 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4652 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 4654 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4655 All-in-one Printer)" } + { + ModelName "HP Deskjet 4670 Series" + Attribute "NickName" "" "HP Deskjet 4670 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 4670 Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 4670 series;DES:deskjet 4670 series;" + PCFileName "hp-deskjet_4670_series.ppd" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4670 All-in-one)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4675 All-in-one)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4676 All-in-one)" + } }// End Mimas15 @@ -10987,6 +11031,8 @@ Manufacturer "HP" Attribute "Product" "" "(HP Envy 5532 E-all-in-one Printer)" Attribute "Product" "" "(HP Envy 5534 E-all-in-one Printer)" Attribute "Product" "" "(HP Envy 5535 E-all-in-one Printer)" + Attribute "Product" "" "(HP Envy 5536 E-all-in-one Printer)" + Attribute "Product" "" "(HP Envy 5539 E-all-in-one Printer)" } } // End MimasTDR @@ -11246,6 +11292,7 @@ Manufacturer "HP" Attribute "Product" "" "(HP Deskjet 2130 All-in-one Printer Series)" Attribute "Product" "" "(HP Deskjet 2131 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet 2132 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet 2134 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 2130 All-in One Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 2135 All-in One Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 2136 All-in One Printer)" @@ -12002,6 +12049,8 @@ Manufacturer "HP" PCFileName "hp-deskjet_3630_series.ppd" Attribute "Product" "" "(HP Deskjet 3630 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet 3632 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet 3633 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet 3634 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 3630 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 3635 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 3636 All-in-one Printer)" @@ -12027,6 +12076,15 @@ Manufacturer "HP" Attribute "Product" "" "(HP Deskjet Ink Advantage 3835 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 3836 All-in-one Printer)" } + { + ModelName "HP Deskjet 4720 Series" + Attribute "NickName" "" "HP Deskjet 4720 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 4720 Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 4720 series;DES:deskjet 4720 series;" + PCFileName "hp-deskjet_4720_series.ppd" + Attribute "Product" "" "(HP Deskjet Ink Advantage Ultra 4720 All-in-one Printer Series)" + Attribute "Product" "" "(HP Deskjet Ink Advantage Ultra 4729 All-in-one Printer)" + } }// End Pyramid15 @@ -12897,6 +12955,14 @@ Manufacturer "HP" Attribute "Product" "" "(HP Deskjet 3325 Printer/scanjet 3530c)" } { + ModelName "HP Scanjet Pro 3500 f1" + Attribute "NickName" "" "HP Scanjet Pro 3500 f1, hpcups $Version" + Attribute "ShortNickName" "" "HP Scanjet Pro 3500 f1" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp scanjet pro 3500 f1;DES:hp scanjet pro 3500 f1;" + PCFileName "hp-scanjet_pro_3500_f1.ppd" + Attribute "Product" "" "(HP Scanjet Pro 3500 f1 Flatbed Scanner)" + } + { ModelName "HP Deskjet 3500" Attribute "NickName" "" "HP Deskjet 3500, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 3500" diff --git a/prnt/drv/hpijs.drv.in b/prnt/drv/hpijs.drv.in index 5200629c8..58d6d2a43 100644 --- a/prnt/drv/hpijs.drv.in +++ b/prnt/drv/hpijs.drv.in @@ -63,7 +63,7 @@ #define VERSION "@VERSION@" // Copyright for all drivers... -Copyright "(c) 2004-2008 Copyright Hewlett-Packard Development Company, LP" +Copyright "(c) 2004-2008 Copyright HP Development Company, LP" // Manufacturer - PPD spec has "HP" registered for "Hewlett-Packard"... Manufacturer "HP" @@ -4676,6 +4676,14 @@ ality:Quality=2,Quality:ColorMode=2,Quality:MediaType=2,Quality:PenSet&& Attribute "Product" "" "(HP Deskjet 3325 Printer/scanjet 3530c)" } { + ModelName "HP Scanjet Pro 3500 f1 hpijs" + Attribute "NickName" "" "HP Scanjet Pro 3500 f1 hpijs, $Version" + Attribute "ShortNickName" "" "HP Scanjet Pro 3500 f1 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp scanjet pro 3500 f1;DES:hp scanjet pro 3500 f1;" + PCFileName "hp-scanjet_pro_3500_f1-hpijs.ppd" + Attribute "Product" "" "(HP Scanjet Pro 3500 f1 Flatbed Scanner)" + } + { ModelName "HP Deskjet 3500 hpijs" Attribute "NickName" "" "HP Deskjet 3500 hpijs, $Version" Attribute "ShortNickName" "" "HP Deskjet 3500 hpijs" @@ -14404,6 +14412,15 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Envy 5644 E-all-in-one)" } { + ModelName "HP Deskjet 5640 Series hpijs" + Attribute "NickName" "" "HP Deskjet 5640 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Deskjet 5640 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 5640 series;DES:deskjet 5640 series;" + PCFileName "hp-deskjet_5640_series-hpijs.ppd" + Attribute "Product" "" "(HP Deskjet Ink Advantage 5640 All-in-one Printer Series)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 5645 All-in-one Printer)" + } + { ModelName "HP Envy 5660 Series hpijs" Attribute "NickName" "" "HP Envy 5660 Series hpijs, $Version" Attribute "ShortNickName" "" "HP Envy 5660 Series hpijs" @@ -14670,8 +14687,20 @@ lity:PenSet=2,Quality:FullBleed=1" PCFileName "hp-envy_5540_series-hpijs.ppd" Attribute "Product" "" "(HP Envy 5540 All-in-one Printer Series)" Attribute "Product" "" "(HP Envy 5540 All-in-one Printer)" + Attribute "Product" "" "(HP Envy 5542 All-in-one Printer)" + Attribute "Product" "" "(HP Envy 5543 All-in-one Printer)" + Attribute "Product" "" "(HP Envy 5544 All-in-one Printer)" Attribute "Product" "" "(HP Envy 5545 All-in-one Printer)" } + { + ModelName "HP Deskjet 5570 Series hpijs" + Attribute "NickName" "" "HP Deskjet 5570 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Deskjet 5570 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 5570 series;DES:deskjet 5570 series;" + PCFileName "hp-deskjet_5570_series-hpijs.ppd" + Attribute "Product" "" "(HP Deskjet Ink Advantage 5570 All-in-one)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 5575 All-in-one)" + } // <%PyramidRefresh15:Normal%> { ModelName "HP Deskjet 1110 Series hpijs" @@ -14695,6 +14724,7 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Deskjet 2130 All-in-one Printer Series)" Attribute "Product" "" "(HP Deskjet 2131 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet 2132 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet 2134 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 2130 All-in One Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 2135 All-in One Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 2136 All-in One Printer)" @@ -15504,6 +15534,8 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Envy 5532 E-all-in-one Printer)" Attribute "Product" "" "(HP Envy 5534 E-all-in-one Printer)" Attribute "Product" "" "(HP Envy 5535 E-all-in-one Printer)" + Attribute "Product" "" "(HP Envy 5536 E-all-in-one Printer)" + Attribute "Product" "" "(HP Envy 5539 E-all-in-one Printer)" } // <%Mimas15:Normal%> { @@ -15525,6 +15557,18 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Envy 4520 All-in-one Printer Series)" Attribute "Product" "" "(HP Envy 4520 All-in-one Printer)" Attribute "Product" "" "(HP Envy 4522 All-in-one Printer)" + Attribute "Product" "" "(HP Envy 4523 All-in-one Printer)" + Attribute "Product" "" "(HP Envy 4524 All-in-one Printer)" + } + { + ModelName "HP Deskjet 4530 Series hpijs" + Attribute "NickName" "" "HP Deskjet 4530 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Deskjet 4530 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 4530 series;DES:deskjet 4530 series;" + PCFileName "hp-deskjet_4530_series-hpijs.ppd" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4530 All-in-one)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4535 All-in-one)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4536 All-in-one)" } { ModelName "HP Officejet 4650 Series hpijs" @@ -15535,8 +15579,19 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Officejet 4650 All-in-one Printer Series)" Attribute "Product" "" "(HP Officejet 4650 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4652 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 4654 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4655 All-in-one Printer)" } + { + ModelName "HP Deskjet 4670 Series hpijs" + Attribute "NickName" "" "HP Deskjet 4670 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Deskjet 4670 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 4670 series;DES:deskjet 4670 series;" + PCFileName "hp-deskjet_4670_series-hpijs.ppd" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4670 All-in-one)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4675 All-in-one)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4676 All-in-one)" + } } // end MimasTDR @@ -18816,6 +18871,8 @@ lity:PenSet=2,Quality:FullBleed=1" PCFileName "hp-deskjet_3630_series-hpijs.ppd" Attribute "Product" "" "(HP Deskjet 3630 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet 3632 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet 3633 All-in-one Printer)" + Attribute "Product" "" "(HP Deskjet 3634 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 3630 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 3635 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 3636 All-in-one Printer)" @@ -18841,8 +18898,296 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Deskjet Ink Advantage 3835 All-in-one Printer)" Attribute "Product" "" "(HP Deskjet Ink Advantage 3836 All-in-one Printer)" } + { + ModelName "HP Deskjet 4720 Series hpijs" + Attribute "NickName" "" "HP Deskjet 4720 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Deskjet 4720 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 4720 series;DES:deskjet 4720 series;" + PCFileName "hp-deskjet_4720_series-hpijs.ppd" + Attribute "Product" "" "(HP Deskjet Ink Advantage Ultra 4720 All-in-one Printer Series)" + Attribute "Product" "" "(HP Deskjet Ink Advantage Ultra 4729 All-in-one Printer)" + } }// End Pyramid15 +//////// Mimas15 +{ + Attribute "DefaultResolution" "" "600dpi" + + // Custom page sizes from 1x4in to SuperB + HWMargins 18 36 18 9 + VariablePaperSize Yes + MinSize 1in 4in + MaxSize 936 1368 + Attribute "FoomaticRIPOptionSetting" "PageSize=Custom" " -dDEVICEWIDTHPOINTS=0 -dD&& +EVICEHEIGHTPOINTS=0" + + Attribute "FoomaticIDs" "" "HP-DeskJet_5650 hpijs" + Attribute "FoomaticRIPCommandLine" "" "gs -q -dBATCH -dPARANOIDSAFER -dQUIET -dNOPA&& +USE -sDEVICE=ijs -sIjsServer=hpijs%A%B%C -dIjsUseOutputFD%Z -sOutputFi&& +le=- -" + Attribute "FoomaticRIPOption" "Model" "enum CmdLine A 100" + Attribute "FoomaticRIPOptionSetting" "Model=HP-DeskJet_5650" " -sDeviceManufacture&& +r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5600"" + Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300FastDraftCol&& +orCMYK" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=300FastDra&& +ftGrayscaleK" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMYK" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=300Graysc&& +aleK" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&& +eK" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFu&& +llBleed" + Attribute "FoomaticRIPOption" "InputSlot" "enum CmdLine C" + Attribute "FoomaticRIPOptionSetting" "InputSlot=Default" ",PS:MediaPosition=7" + Attribute "FoomaticRIPOptionSetting" "InputSlot=PhotoTray" ",PS:MediaPosition=6" + Attribute "FoomaticRIPOptionSetting" "InputSlot=Upper" ",PS:MediaPosition=1" + Attribute "FoomaticRIPOptionSetting" "InputSlot=Lower" ",PS:MediaPosition=4" + Attribute "FoomaticRIPOptionSetting" "InputSlot=CDDVDTray" ",PS:MediaPosition=14" + Attribute "FoomaticRIPOptionSetting" "InputSlot=Envelope" ",PS:MediaPosition=3" + Attribute "FoomaticRIPOptionSetting" "InputSlot=LargeCapacity" ",PS:MediaPosition=&& +5" + Attribute "FoomaticRIPOptionSetting" "InputSlot=Manual" ",PS:MediaPosition=2" + Attribute "FoomaticRIPOptionSetting" "InputSlot=MPTray" ",PS:MediaPosition=8" + Attribute "FoomaticRIPOption" "PageSize" "enum CmdLine A" + Attribute "FoomaticRIPOptionSetting" "PageSize=Letter" " -dDEVICEWIDTHPOINTS=612 -&& +dDEVICEHEIGHTPOINTS=792" + Attribute "FoomaticRIPOptionSetting" "PageSize=A4" " -dDEVICEWIDTHPOINTS=595 -dDEV&& +ICEHEIGHTPOINTS=842" + Attribute "FoomaticRIPOptionSetting" "PageSize=Photo" " -dDEVICEWIDTHPOINTS=288 -d&& +DEVICEHEIGHTPOINTS=432" + Attribute "FoomaticRIPOptionSetting" "PageSize=Photo5x7" " -dDEVICEWIDTHPOINTS=360&& + -dDEVICEHEIGHTPOINTS=504" + Attribute "FoomaticRIPOptionSetting" "PageSize=PhotoTearOff" " -dDEVICEWIDTHPOINTS&& +=288 -dDEVICEHEIGHTPOINTS=432" + Attribute "FoomaticRIPOptionSetting" "PageSize=3x5" " -dDEVICEWIDTHPOINTS=216 -dDE&& +VICEHEIGHTPOINTS=360" + Attribute "FoomaticRIPOptionSetting" "PageSize=5x8" " -dDEVICEWIDTHPOINTS=360 -dDE&& +VICEHEIGHTPOINTS=576" + Attribute "FoomaticRIPOptionSetting" "PageSize=A5" " -dDEVICEWIDTHPOINTS=420 -dDEV&& +ICEHEIGHTPOINTS=595" + Attribute "FoomaticRIPOptionSetting" "PageSize=A6" " -dDEVICEWIDTHPOINTS=297 -dDEV&& +ICEHEIGHTPOINTS=420" + Attribute "FoomaticRIPOptionSetting" "PageSize=A6TearOff" " -dDEVICEWIDTHPOINTS=29&& +7 -dDEVICEHEIGHTPOINTS=420" + Attribute "FoomaticRIPOptionSetting" "PageSize=B5JIS" " -dDEVICEWIDTHPOINTS=516 -d&& +DEVICEHEIGHTPOINTS=729" + Attribute "FoomaticRIPOptionSetting" "PageSize=CDDVD80" " -dDEVICEWIDTHPOINTS=237 && +-dDEVICEHEIGHTPOINTS=237" + Attribute "FoomaticRIPOptionSetting" "PageSize=CDDVD120" " -dDEVICEWIDTHPOINTS=360&& + -dDEVICEHEIGHTPOINTS=360" + Attribute "FoomaticRIPOptionSetting" "PageSize=Env10" " -dDEVICEWIDTHPOINTS=297 -d&& +DEVICEHEIGHTPOINTS=684" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvC5" " -dDEVICEWIDTHPOINTS=459 -d&& +DEVICEHEIGHTPOINTS=649" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvC6" " -dDEVICEWIDTHPOINTS=323 -d&& +DEVICEHEIGHTPOINTS=459" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvDL" " -dDEVICEWIDTHPOINTS=312 -d&& +DEVICEHEIGHTPOINTS=624" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvISOB5" " -dDEVICEWIDTHPOINTS=499&& + -dDEVICEHEIGHTPOINTS=709" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvMonarch" " -dDEVICEWIDTHPOINTS=2&& +79 -dDEVICEHEIGHTPOINTS=540" + Attribute "FoomaticRIPOptionSetting" "PageSize=Executive" " -dDEVICEWIDTHPOINTS=52&& +2 -dDEVICEHEIGHTPOINTS=756" + Attribute "FoomaticRIPOptionSetting" "PageSize=FLSA" " -dDEVICEWIDTHPOINTS=612 -dD&& +EVICEHEIGHTPOINTS=936" + Attribute "FoomaticRIPOptionSetting" "PageSize=Hagaki" " -dDEVICEWIDTHPOINTS=283 -&& +dDEVICEHEIGHTPOINTS=420" + Attribute "FoomaticRIPOptionSetting" "PageSize=Legal" " -dDEVICEWIDTHPOINTS=612 -d&& +DEVICEHEIGHTPOINTS=1008" + Attribute "FoomaticRIPOptionSetting" "PageSize=Oufuku" " -dDEVICEWIDTHPOINTS=567 -&& +dDEVICEHEIGHTPOINTS=420" + Attribute "FoomaticRIPOptionSetting" "PageSize=w558h774" " -dDEVICEWIDTHPOINTS=558&& + -dDEVICEHEIGHTPOINTS=774" + Attribute "FoomaticRIPOptionSetting" "PageSize=w612h935" " -dDEVICEWIDTHPOINTS=612&& + -dDEVICEHEIGHTPOINTS=935" + /////////// Large format paper support + Attribute "FoomaticRIPOptionSetting" "PageSize=B4JIS" " -dDEVICEWIDTHPOINTS=729 -d&& +DEVICEHEIGHTPOINTS=1033" + Attribute "FoomaticRIPOptionSetting" "PageSize=Ledger" " -dDEVICEWIDTHPOINTS=792 -&& +dDEVICEHEIGHTPOINTS=1224" + Attribute "FoomaticRIPOptionSetting" "PageSize=SuperB" " -dDEVICEWIDTHPOINTS=936 -&& +dDEVICEHEIGHTPOINTS=1368" + Attribute "FoomaticRIPOptionSetting" "PageSize=w774h1116" " -dDEVICEWIDTHPOINTS=77&& +4 -dDEVICEHEIGHTPOINTS=1116" + Attribute "FoomaticRIPOptionSetting" "PageSize=A3" " -dDEVICEWIDTHPOINTS=842 -dDEV&& +ICEHEIGHTPOINTS=1190" + Attribute "FoomaticRIPOption" "DryTime" "enum CmdLine B" + Attribute "FoomaticRIPOptionSetting" "DryTime=Zero" "" + Attribute "FoomaticRIPOptionSetting" "DryTime=Five" ",DryTime=5" + Attribute "FoomaticRIPOptionSetting" "DryTime=Ten" ",DryTime=10" + Attribute "FoomaticRIPOptionSetting" "DryTime=Fifteen" ",DryTime=15" + Attribute "FoomaticRIPOptionSetting" "DryTime=Twenty" ",DryTime=20" + Attribute "FoomaticRIPOptionSetting" "DryTime=TwentyFive" ",DryTime=25" + Attribute "FoomaticRIPOptionSetting" "DryTime=Thirty" ",DryTime=30" + Attribute "FoomaticRIPOption" "Quality" "enum CmdLine B" + Attribute "FoomaticRIPOptionSetting" "Quality=300ColorCMYK" " -r300 -sIjsParams=Qu&& +ality:Quality=0,Quality:ColorMode=2,Quality:MediaType=0,Quality:PenSet&& +=2" + Attribute "FoomaticRIPOptionSetting" "Quality=300ColorCMYKFullBleed" " -r300 -sIjs&& +Params=Quality:Quality=0,Quality:ColorMode=2,Quality:MediaType=0,Quali&& +ty:PenSet=2,Quality:FullBleed=1" + Attribute "FoomaticRIPOptionSetting" "Quality=300DraftColorCMYK" " -r300 -sIjsPara&& +ms=Quality:Quality=1,Quality:ColorMode=2,Quality:MediaType=0,Quality:P&& +enSet=2" + Attribute "FoomaticRIPOptionSetting" "Quality=300DraftGrayscaleK" " -r300 -sIjs&& +Params=Quality:Quality=1,Quality:ColorMode=0,Quality:MediaType=0,Quali&& +ty:PenSet=2" + Attribute "FoomaticRIPOptionSetting" "Quality=300FastDraftColorCMYK" " -r300 -sIjs&& +Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& +ty:PenSet=2,Quality:SpeedMech=1" + Attribute "FoomaticRIPOptionSetting" "Quality=300FastDraftGrayscaleK" " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2,Quality:SpeedMech=1" + Attribute "FoomaticRIPOptionSetting" "Quality=300GrayscaleK" " -r300 -sIjsParam&& +s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& +nSet=2" + Attribute "FoomaticRIPOptionSetting" "Quality=600ColorCMYK" " -r600 -sIjsParams=Qu&& +ality:Quality=0,Quality:ColorMode=2,Quality:MediaType=0,Quality:PenSet&& +=2" + Attribute "FoomaticRIPOptionSetting" "Quality=600ColorCMYKFullBleed" " -r600 -sIjs&& +Params=Quality:Quality=0,Quality:ColorMode=2,Quality:MediaType=0,Quali&& +ty:PenSet=2,Quality:FullBleed=1" + Attribute "FoomaticRIPOptionSetting" "Quality=600GrayscaleK" " -r600 -sIjsParam&& +s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& +nSet=2" + Attribute "FoomaticRIPOptionSetting" "Quality=600PhotoCMYK" " -r600 -sIjsParams=&& +Quality:Quality=2,Quality:ColorMode=2,Quality:MediaType=2,Quality:PenS&& +et=2" + Attribute "FoomaticRIPOptionSetting" "Quality=600PhotoCMYKFullBleed" " -r600 -sI&& +jsParams=Quality:Quality=2,Quality:ColorMode=2,Quality:MediaType=2,Qua&& +lity:PenSet=2,Quality:FullBleed=1" + Group "General/General" + Option "PrintoutMode/Printout Mode" PickOne AnySetup 10.0 + Choice "Draft/Draft (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=Draft" + Choice "Draft.Gray/Draft Grayscale (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" + *Choice "Normal/Normal (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" + Choice "Normal.Gray/Normal Grayscale (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=Normal.Gray" + Choice "High/High Quality (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=High" + Choice "High.Gray/High Quality Grayscale (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=High.Gray" + Choice "Photo/Photo (on photo paper)" "%% FoomaticRIPOptionSetting: PrintoutMode=Photo" + Option "InputSlot/Media Source" PickOne AnySetup 100.0 + *Choice "Default/Printer default" "%% FoomaticRIPOptionSetting: InputSlot=Default" + Choice "PhotoTray/Photo Tray" "%% FoomaticRIPOptionSetting: InputSlot=PhotoTray" + Choice "Upper/Upper Tray" "%% FoomaticRIPOptionSetting: InputSlot=Upper" + Choice "Lower/Lower Tray" "%% FoomaticRIPOptionSetting: InputSlot=Lower" + Choice "CDDVDTray/CD or DVD Tray" "%% FoomaticRIPOptionSetting: InputSlot=CDDVDTray" + Choice "Envelope/Envelope Feeder" "%% FoomaticRIPOptionSetting: InputSlot=Envelope" + Choice "LargeCapacity/Large Capacity Tray" "%% FoomaticRIPOptionSetting: InputSlot=LargeCapacity" + Choice "Manual/Manual Feeder" "%% FoomaticRIPOptionSetting: InputSlot=Manual" + Choice "MPTray/Multi Purpose Tray" "%% FoomaticRIPOptionSetting: InputSlot=MPTray" + Option "DryTime/Additional Dry Time" PickOne AnySetup 120.0 + *Choice "Zero/Printer Default" "%% FoomaticRIPOptionSetting: DryTime=Zero" + Choice "Five/5 Seconds" "%% FoomaticRIPOptionSetting: DryTime=Five" + Choice "Ten/10 Seconds" "%% FoomaticRIPOptionSetting: DryTime=Ten" + Choice "Fifteen/15 Seconds" "%% FoomaticRIPOptionSetting: DryTime=Fifteen" + Choice "Twenty/20 Seconds" "%% FoomaticRIPOptionSetting: DryTime=Twenty" + Choice "TwentyFive/25 Seconds" "%% FoomaticRIPOptionSetting: DryTime=TwentyFive" + Choice "Thirty/30 Seconds" "%% FoomaticRIPOptionSetting: DryTime=Thirty" + Group "PrintoutMode/Printout Mode" + Option "Quality/Resolution, Quality, Ink Type, Media Type" PickOne AnySetup 100.0 + *Choice "FromPrintoutMode/Controlled by 'Printout Mode'" "%% FoomaticRIPOptionSetting: Quality=@PrintoutMode" + Choice "300ColorCMYK/300 dpi, Color, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=300ColorCMYK" + Choice "300ColorCMYKFullBleed/300 dpi, Color, Full Bleed, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=300ColorCMYKFullBleed" + Choice "300DraftColorCMYK/300 dpi, Draft, Color, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=300DraftColorCMYK" + Choice "300DraftGrayscaleK/300 dpi, Draft, Grayscale, Black Cartr." "%% FoomaticRIPOptionSetting: Quality=300DraftGrayscaleK" + Choice "300FastDraftColorCMYK/300 dpi, FastDraft, Color, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=300FastDraftColorCMYK" + Choice "300FastDraftGrayscaleK/300 dpi, FastDraft, Grayscale, Black Cartr." "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleK" + Choice "300GrayscaleK/300 dpi, Grayscale, Black Cartr." "%% FoomaticRIPOptionSetting: Quality=300GrayscaleK" + Choice "600ColorCMYK/600 dpi, Color, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=600ColorCMYK" + Choice "600ColorCMYKFullBleed/600 dpi, Color, Full Bleed, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=600ColorCMYKFullBleed" + Choice "600GrayscaleK/600 dpi, Grayscale, Black Cartr." "%% FoomaticRIPOptionSetting: Quality=600GrayscaleK" + Choice "600PhotoCMYK/600 dpi, Photo, Black + Color Cartr., Photo Paper" "%% FoomaticRIPOptionSetting: Quality=600PhotoCMYK" + Choice "600PhotoCMYKFullBleed/600 dpi, Photo, Full Bleed, Black + Color Cartr., Photo Paper" "%% FoomaticRIPOptionSetting: Quality=600PhotoCMYKFullBleed" + *CustomMedia "Letter/Letter" 612.00 792.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=Letter" "%% FoomaticRIPOptionSetting: PageSize=Letter" + CustomMedia "A4/A4" 595.00 842.00 9.72 36.00 9.72 9.00 "%% FoomaticRIPOptionSetting: PageSize=A4" "%% FoomaticRIPOptionSetting: PageSize=A4" + CustomMedia "Photo/Photo or 4x6 inch index card" 288.00 432.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=Photo" "%% FoomaticRIPOptionSetting: PageSize=Photo" + CustomMedia "Photo5x7/Photo or 5x7 inch index card" 360.00 504.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=Photo5x7" "%% FoomaticRIPOptionSetting: PageSize=Photo5x7" + CustomMedia "PhotoTearOff/Photo with tear-off tab" 288.00 432.00 0.00 0.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=PhotoTearOff" "%% FoomaticRIPOptionSetting: PageSize=PhotoTearOff" + CustomMedia "3x5/3x5 inch index card" 216.00 360.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=3x5" "%% FoomaticRIPOptionSetting: PageSize=3x5" + CustomMedia "5x8/5x8 inch index card" 360.00 576.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=5x8" "%% FoomaticRIPOptionSetting: PageSize=5x8" + CustomMedia "A5/A5" 420.00 595.00 9.00 36.00 9.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=A5" "%% FoomaticRIPOptionSetting: PageSize=A5" + CustomMedia "A6/A6" 297.00 420.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=A6" "%% FoomaticRIPOptionSetting: PageSize=A6" + CustomMedia "A6TearOff/A6 with tear-off tab" 297.00 420.00 0.00 0.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=A6TearOff" "%% FoomaticRIPOptionSetting: PageSize=A6TearOff" + CustomMedia "B5JIS/B5 (JIS)" 516.00 729.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=B5JIS" "%% FoomaticRIPOptionSetting: PageSize=B5JIS" + CustomMedia "CDDVD80/CD or DVD 80 mm" 237.00 237.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=CDDVD80" "%% FoomaticRIPOptionSetting: PageSize=CDDVD80" + CustomMedia "CDDVD120/CD or DVD 120 mm" 360.00 360.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=CDDVD120" "%% FoomaticRIPOptionSetting: PageSize=CDDVD120" + CustomMedia "Env10/Envelope #10" 297.00 684.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=Env10" "%% FoomaticRIPOptionSetting: PageSize=Env10" + CustomMedia "EnvC5/Envelope C5" 459.00 649.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=EnvC5" "%% FoomaticRIPOptionSetting: PageSize=EnvC5" + CustomMedia "EnvC6/Envelope C6" 323.00 459.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=EnvC6" "%% FoomaticRIPOptionSetting: PageSize=EnvC6" + CustomMedia "EnvDL/Envelope DL" 312.00 624.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=EnvDL" "%% FoomaticRIPOptionSetting: PageSize=EnvDL" + CustomMedia "EnvISOB5/Envelope B5" 499.00 709.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=EnvISOB5" "%% FoomaticRIPOptionSetting: PageSize=EnvISOB5" + CustomMedia "EnvMonarch/Envelope Monarch" 279.00 540.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" + CustomMedia "Executive/Executive" 522.00 756.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=Executive" "%% FoomaticRIPOptionSetting: PageSize=Executive" + CustomMedia "FLSA/American Foolscap" 612.00 936.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=FLSA" "%% FoomaticRIPOptionSetting: PageSize=FLSA" + CustomMedia "Hagaki/Hagaki" 283.00 420.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=Hagaki" "%% FoomaticRIPOptionSetting: PageSize=Hagaki" + CustomMedia "Legal/Legal" 612.00 1008.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=Legal" "%% FoomaticRIPOptionSetting: PageSize=Legal" + CustomMedia "Oufuku/Oufuku-Hagaki" 567.00 420.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=Oufuku" "%% FoomaticRIPOptionSetting: PageSize=Oufuku" + CustomMedia "w558h774/16K" 558.00 774.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=w558h774" "%% FoomaticRIPOptionSetting: PageSize=w558h774" + CustomMedia "w612h935/Executive (JIS)" 612.00 935.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=w612h935" "%% FoomaticRIPOptionSetting: PageSize=w612h935" + + // <%Mimas15:Normal%> + { + ModelName "HP Envy 4510 Series hpijs" + Attribute "NickName" "" "HP Envy 4510 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Envy 4510 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:envy 4510 series;DES:envy 4510 series;" + PCFileName "hp-envy_4510_series-hpijs.ppd" + Attribute "Product" "" "(HP Envy 4510 All-in-one)" + Attribute "Product" "" "(HP Envy 4512 All-in-one)" + Attribute "Product" "" "(HP Envy 4516 All-in-one)" + } + { + ModelName "HP Envy 4520 Series hpijs" + Attribute "NickName" "" "HP Envy 4520 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Envy 4520 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:envy 4520 series;DES:envy 4520 series;" + PCFileName "hp-envy_4520_series-hpijs.ppd" + Attribute "Product" "" "(HP Envy 4520 All-in-one Printer Series)" + Attribute "Product" "" "(HP Envy 4520 All-in-one Printer)" + Attribute "Product" "" "(HP Envy 4522 All-in-one Printer)" + Attribute "Product" "" "(HP Envy 4523 All-in-one Printer)" + Attribute "Product" "" "(HP Envy 4524 All-in-one Printer)" + } + { + ModelName "HP Deskjet 4530 Series hpijs" + Attribute "NickName" "" "HP Deskjet 4530 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Deskjet 4530 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 4530 series;DES:deskjet 4530 series;" + PCFileName "hp-deskjet_4530_series-hpijs.ppd" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4530 All-in-one)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4535 All-in-one)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4536 All-in-one)" + } + { + ModelName "HP Officejet 4650 Series hpijs" + Attribute "NickName" "" "HP Officejet 4650 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Officejet 4650 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4650 series;DES:officejet 4650 series;" + PCFileName "hp-officejet_4650_series-hpijs.ppd" + Attribute "Product" "" "(HP Officejet 4650 All-in-one Printer Series)" + Attribute "Product" "" "(HP Officejet 4650 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 4652 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 4654 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 4655 All-in-one Printer)" + } + { + ModelName "HP Deskjet 4670 Series hpijs" + Attribute "NickName" "" "HP Deskjet 4670 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Deskjet 4670 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 4670 series;DES:deskjet 4670 series;" + PCFileName "hp-deskjet_4670_series-hpijs.ppd" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4670 All-in-one)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4675 All-in-one)" + Attribute "Product" "" "(HP Deskjet Ink Advantage 4676 All-in-one)" + } + +}// End Mimas15 + } // end Manufacturer "HP" diff --git a/prnt/drv/hpijs.drv.in.template b/prnt/drv/hpijs.drv.in.template index d40bd722e..f939923b2 100644 --- a/prnt/drv/hpijs.drv.in.template +++ b/prnt/drv/hpijs.drv.in.template @@ -63,7 +63,7 @@ #define VERSION "@VERSION@" // Copyright for all drivers... -Copyright "(c) 2004-2008 Copyright Hewlett-Packard Development Company, LP" +Copyright "(c) 2004-2008 Copyright HP Development Company, LP" // Manufacturer - PPD spec has "HP" registered for "Hewlett-Packard"... Manufacturer "HP" @@ -11273,5 +11273,230 @@ lity:PenSet=2,Quality:FullBleed=1" }// End Pyramid15 +//////// Mimas15 +{ + Attribute "DefaultResolution" "" "600dpi" + + // Custom page sizes from 1x4in to SuperB + HWMargins 18 36 18 9 + VariablePaperSize Yes + MinSize 1in 4in + MaxSize 936 1368 + Attribute "FoomaticRIPOptionSetting" "PageSize=Custom" " -dDEVICEWIDTHPOINTS=0 -dD&& +EVICEHEIGHTPOINTS=0" + + Attribute "FoomaticIDs" "" "HP-DeskJet_5650 hpijs" + Attribute "FoomaticRIPCommandLine" "" "gs -q -dBATCH -dPARANOIDSAFER -dQUIET -dNOPA&& +USE -sDEVICE=ijs -sIjsServer=hpijs%A%B%C -dIjsUseOutputFD%Z -sOutputFi&& +le=- -" + Attribute "FoomaticRIPOption" "Model" "enum CmdLine A 100" + Attribute "FoomaticRIPOptionSetting" "Model=HP-DeskJet_5650" " -sDeviceManufacture&& +r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5600"" + Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300FastDraftCol&& +orCMYK" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=300FastDra&& +ftGrayscaleK" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMYK" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=300Graysc&& +aleK" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&& +eK" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFu&& +llBleed" + Attribute "FoomaticRIPOption" "InputSlot" "enum CmdLine C" + Attribute "FoomaticRIPOptionSetting" "InputSlot=Default" ",PS:MediaPosition=7" + Attribute "FoomaticRIPOptionSetting" "InputSlot=PhotoTray" ",PS:MediaPosition=6" + Attribute "FoomaticRIPOptionSetting" "InputSlot=Upper" ",PS:MediaPosition=1" + Attribute "FoomaticRIPOptionSetting" "InputSlot=Lower" ",PS:MediaPosition=4" + Attribute "FoomaticRIPOptionSetting" "InputSlot=CDDVDTray" ",PS:MediaPosition=14" + Attribute "FoomaticRIPOptionSetting" "InputSlot=Envelope" ",PS:MediaPosition=3" + Attribute "FoomaticRIPOptionSetting" "InputSlot=LargeCapacity" ",PS:MediaPosition=&& +5" + Attribute "FoomaticRIPOptionSetting" "InputSlot=Manual" ",PS:MediaPosition=2" + Attribute "FoomaticRIPOptionSetting" "InputSlot=MPTray" ",PS:MediaPosition=8" + Attribute "FoomaticRIPOption" "PageSize" "enum CmdLine A" + Attribute "FoomaticRIPOptionSetting" "PageSize=Letter" " -dDEVICEWIDTHPOINTS=612 -&& +dDEVICEHEIGHTPOINTS=792" + Attribute "FoomaticRIPOptionSetting" "PageSize=A4" " -dDEVICEWIDTHPOINTS=595 -dDEV&& +ICEHEIGHTPOINTS=842" + Attribute "FoomaticRIPOptionSetting" "PageSize=Photo" " -dDEVICEWIDTHPOINTS=288 -d&& +DEVICEHEIGHTPOINTS=432" + Attribute "FoomaticRIPOptionSetting" "PageSize=Photo5x7" " -dDEVICEWIDTHPOINTS=360&& + -dDEVICEHEIGHTPOINTS=504" + Attribute "FoomaticRIPOptionSetting" "PageSize=PhotoTearOff" " -dDEVICEWIDTHPOINTS&& +=288 -dDEVICEHEIGHTPOINTS=432" + Attribute "FoomaticRIPOptionSetting" "PageSize=3x5" " -dDEVICEWIDTHPOINTS=216 -dDE&& +VICEHEIGHTPOINTS=360" + Attribute "FoomaticRIPOptionSetting" "PageSize=5x8" " -dDEVICEWIDTHPOINTS=360 -dDE&& +VICEHEIGHTPOINTS=576" + Attribute "FoomaticRIPOptionSetting" "PageSize=A5" " -dDEVICEWIDTHPOINTS=420 -dDEV&& +ICEHEIGHTPOINTS=595" + Attribute "FoomaticRIPOptionSetting" "PageSize=A6" " -dDEVICEWIDTHPOINTS=297 -dDEV&& +ICEHEIGHTPOINTS=420" + Attribute "FoomaticRIPOptionSetting" "PageSize=A6TearOff" " -dDEVICEWIDTHPOINTS=29&& +7 -dDEVICEHEIGHTPOINTS=420" + Attribute "FoomaticRIPOptionSetting" "PageSize=B5JIS" " -dDEVICEWIDTHPOINTS=516 -d&& +DEVICEHEIGHTPOINTS=729" + Attribute "FoomaticRIPOptionSetting" "PageSize=CDDVD80" " -dDEVICEWIDTHPOINTS=237 && +-dDEVICEHEIGHTPOINTS=237" + Attribute "FoomaticRIPOptionSetting" "PageSize=CDDVD120" " -dDEVICEWIDTHPOINTS=360&& + -dDEVICEHEIGHTPOINTS=360" + Attribute "FoomaticRIPOptionSetting" "PageSize=Env10" " -dDEVICEWIDTHPOINTS=297 -d&& +DEVICEHEIGHTPOINTS=684" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvC5" " -dDEVICEWIDTHPOINTS=459 -d&& +DEVICEHEIGHTPOINTS=649" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvC6" " -dDEVICEWIDTHPOINTS=323 -d&& +DEVICEHEIGHTPOINTS=459" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvDL" " -dDEVICEWIDTHPOINTS=312 -d&& +DEVICEHEIGHTPOINTS=624" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvISOB5" " -dDEVICEWIDTHPOINTS=499&& + -dDEVICEHEIGHTPOINTS=709" + Attribute "FoomaticRIPOptionSetting" "PageSize=EnvMonarch" " -dDEVICEWIDTHPOINTS=2&& +79 -dDEVICEHEIGHTPOINTS=540" + Attribute "FoomaticRIPOptionSetting" "PageSize=Executive" " -dDEVICEWIDTHPOINTS=52&& +2 -dDEVICEHEIGHTPOINTS=756" + Attribute "FoomaticRIPOptionSetting" "PageSize=FLSA" " -dDEVICEWIDTHPOINTS=612 -dD&& +EVICEHEIGHTPOINTS=936" + Attribute "FoomaticRIPOptionSetting" "PageSize=Hagaki" " -dDEVICEWIDTHPOINTS=283 -&& +dDEVICEHEIGHTPOINTS=420" + Attribute "FoomaticRIPOptionSetting" "PageSize=Legal" " -dDEVICEWIDTHPOINTS=612 -d&& +DEVICEHEIGHTPOINTS=1008" + Attribute "FoomaticRIPOptionSetting" "PageSize=Oufuku" " -dDEVICEWIDTHPOINTS=567 -&& +dDEVICEHEIGHTPOINTS=420" + Attribute "FoomaticRIPOptionSetting" "PageSize=w558h774" " -dDEVICEWIDTHPOINTS=558&& + -dDEVICEHEIGHTPOINTS=774" + Attribute "FoomaticRIPOptionSetting" "PageSize=w612h935" " -dDEVICEWIDTHPOINTS=612&& + -dDEVICEHEIGHTPOINTS=935" + /////////// Large format paper support + Attribute "FoomaticRIPOptionSetting" "PageSize=B4JIS" " -dDEVICEWIDTHPOINTS=729 -d&& +DEVICEHEIGHTPOINTS=1033" + Attribute "FoomaticRIPOptionSetting" "PageSize=Ledger" " -dDEVICEWIDTHPOINTS=792 -&& +dDEVICEHEIGHTPOINTS=1224" + Attribute "FoomaticRIPOptionSetting" "PageSize=SuperB" " -dDEVICEWIDTHPOINTS=936 -&& +dDEVICEHEIGHTPOINTS=1368" + Attribute "FoomaticRIPOptionSetting" "PageSize=w774h1116" " -dDEVICEWIDTHPOINTS=77&& +4 -dDEVICEHEIGHTPOINTS=1116" + Attribute "FoomaticRIPOptionSetting" "PageSize=A3" " -dDEVICEWIDTHPOINTS=842 -dDEV&& +ICEHEIGHTPOINTS=1190" + Attribute "FoomaticRIPOption" "DryTime" "enum CmdLine B" + Attribute "FoomaticRIPOptionSetting" "DryTime=Zero" "" + Attribute "FoomaticRIPOptionSetting" "DryTime=Five" ",DryTime=5" + Attribute "FoomaticRIPOptionSetting" "DryTime=Ten" ",DryTime=10" + Attribute "FoomaticRIPOptionSetting" "DryTime=Fifteen" ",DryTime=15" + Attribute "FoomaticRIPOptionSetting" "DryTime=Twenty" ",DryTime=20" + Attribute "FoomaticRIPOptionSetting" "DryTime=TwentyFive" ",DryTime=25" + Attribute "FoomaticRIPOptionSetting" "DryTime=Thirty" ",DryTime=30" + Attribute "FoomaticRIPOption" "Quality" "enum CmdLine B" + Attribute "FoomaticRIPOptionSetting" "Quality=300ColorCMYK" " -r300 -sIjsParams=Qu&& +ality:Quality=0,Quality:ColorMode=2,Quality:MediaType=0,Quality:PenSet&& +=2" + Attribute "FoomaticRIPOptionSetting" "Quality=300ColorCMYKFullBleed" " -r300 -sIjs&& +Params=Quality:Quality=0,Quality:ColorMode=2,Quality:MediaType=0,Quali&& +ty:PenSet=2,Quality:FullBleed=1" + Attribute "FoomaticRIPOptionSetting" "Quality=300DraftColorCMYK" " -r300 -sIjsPara&& +ms=Quality:Quality=1,Quality:ColorMode=2,Quality:MediaType=0,Quality:P&& +enSet=2" + Attribute "FoomaticRIPOptionSetting" "Quality=300DraftGrayscaleK" " -r300 -sIjs&& +Params=Quality:Quality=1,Quality:ColorMode=0,Quality:MediaType=0,Quali&& +ty:PenSet=2" + Attribute "FoomaticRIPOptionSetting" "Quality=300FastDraftColorCMYK" " -r300 -sIjs&& +Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& +ty:PenSet=2,Quality:SpeedMech=1" + Attribute "FoomaticRIPOptionSetting" "Quality=300FastDraftGrayscaleK" " -r300 -&& +sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& +uality:PenSet=2,Quality:SpeedMech=1" + Attribute "FoomaticRIPOptionSetting" "Quality=300GrayscaleK" " -r300 -sIjsParam&& +s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& +nSet=2" + Attribute "FoomaticRIPOptionSetting" "Quality=600ColorCMYK" " -r600 -sIjsParams=Qu&& +ality:Quality=0,Quality:ColorMode=2,Quality:MediaType=0,Quality:PenSet&& +=2" + Attribute "FoomaticRIPOptionSetting" "Quality=600ColorCMYKFullBleed" " -r600 -sIjs&& +Params=Quality:Quality=0,Quality:ColorMode=2,Quality:MediaType=0,Quali&& +ty:PenSet=2,Quality:FullBleed=1" + Attribute "FoomaticRIPOptionSetting" "Quality=600GrayscaleK" " -r600 -sIjsParam&& +s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& +nSet=2" + Attribute "FoomaticRIPOptionSetting" "Quality=600PhotoCMYK" " -r600 -sIjsParams=&& +Quality:Quality=2,Quality:ColorMode=2,Quality:MediaType=2,Quality:PenS&& +et=2" + Attribute "FoomaticRIPOptionSetting" "Quality=600PhotoCMYKFullBleed" " -r600 -sI&& +jsParams=Quality:Quality=2,Quality:ColorMode=2,Quality:MediaType=2,Qua&& +lity:PenSet=2,Quality:FullBleed=1" + Group "General/General" + Option "PrintoutMode/Printout Mode" PickOne AnySetup 10.0 + Choice "Draft/Draft (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=Draft" + Choice "Draft.Gray/Draft Grayscale (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" + *Choice "Normal/Normal (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" + Choice "Normal.Gray/Normal Grayscale (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=Normal.Gray" + Choice "High/High Quality (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=High" + Choice "High.Gray/High Quality Grayscale (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=High.Gray" + Choice "Photo/Photo (on photo paper)" "%% FoomaticRIPOptionSetting: PrintoutMode=Photo" + Option "InputSlot/Media Source" PickOne AnySetup 100.0 + *Choice "Default/Printer default" "%% FoomaticRIPOptionSetting: InputSlot=Default" + Choice "PhotoTray/Photo Tray" "%% FoomaticRIPOptionSetting: InputSlot=PhotoTray" + Choice "Upper/Upper Tray" "%% FoomaticRIPOptionSetting: InputSlot=Upper" + Choice "Lower/Lower Tray" "%% FoomaticRIPOptionSetting: InputSlot=Lower" + Choice "CDDVDTray/CD or DVD Tray" "%% FoomaticRIPOptionSetting: InputSlot=CDDVDTray" + Choice "Envelope/Envelope Feeder" "%% FoomaticRIPOptionSetting: InputSlot=Envelope" + Choice "LargeCapacity/Large Capacity Tray" "%% FoomaticRIPOptionSetting: InputSlot=LargeCapacity" + Choice "Manual/Manual Feeder" "%% FoomaticRIPOptionSetting: InputSlot=Manual" + Choice "MPTray/Multi Purpose Tray" "%% FoomaticRIPOptionSetting: InputSlot=MPTray" + Option "DryTime/Additional Dry Time" PickOne AnySetup 120.0 + *Choice "Zero/Printer Default" "%% FoomaticRIPOptionSetting: DryTime=Zero" + Choice "Five/5 Seconds" "%% FoomaticRIPOptionSetting: DryTime=Five" + Choice "Ten/10 Seconds" "%% FoomaticRIPOptionSetting: DryTime=Ten" + Choice "Fifteen/15 Seconds" "%% FoomaticRIPOptionSetting: DryTime=Fifteen" + Choice "Twenty/20 Seconds" "%% FoomaticRIPOptionSetting: DryTime=Twenty" + Choice "TwentyFive/25 Seconds" "%% FoomaticRIPOptionSetting: DryTime=TwentyFive" + Choice "Thirty/30 Seconds" "%% FoomaticRIPOptionSetting: DryTime=Thirty" + Group "PrintoutMode/Printout Mode" + Option "Quality/Resolution, Quality, Ink Type, Media Type" PickOne AnySetup 100.0 + *Choice "FromPrintoutMode/Controlled by 'Printout Mode'" "%% FoomaticRIPOptionSetting: Quality=@PrintoutMode" + Choice "300ColorCMYK/300 dpi, Color, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=300ColorCMYK" + Choice "300ColorCMYKFullBleed/300 dpi, Color, Full Bleed, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=300ColorCMYKFullBleed" + Choice "300DraftColorCMYK/300 dpi, Draft, Color, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=300DraftColorCMYK" + Choice "300DraftGrayscaleK/300 dpi, Draft, Grayscale, Black Cartr." "%% FoomaticRIPOptionSetting: Quality=300DraftGrayscaleK" + Choice "300FastDraftColorCMYK/300 dpi, FastDraft, Color, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=300FastDraftColorCMYK" + Choice "300FastDraftGrayscaleK/300 dpi, FastDraft, Grayscale, Black Cartr." "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleK" + Choice "300GrayscaleK/300 dpi, Grayscale, Black Cartr." "%% FoomaticRIPOptionSetting: Quality=300GrayscaleK" + Choice "600ColorCMYK/600 dpi, Color, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=600ColorCMYK" + Choice "600ColorCMYKFullBleed/600 dpi, Color, Full Bleed, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=600ColorCMYKFullBleed" + Choice "600GrayscaleK/600 dpi, Grayscale, Black Cartr." "%% FoomaticRIPOptionSetting: Quality=600GrayscaleK" + Choice "600PhotoCMYK/600 dpi, Photo, Black + Color Cartr., Photo Paper" "%% FoomaticRIPOptionSetting: Quality=600PhotoCMYK" + Choice "600PhotoCMYKFullBleed/600 dpi, Photo, Full Bleed, Black + Color Cartr., Photo Paper" "%% FoomaticRIPOptionSetting: Quality=600PhotoCMYKFullBleed" + *CustomMedia "Letter/Letter" 612.00 792.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=Letter" "%% FoomaticRIPOptionSetting: PageSize=Letter" + CustomMedia "A4/A4" 595.00 842.00 9.72 36.00 9.72 9.00 "%% FoomaticRIPOptionSetting: PageSize=A4" "%% FoomaticRIPOptionSetting: PageSize=A4" + CustomMedia "Photo/Photo or 4x6 inch index card" 288.00 432.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=Photo" "%% FoomaticRIPOptionSetting: PageSize=Photo" + CustomMedia "Photo5x7/Photo or 5x7 inch index card" 360.00 504.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=Photo5x7" "%% FoomaticRIPOptionSetting: PageSize=Photo5x7" + CustomMedia "PhotoTearOff/Photo with tear-off tab" 288.00 432.00 0.00 0.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=PhotoTearOff" "%% FoomaticRIPOptionSetting: PageSize=PhotoTearOff" + CustomMedia "3x5/3x5 inch index card" 216.00 360.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=3x5" "%% FoomaticRIPOptionSetting: PageSize=3x5" + CustomMedia "5x8/5x8 inch index card" 360.00 576.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=5x8" "%% FoomaticRIPOptionSetting: PageSize=5x8" + CustomMedia "A5/A5" 420.00 595.00 9.00 36.00 9.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=A5" "%% FoomaticRIPOptionSetting: PageSize=A5" + CustomMedia "A6/A6" 297.00 420.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=A6" "%% FoomaticRIPOptionSetting: PageSize=A6" + CustomMedia "A6TearOff/A6 with tear-off tab" 297.00 420.00 0.00 0.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=A6TearOff" "%% FoomaticRIPOptionSetting: PageSize=A6TearOff" + CustomMedia "B5JIS/B5 (JIS)" 516.00 729.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=B5JIS" "%% FoomaticRIPOptionSetting: PageSize=B5JIS" + CustomMedia "CDDVD80/CD or DVD 80 mm" 237.00 237.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=CDDVD80" "%% FoomaticRIPOptionSetting: PageSize=CDDVD80" + CustomMedia "CDDVD120/CD or DVD 120 mm" 360.00 360.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=CDDVD120" "%% FoomaticRIPOptionSetting: PageSize=CDDVD120" + CustomMedia "Env10/Envelope #10" 297.00 684.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=Env10" "%% FoomaticRIPOptionSetting: PageSize=Env10" + CustomMedia "EnvC5/Envelope C5" 459.00 649.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=EnvC5" "%% FoomaticRIPOptionSetting: PageSize=EnvC5" + CustomMedia "EnvC6/Envelope C6" 323.00 459.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=EnvC6" "%% FoomaticRIPOptionSetting: PageSize=EnvC6" + CustomMedia "EnvDL/Envelope DL" 312.00 624.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=EnvDL" "%% FoomaticRIPOptionSetting: PageSize=EnvDL" + CustomMedia "EnvISOB5/Envelope B5" 499.00 709.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=EnvISOB5" "%% FoomaticRIPOptionSetting: PageSize=EnvISOB5" + CustomMedia "EnvMonarch/Envelope Monarch" 279.00 540.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" + CustomMedia "Executive/Executive" 522.00 756.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=Executive" "%% FoomaticRIPOptionSetting: PageSize=Executive" + CustomMedia "FLSA/American Foolscap" 612.00 936.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=FLSA" "%% FoomaticRIPOptionSetting: PageSize=FLSA" + CustomMedia "Hagaki/Hagaki" 283.00 420.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=Hagaki" "%% FoomaticRIPOptionSetting: PageSize=Hagaki" + CustomMedia "Legal/Legal" 612.00 1008.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=Legal" "%% FoomaticRIPOptionSetting: PageSize=Legal" + CustomMedia "Oufuku/Oufuku-Hagaki" 567.00 420.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=Oufuku" "%% FoomaticRIPOptionSetting: PageSize=Oufuku" + CustomMedia "w558h774/16K" 558.00 774.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=w558h774" "%% FoomaticRIPOptionSetting: PageSize=w558h774" + CustomMedia "w612h935/Executive (JIS)" 612.00 935.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=w612h935" "%% FoomaticRIPOptionSetting: PageSize=w612h935" + + // <%Mimas15:Normal%> + +}// End Mimas15 + } // end Manufacturer "HP" diff --git a/prnt/filters/hpps b/prnt/filters/hpps index c5ff8ec55..c81d254a2 100644 --- a/prnt/filters/hpps +++ b/prnt/filters/hpps @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2012 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -233,113 +233,113 @@ if 'HPBOD' in key_list: # -------------------------Other Features ---------------------------- if 'HPPJLEconoMode' in key_list: - if 'HPPJLEconoMode' in options and 'noHPPJLEconoMode' not in options: - os.write(output_fd, b"@PJL SET ECONOMODE=ON\x0a") - else: - os.write(output_fd, b"@PJL SET ECONOMODE=OFF\x0a") + if 'HPPJLEconoMode' in options and 'noHPPJLEconoMode' not in options: + os.write(output_fd, b"@PJL SET ECONOMODE=ON\x0a") + else: + os.write(output_fd, b"@PJL SET ECONOMODE=OFF\x0a") - os.write(output_fd, b"@PJL SET RESOLUTION=600\x0a") - os.write(output_fd, b"@PJL SET BITSPERPIXEL=2\x0a") + os.write(output_fd, b"@PJL SET RESOLUTION=600\x0a") + os.write(output_fd, b"@PJL SET BITSPERPIXEL=2\x0a") if 'HPPJLEconoMode2' in key_list: - try: - if opts['HPPJLEconoMode2'] == 'yes': - os.write(output_fd, b"@PJL SET ECONOMODE=ON\x0a") - elif opts['HPPJLEconoMode2'] == 'no': - os.write(output_fd, b"@PJL SET ECONOMODE=OFF\x0a") + try: + if opts['HPPJLEconoMode2'] == 'yes' or opts['HPPJLEconoMode2'] == 'on': + os.write(output_fd, b"@PJL SET ECONOMODE=ON\x0a") + elif opts['HPPJLEconoMode2'] == 'no' or opts['HPPJLEconoMode2'] == 'off': + os.write(output_fd, b"@PJL SET ECONOMODE=OFF\x0a") - os.write(output_fd, b"@PJL SET RESOLUTION=600\x0a") - os.write(output_fd, b"@PJL SET BITSPERPIXEL=1\x0a") + os.write(output_fd, b"@PJL SET RESOLUTION=600\x0a") + os.write(output_fd, b"@PJL SET BITSPERPIXEL=1\x0a") - except: - pass + except: + pass if 'HPPJLPrintQuality' in key_list: - try: - if opts['HPPJLPrintQuality'] == 'FastRes1200': - os.write(output_fd, b"@PJL SET RESOLUTION=600<0A>@PJL SET BITSPERPIXEL=2<0A>") - elif opts['HPPJLPrintQuality'] == '600dpi': - os.write(output_fd, b"@PJL SET RESOLUTION=600<0A>@PJL SET BITSPERPIXEL=1<0A>") - elif opts['HPPJLPrintQuality'] == 'ProRes1200': - os.write(output_fd, b"@PJL SET RESOLUTION=1200<0A>@PJL SET BITSPERPIXEL=1<0A>") - except: - os.write(output_fd, b"@PJL SET RESOLUTION=600<0A>@PJL SET BITSPERPIXEL=2<0A>") + try: + if opts['HPPJLPrintQuality'] == 'FastRes1200': + os.write(output_fd, b"@PJL SET RESOLUTION=600<0A>@PJL SET BITSPERPIXEL=2<0A>") + elif opts['HPPJLPrintQuality'] == '600dpi': + os.write(output_fd, b"@PJL SET RESOLUTION=600<0A>@PJL SET BITSPERPIXEL=1<0A>") + elif opts['HPPJLPrintQuality'] == 'ProRes1200': + os.write(output_fd, b"@PJL SET RESOLUTION=1200<0A>@PJL SET BITSPERPIXEL=1<0A>") + except: + os.write(output_fd, b"@PJL SET RESOLUTION=600<0A>@PJL SET BITSPERPIXEL=2<0A>") if 'HPPJLOutputMode' in key_list: - try: - if opts['HPPJLOutputMode'] == 'GeneralOffice': - os.write(output_fd, b'@PJL SET PRINTQUALITY=DRAFT\x0a') - elif opts['HPPJLOutputMode'] == 'Professional': - os.write(output_fd, b'@PJL SET PRINTQUALITY=NORMAL\x0a') - elif opts['HPPJLOutputMode'] == 'Presentation': - os.write(output_fd, b'@PJL SET PRINTQUALITY=BEST\x0a') - if opts['HPPJLOutputMode'] == 'MaximumDPI': - os.write(output_fd, b'@PJL SET PRINTQUALITY=MAX\x0a') - except: - os.write(output_fd, b'@PJL SET PRINTQUALITY=NORMAL\x0a') + try: + if opts['HPPJLOutputMode'] == 'GeneralOffice': + os.write(output_fd, b'@PJL SET PRINTQUALITY=DRAFT\x0a') + elif opts['HPPJLOutputMode'] == 'Professional': + os.write(output_fd, b'@PJL SET PRINTQUALITY=NORMAL\x0a') + elif opts['HPPJLOutputMode'] == 'Presentation': + os.write(output_fd, b'@PJL SET PRINTQUALITY=BEST\x0a') + if opts['HPPJLOutputMode'] == 'MaximumDPI': + os.write(output_fd, b'@PJL SET PRINTQUALITY=MAX\x0a') + except: + os.write(output_fd, b'@PJL SET PRINTQUALITY=NORMAL\x0a') if 'HPPJLDryTime' in key_list: - try: - if opts['HPPJLDryTime'] == '0': - os.write(output_fd, b'@PJL SET DRYTIME=0\x0a') - elif opts['HPPJLDryTime'] == 'Medium': - os.write(output_fd, b'@PJL SET DRYTIME=4\x0a') - if opts['HPPJLDryTime'] == 'Long': - os.write(output_fd, b'@PJL SET DRYTIME=7\x0a') - except: - os.write(output_fd, b'@PJL SET DRYTIME=0\x0a') + try: + if opts['HPPJLDryTime'] == '0': + os.write(output_fd, b'@PJL SET DRYTIME=0\x0a') + elif opts['HPPJLDryTime'] == 'Medium': + os.write(output_fd, b'@PJL SET DRYTIME=4\x0a') + if opts['HPPJLDryTime'] == 'Long': + os.write(output_fd, b'@PJL SET DRYTIME=7\x0a') + except: + os.write(output_fd, b'@PJL SET DRYTIME=0\x0a') if 'HPPJLSaturation' in key_list: - try: - if opts['HPPJLSaturation'] == '-2': - os.write(output_fd, b'@PJL SET SATURATION=0\x0a') - elif opts['HPPJLSaturation'] == '-1': - os.write(output_fd, b'@PJL SET SATURATION=2\x0a') - elif opts['HPPJLSaturation'] == '0': - os.write(output_fd, b'@PJL SET SATURATION=4\x0a') - elif opts['HPPJLSaturation'] == '+1': - os.write(output_fd, b'@PJL SET SATURATION=6\x0a') - if opts['HPPJLSaturation'] == '+2': - os.write(output_fd, b'@PJL SET SATURATION=8\x0a') - except: - os.write(output_fd, b'@PJL SET SATURATION=4\x0a') + try: + if opts['HPPJLSaturation'] == '-2': + os.write(output_fd, b'@PJL SET SATURATION=0\x0a') + elif opts['HPPJLSaturation'] == '-1': + os.write(output_fd, b'@PJL SET SATURATION=2\x0a') + elif opts['HPPJLSaturation'] == '0': + os.write(output_fd, b'@PJL SET SATURATION=4\x0a') + elif opts['HPPJLSaturation'] == '+1': + os.write(output_fd, b'@PJL SET SATURATION=6\x0a') + if opts['HPPJLSaturation'] == '+2': + os.write(output_fd, b'@PJL SET SATURATION=8\x0a') + except: + os.write(output_fd, b'@PJL SET SATURATION=4\x0a') if 'HPPJLInkBleed' in key_list: - try: - if opts['HPPJLInkBleed'] == '-2' or opts['HPPJLInkBleed'] == 'Default': - os.write(output_fd, b'@PJL SET INKBLEED=0\x0a') - elif opts['HPPJLInkBleed'] == '-1': - os.write(output_fd, b'@PJL SET INKBLEED=2\x0a') - elif opts['HPPJLInkBleed'] == '0' or opts['HPPJLInkBleed'] == 'Less': - os.write(output_fd, b'@PJL SET INKBLEED=4\x0a') - elif opts['HPPJLInkBleed'] == '+1': - os.write(output_fd, b'@PJL SET INKBLEED=6\x0a') - elif opts['HPPJLInkBleed'] == 'Least': - os.write(output_fd, b'@PJL SET INKBLEED=7\x0a') - elif opts['HPPJLInkBleed'] == '+2': - os.write(output_fd, b'@PJL SET INKBLEED=8\x0a') - except: - os.write(output_fd, b'@PJL SET INKBLEED=4\x0a') + try: + if opts['HPPJLInkBleed'] == '-2' or opts['HPPJLInkBleed'] == 'Default': + os.write(output_fd, b'@PJL SET INKBLEED=0\x0a') + elif opts['HPPJLInkBleed'] == '-1': + os.write(output_fd, b'@PJL SET INKBLEED=2\x0a') + elif opts['HPPJLInkBleed'] == '0' or opts['HPPJLInkBleed'] == 'Less': + os.write(output_fd, b'@PJL SET INKBLEED=4\x0a') + elif opts['HPPJLInkBleed'] == '+1': + os.write(output_fd, b'@PJL SET INKBLEED=6\x0a') + elif opts['HPPJLInkBleed'] == 'Least': + os.write(output_fd, b'@PJL SET INKBLEED=7\x0a') + elif opts['HPPJLInkBleed'] == '+2': + os.write(output_fd, b'@PJL SET INKBLEED=8\x0a') + except: + os.write(output_fd, b'@PJL SET INKBLEED=4\x0a') if 'HPPJLColorAsGray' in key_list: - try: - if opts['HPPJLColorAsGray'] == 'Off': - os.write(output_fd, b'@PJL SET GRAYSCALE=OFF\x0a') - elif opts['HPPJLColorAsGray'] == 'HighQuality': - os.write(output_fd, b'@PJL SET GRAYSCALE=COMPOSITE\x0a') - elif opts['HPPJLColorAsGray'] == 'BlackInkOnly': - os.write(output_fd, b'@PJL SET GRAYSCALE=BLACKONLY\x0a') - elif opts['HPPJLColorAsGray'] == 'yes': - os.write(output_fd, b'@PJL SET RESOLUTION=600\x0a') - os.write(output_fd, b'@PJL SET BITSPERPIXEL=8\x0a') - os.write(output_fd, b'@PJL SET GRAYSCALE=COMPOSITE\x0a') - elif opts['HPPJLColorAsGray'] == 'no': - os.write(output_fd, b'@PJL SET RESOLUTION=600\x0a') - os.write(output_fd, b'@PJL SET BITSPERPIXEL=8\x0a') - except: - os.write(output_fd, b'@PJL SET GRAYSCALE=OFF\x0a') + try: + if opts['HPPJLColorAsGray'] == 'Off' or opts['HPPJLColorAsGray'] == 'off': + os.write(output_fd, b'@PJL SET GRAYSCALE=OFF\x0a') + elif opts['HPPJLColorAsGray'] == 'HighQuality': + os.write(output_fd, b'@PJL SET GRAYSCALE=COMPOSITE\x0a') + elif opts['HPPJLColorAsGray'] == 'BlackInkOnly': + os.write(output_fd, b'@PJL SET GRAYSCALE=BLACKONLY\x0a') + elif opts['HPPJLColorAsGray'] == 'yes' or opts['HPPJLColorAsGray'] == 'on' : + os.write(output_fd, b'@PJL SET RESOLUTION=600\x0a') + os.write(output_fd, b'@PJL SET BITSPERPIXEL=8\x0a') + os.write(output_fd, b'@PJL SET GRAYSCALE=COMPOSITE\x0a') + elif opts['HPPJLColorAsGray'] == 'no': + os.write(output_fd, b'@PJL SET RESOLUTION=600\x0a') + os.write(output_fd, b'@PJL SET BITSPERPIXEL=8\x0a') + except: + os.write(output_fd, b'@PJL SET GRAYSCALE=OFF\x0a') os.write(output_fd, UEL) diff --git a/prnt/hpcups/BreakTables.cpp b/prnt/hpcups/BreakTables.cpp index a8300bbcd..4d88e6d87 100644 --- a/prnt/hpcups/BreakTables.cpp +++ b/prnt/hpcups/BreakTables.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ breaks_open.cpp : Open Source Imaging Error Diffusion Tables - Copyright (c) 1994 - 2001, Hewlett-Packard Co. + Copyright (c) 1994 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/ColorMatcher.cpp b/prnt/hpcups/ColorMatcher.cpp index c910fdb79..2384ec65a 100644 --- a/prnt/hpcups/ColorMatcher.cpp +++ b/prnt/hpcups/ColorMatcher.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ colormatch.cpp : Implimentation for the ColorMatcher class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/ColorMatcher.h b/prnt/hpcups/ColorMatcher.h index 4113c9307..17c17a8ae 100644 --- a/prnt/hpcups/ColorMatcher.h +++ b/prnt/hpcups/ColorMatcher.h @@ -1,7 +1,7 @@ /*****************************************************************************\ colormatch.h : Interface for the ColorMatcher class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/CommonDefinitions.h b/prnt/hpcups/CommonDefinitions.h index 42b8912f6..082aec9df 100644 --- a/prnt/hpcups/CommonDefinitions.h +++ b/prnt/hpcups/CommonDefinitions.h @@ -1,7 +1,7 @@ /*****************************************************************************\ CommonDefinitions.h : common header - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Compressor.cpp b/prnt/hpcups/Compressor.cpp index 7dbb481bc..7fbbcd0b6 100644 --- a/prnt/hpcups/Compressor.cpp +++ b/prnt/hpcups/Compressor.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ Compressor.cpp : Implementation of Compressor class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Compressor.h b/prnt/hpcups/Compressor.h index adc281d9e..612c945c2 100644 --- a/prnt/hpcups/Compressor.h +++ b/prnt/hpcups/Compressor.h @@ -1,7 +1,7 @@ /*****************************************************************************\ Compressor.h : Interface for Compressor class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Encapsulator.cpp b/prnt/hpcups/Encapsulator.cpp index dd0521b68..2672b6d5b 100644 --- a/prnt/hpcups/Encapsulator.cpp +++ b/prnt/hpcups/Encapsulator.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ Encapsulator.cpp : Encapsulator class implementation - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Encapsulator.h b/prnt/hpcups/Encapsulator.h index 50587bce1..4d6a0ff66 100644 --- a/prnt/hpcups/Encapsulator.h +++ b/prnt/hpcups/Encapsulator.h @@ -1,7 +1,7 @@ /*****************************************************************************\ Encapsulator.h : Interface for the Encapsulator class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/EncapsulatorFactory.cpp b/prnt/hpcups/EncapsulatorFactory.cpp index d1ed1641c..0f72fab2c 100644 --- a/prnt/hpcups/EncapsulatorFactory.cpp +++ b/prnt/hpcups/EncapsulatorFactory.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ EncapsulatorFactory.cpp : Implementation of EncapsulatorFactory class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/EncapsulatorFactory.h b/prnt/hpcups/EncapsulatorFactory.h index bfed3cc15..fe636249c 100644 --- a/prnt/hpcups/EncapsulatorFactory.h +++ b/prnt/hpcups/EncapsulatorFactory.h @@ -1,7 +1,7 @@ /*****************************************************************************\ EncapsulatorFactory.h : Interface for the EncapsulatorFactory class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/ErnieFilter.cpp b/prnt/hpcups/ErnieFilter.cpp index 6207fac9a..bcf1fe81e 100644 --- a/prnt/hpcups/ErnieFilter.cpp +++ b/prnt/hpcups/ErnieFilter.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 1996 - 2008, Hewlett-Packard Development Company, L.P. +// Copyright (c) 1996 - 2008, HP Development Company, L.P. // All rights reserved. // // This software is licensed solely for use with HP products. Redistribution @@ -11,11 +11,11 @@ // - Redistributions in binary form must reproduce the above copyright // notice, this list of conditions and the following disclaimer in the // documentation and/or other materials provided with the distribution. -// - Neither the name of Hewlett-Packard nor the names of its contributors +// - Neither the name of HP nor the names of its contributors // may be used to endorse or promote products derived from this software // without specific prior written permission. // - Redistributors making defect corrections to source code grant to -// Hewlett-Packard the right to use and redistribute such defect +// HP the right to use and redistribute such defect // corrections. // // This software contains technology licensed from third parties; use with @@ -24,7 +24,7 @@ // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // 'AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED // TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL HEWLETT-PACKARD OR ITS +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL HP OR ITS // CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, // EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, // PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; diff --git a/prnt/hpcups/ErnieFilter.h b/prnt/hpcups/ErnieFilter.h index 66bdf1514..64c08eb18 100644 --- a/prnt/hpcups/ErnieFilter.h +++ b/prnt/hpcups/ErnieFilter.h @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 1996 - 2008, Hewlett-Packard Development Company, L.P. +// Copyright (c) 1996 - 2008, HP Development Company, L.P. // All rights reserved. // // This software is licensed solely for use with HP products. Redistribution @@ -11,11 +11,11 @@ // - Redistributions in binary form must reproduce the above copyright // notice, this list of conditions and the following disclaimer in the // documentation and/or other materials provided with the distribution. -// - Neither the name of Hewlett-Packard nor the names of its contributors +// - Neither the name of HP nor the names of its contributors // may be used to endorse or promote products derived from this software // without specific prior written permission. // - Redistributors making defect corrections to source code grant to -// Hewlett-Packard the right to use and redistribute such defect +// HP the right to use and redistribute such defect // corrections. // // This software contains technology licensed from third parties; use with @@ -24,7 +24,7 @@ // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // 'AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED // TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL HEWLETT-PACKARD OR ITS +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL HP OR ITS // CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, // EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, // PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp index af250a8c4..9ea095381 100644 --- a/prnt/hpcups/HPCupsFilter.cpp +++ b/prnt/hpcups/HPCupsFilter.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ HPCupsFilter.cpp : Interface for HPCupsFilter class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h index 029b1c3e8..ff5548e20 100644 --- a/prnt/hpcups/HPCupsFilter.h +++ b/prnt/hpcups/HPCupsFilter.h @@ -1,7 +1,7 @@ /*****************************************************************************\ HPCupsFilter.h : Interface for HPCupsFilter class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Halftoner.cpp b/prnt/hpcups/Halftoner.cpp index b359c6bab..fbe31ab17 100644 --- a/prnt/hpcups/Halftoner.cpp +++ b/prnt/hpcups/Halftoner.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ Halftoner.cpp : Implimentation for the Halftoner class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Halftoner.h b/prnt/hpcups/Halftoner.h index 9e676846a..e9782420a 100644 --- a/prnt/hpcups/Halftoner.h +++ b/prnt/hpcups/Halftoner.h @@ -1,7 +1,7 @@ /*****************************************************************************\ Halftoner.h : Interface for the Halftoner class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Hbpl1.cpp b/prnt/hpcups/Hbpl1.cpp index c701a7527..6fa798148 100644 --- a/prnt/hpcups/Hbpl1.cpp +++ b/prnt/hpcups/Hbpl1.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ Hbpl1.cpp : Implementation for the Hbpl1 class - Copyright (c) 1996 - 2012, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Hbpl1.h b/prnt/hpcups/Hbpl1.h index 46a35a92b..48d2554ef 100644 --- a/prnt/hpcups/Hbpl1.h +++ b/prnt/hpcups/Hbpl1.h @@ -1,7 +1,7 @@ /*****************************************************************************\ Hbpl1.h : Interface for the Hbpl1 class - Copyright (c) 1996 - 2012, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Hbpl1_Wrapper.h b/prnt/hpcups/Hbpl1_Wrapper.h index 906c5e061..1527b5abb 100644 --- a/prnt/hpcups/Hbpl1_Wrapper.h +++ b/prnt/hpcups/Hbpl1_Wrapper.h @@ -1,7 +1,7 @@ /*****************************************************************************\ Pclm_wrapper.h : Interface for the PCLm class - Copyright (c) 1996 - 2012, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Job.cpp b/prnt/hpcups/Job.cpp index 90355688b..8be0a57c5 100644 --- a/prnt/hpcups/Job.cpp +++ b/prnt/hpcups/Job.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ Job.cpp : Implementation of Job class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Job.h b/prnt/hpcups/Job.h index 4b30bac5e..5b83ec7f2 100644 --- a/prnt/hpcups/Job.h +++ b/prnt/hpcups/Job.h @@ -1,7 +1,7 @@ /*****************************************************************************\ Job.h : Interface for the Job class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/LJColor.cpp b/prnt/hpcups/LJColor.cpp index 38f8050ba..42b34a4a2 100644 --- a/prnt/hpcups/LJColor.cpp +++ b/prnt/hpcups/LJColor.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ LJColor.cpp : Implementation of LJColor class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/LJColor.h b/prnt/hpcups/LJColor.h index 57aaf9f27..bd72cf8ba 100644 --- a/prnt/hpcups/LJColor.h +++ b/prnt/hpcups/LJColor.h @@ -1,7 +1,7 @@ /*****************************************************************************\ LJColor.h : Interface for LJColor class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/LJFastRaster.cpp b/prnt/hpcups/LJFastRaster.cpp index 7a4371af3..86ac1ef1d 100644 --- a/prnt/hpcups/LJFastRaster.cpp +++ b/prnt/hpcups/LJFastRaster.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ LJFastRaster.cpp : Implementation of LJFastRaster class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/LJFastRaster.h b/prnt/hpcups/LJFastRaster.h index ded95fe04..dfc2496df 100644 --- a/prnt/hpcups/LJFastRaster.h +++ b/prnt/hpcups/LJFastRaster.h @@ -1,7 +1,7 @@ /*****************************************************************************\ LJFastRaster.h : Interface for LJFastRaster class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/LJJetReady.cpp b/prnt/hpcups/LJJetReady.cpp index 991279f5e..855ed3d35 100644 --- a/prnt/hpcups/LJJetReady.cpp +++ b/prnt/hpcups/LJJetReady.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ LJJetReady.cpp : Implementation of LJJetReady class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/LJJetReady.h b/prnt/hpcups/LJJetReady.h index 2401303f6..38a9539a9 100644 --- a/prnt/hpcups/LJJetReady.h +++ b/prnt/hpcups/LJJetReady.h @@ -1,7 +1,7 @@ /*****************************************************************************\ LJJetReady.h : Interface for LJJetReady class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/LJMono.cpp b/prnt/hpcups/LJMono.cpp index b6aebd40f..053a6c7f5 100644 --- a/prnt/hpcups/LJMono.cpp +++ b/prnt/hpcups/LJMono.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ LJMono.cpp : Implementation of LJMono class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/LJMono.h b/prnt/hpcups/LJMono.h index a040110ac..6dfd3bfca 100644 --- a/prnt/hpcups/LJMono.h +++ b/prnt/hpcups/LJMono.h @@ -1,7 +1,7 @@ /*****************************************************************************\ LJMono.h : Interface for LJMono class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/LJZjStream.cpp b/prnt/hpcups/LJZjStream.cpp index 2a3909b63..9b06cf833 100644 --- a/prnt/hpcups/LJZjStream.cpp +++ b/prnt/hpcups/LJZjStream.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ LJZjStream.cpp : Implementation for the LJZjStream class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/LJZjStream.h b/prnt/hpcups/LJZjStream.h index cbdcf29be..7a721b982 100644 --- a/prnt/hpcups/LJZjStream.h +++ b/prnt/hpcups/LJZjStream.h @@ -1,7 +1,7 @@ /*****************************************************************************\ LJZjStream.h : Interface for the LJZjStream class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/LJZxStream.cpp b/prnt/hpcups/LJZxStream.cpp index 623ca08f5..a20be1702 100644 --- a/prnt/hpcups/LJZxStream.cpp +++ b/prnt/hpcups/LJZxStream.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ LJZxStream.cpp : Implementation for the LJZxStream class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/LJZxStream.h b/prnt/hpcups/LJZxStream.h index bd3399f8f..bebcacd8c 100644 --- a/prnt/hpcups/LJZxStream.h +++ b/prnt/hpcups/LJZxStream.h @@ -1,7 +1,7 @@ /*****************************************************************************\ LJZxStream.h : Interface for the LJZxStream class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Lidil.cpp b/prnt/hpcups/Lidil.cpp index e2339d040..347728502 100644 --- a/prnt/hpcups/Lidil.cpp +++ b/prnt/hpcups/Lidil.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ Lidil.cpp : Implementation of Lidil class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Lidil.h b/prnt/hpcups/Lidil.h index 77b5e6bcf..cb3cfaaf0 100644 --- a/prnt/hpcups/Lidil.h +++ b/prnt/hpcups/Lidil.h @@ -1,7 +1,7 @@ /*****************************************************************************\ Lidil.h : Interface for Lidil class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/LidilCompress.cpp b/prnt/hpcups/LidilCompress.cpp index 2dc8fbf0e..d0bed8238 100644 --- a/prnt/hpcups/LidilCompress.cpp +++ b/prnt/hpcups/LidilCompress.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ LidilCompress.cpp : Implementation of LidilCompress class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/LidilCompress.h b/prnt/hpcups/LidilCompress.h index f819b466e..aa1ba52b3 100644 --- a/prnt/hpcups/LidilCompress.h +++ b/prnt/hpcups/LidilCompress.h @@ -1,7 +1,7 @@ /*****************************************************************************\ LidilCompress.h : Defnition of LidilCompress class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Mode10.cpp b/prnt/hpcups/Mode10.cpp index 9fa3f6559..4d1dfe469 100644 --- a/prnt/hpcups/Mode10.cpp +++ b/prnt/hpcups/Mode10.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ Mode10.cpp : Implementation of Mode10 class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Mode10.h b/prnt/hpcups/Mode10.h index 825925e95..2e8233377 100644 --- a/prnt/hpcups/Mode10.h +++ b/prnt/hpcups/Mode10.h @@ -1,7 +1,7 @@ /*****************************************************************************\ Mode10.h : Interface for the Mode10 class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Mode2.cpp b/prnt/hpcups/Mode2.cpp index 15980252b..8901e8da8 100644 --- a/prnt/hpcups/Mode2.cpp +++ b/prnt/hpcups/Mode2.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ Mode2.cpp : implementaiton of Mode2 class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Mode2.h b/prnt/hpcups/Mode2.h index 241acaf86..60e53f1a8 100644 --- a/prnt/hpcups/Mode2.h +++ b/prnt/hpcups/Mode2.h @@ -1,7 +1,7 @@ /*****************************************************************************\ Mode2.cpp : implementaiton of Mode2 class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Mode3.cpp b/prnt/hpcups/Mode3.cpp index a6334bfb5..4ccbc94d8 100644 --- a/prnt/hpcups/Mode3.cpp +++ b/prnt/hpcups/Mode3.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ Mode3.cpp : Implimentation for the Mode3 class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Mode3.h b/prnt/hpcups/Mode3.h index b5677a4ff..1fe2449b6 100644 --- a/prnt/hpcups/Mode3.h +++ b/prnt/hpcups/Mode3.h @@ -1,7 +1,7 @@ /*****************************************************************************\ Mode3.cpp : implementaiton of Mode3 class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Mode9.cpp b/prnt/hpcups/Mode9.cpp index 2fe1e14c6..94ff571b6 100644 --- a/prnt/hpcups/Mode9.cpp +++ b/prnt/hpcups/Mode9.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ Mode9.cpp : implementaiton of Mode9 class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Mode9.h b/prnt/hpcups/Mode9.h index 9c5acbe23..1e482c1a9 100644 --- a/prnt/hpcups/Mode9.h +++ b/prnt/hpcups/Mode9.h @@ -1,7 +1,7 @@ /*****************************************************************************\ Mode9.h : Interface for the Mode9 class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/ModeDeltaPlus.cpp b/prnt/hpcups/ModeDeltaPlus.cpp index a4d082ca5..4552f4ae1 100644 --- a/prnt/hpcups/ModeDeltaPlus.cpp +++ b/prnt/hpcups/ModeDeltaPlus.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ ModeDeltaPlus.cpp : Implementation of ModeDeltaPlus class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/ModeDeltaPlus.h b/prnt/hpcups/ModeDeltaPlus.h index 489139479..a272311e4 100644 --- a/prnt/hpcups/ModeDeltaPlus.h +++ b/prnt/hpcups/ModeDeltaPlus.h @@ -1,7 +1,7 @@ /*****************************************************************************\ DeltaPlus.h : Interface for the DeltaPlus class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/ModeJbig.cpp b/prnt/hpcups/ModeJbig.cpp index 0772ab37e..475587325 100644 --- a/prnt/hpcups/ModeJbig.cpp +++ b/prnt/hpcups/ModeJbig.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ ModeJbig.cpp : Implementation for the ModeJbig class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/ModeJbig.h b/prnt/hpcups/ModeJbig.h index 34faf682e..cc799f3b8 100644 --- a/prnt/hpcups/ModeJbig.h +++ b/prnt/hpcups/ModeJbig.h @@ -1,7 +1,7 @@ /*****************************************************************************\ ModeJbig.h : Interface for the ModeJbig class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/ModeJpeg.cpp b/prnt/hpcups/ModeJpeg.cpp index 4e7ef6752..361d6d718 100644 --- a/prnt/hpcups/ModeJpeg.cpp +++ b/prnt/hpcups/ModeJpeg.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ ModeJpeg.cpp : Jpeg compressor implementation - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/ModeJpeg.h b/prnt/hpcups/ModeJpeg.h index 31c300563..aab873e36 100644 --- a/prnt/hpcups/ModeJpeg.h +++ b/prnt/hpcups/ModeJpeg.h @@ -1,7 +1,7 @@ /*****************************************************************************\ ModeJpeg.h : Jpeg compressor definitions - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Pcl3.cpp b/prnt/hpcups/Pcl3.cpp index 7a7a5abb5..7a5ca190d 100644 --- a/prnt/hpcups/Pcl3.cpp +++ b/prnt/hpcups/Pcl3.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ Pcl3.cpp : Implementation of Pcl3 class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Pcl3.h b/prnt/hpcups/Pcl3.h index fd83aa38e..980120a97 100644 --- a/prnt/hpcups/Pcl3.h +++ b/prnt/hpcups/Pcl3.h @@ -1,7 +1,7 @@ /*****************************************************************************\ Pcl3G.h : Interface for Pcl3 class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Pcl3Gui.cpp b/prnt/hpcups/Pcl3Gui.cpp index 94c81714f..782c09c53 100644 --- a/prnt/hpcups/Pcl3Gui.cpp +++ b/prnt/hpcups/Pcl3Gui.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ Pcl3Gui.cpp : Implementation of Pcl3Gui class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Pcl3Gui.h b/prnt/hpcups/Pcl3Gui.h index 97b5b3203..aac289d5c 100644 --- a/prnt/hpcups/Pcl3Gui.h +++ b/prnt/hpcups/Pcl3Gui.h @@ -1,7 +1,7 @@ /*****************************************************************************\ Pcl3Gui.h : Interface for Pcl3Gui class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Pcl3Gui2.cpp b/prnt/hpcups/Pcl3Gui2.cpp index 43e132d3b..893bcfd7c 100644 --- a/prnt/hpcups/Pcl3Gui2.cpp +++ b/prnt/hpcups/Pcl3Gui2.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ Pcl3Gui2.cpp : Implementation of Pcl3Gui2 class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Pcl3Gui2.h b/prnt/hpcups/Pcl3Gui2.h index aae3d6a87..890707831 100644 --- a/prnt/hpcups/Pcl3Gui2.h +++ b/prnt/hpcups/Pcl3Gui2.h @@ -1,7 +1,7 @@ /*****************************************************************************\ Pcl3Gui2.h : Interface for Pcl3Gui2 class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Pipeline.cpp b/prnt/hpcups/Pipeline.cpp index c80c4a1b4..324c67faf 100644 --- a/prnt/hpcups/Pipeline.cpp +++ b/prnt/hpcups/Pipeline.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ Pipeline.cpp : Implementation of Pipeline class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Pipeline.h b/prnt/hpcups/Pipeline.h index 73dca0d6f..bf6c81e74 100644 --- a/prnt/hpcups/Pipeline.h +++ b/prnt/hpcups/Pipeline.h @@ -1,7 +1,7 @@ /*****************************************************************************\ Pipeline.h : Interface for the Pipeline class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/PrinterCommands.h b/prnt/hpcups/PrinterCommands.h index fa2fd71f4..26a32f409 100644 --- a/prnt/hpcups/PrinterCommands.h +++ b/prnt/hpcups/PrinterCommands.h @@ -1,7 +1,7 @@ /*****************************************************************************\ PrinterCommands.h : Printer command sequences - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Processor.cpp b/prnt/hpcups/Processor.cpp index edb8ab668..712e5bfda 100644 --- a/prnt/hpcups/Processor.cpp +++ b/prnt/hpcups/Processor.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ Processor.cpp : Implementation of Processor class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Processor.h b/prnt/hpcups/Processor.h index 4a0a84157..c47738aae 100644 --- a/prnt/hpcups/Processor.h +++ b/prnt/hpcups/Processor.h @@ -1,7 +1,7 @@ /*****************************************************************************\ Processor.h : Interface for the Processor class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/QuickConnect.cpp b/prnt/hpcups/QuickConnect.cpp index 001e985b7..1b2e3902c 100644 --- a/prnt/hpcups/QuickConnect.cpp +++ b/prnt/hpcups/QuickConnect.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ QuickConnect.cpp : Implementation of QuickConnect class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/QuickConnect.h b/prnt/hpcups/QuickConnect.h index 1ff5114dc..24a52b0d6 100644 --- a/prnt/hpcups/QuickConnect.h +++ b/prnt/hpcups/QuickConnect.h @@ -1,7 +1,7 @@ /*****************************************************************************\ QuickConnect.h : Interface for Pcl3Gui2 class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/RasterSender.cpp b/prnt/hpcups/RasterSender.cpp index de2ec6da1..10dd88ed8 100644 --- a/prnt/hpcups/RasterSender.cpp +++ b/prnt/hpcups/RasterSender.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ RasterSender.cpp : Implementation of RasterSender class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/RasterSender.h b/prnt/hpcups/RasterSender.h index af431581e..843713a01 100644 --- a/prnt/hpcups/RasterSender.h +++ b/prnt/hpcups/RasterSender.h @@ -1,7 +1,7 @@ /*****************************************************************************\ RasterSender.h : Interface for the RasterSender class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Scaler.cpp b/prnt/hpcups/Scaler.cpp index c7038d12f..11192da45 100644 --- a/prnt/hpcups/Scaler.cpp +++ b/prnt/hpcups/Scaler.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ Scaler.cpp : Implimentation for the Scaler class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/SystemServices.cpp b/prnt/hpcups/SystemServices.cpp index 4f2ecc46e..f22783733 100644 --- a/prnt/hpcups/SystemServices.cpp +++ b/prnt/hpcups/SystemServices.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ SystemServices.cpp : Implementation of SystemServices class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/SystemServices.h b/prnt/hpcups/SystemServices.h index f19bc03aa..581cab12f 100644 --- a/prnt/hpcups/SystemServices.h +++ b/prnt/hpcups/SystemServices.h @@ -1,7 +1,7 @@ /*****************************************************************************\ SystemServices.h : interface for SystemServices class - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Utils.cpp b/prnt/hpcups/Utils.cpp index a752dd9d7..2432aeca9 100644 --- a/prnt/hpcups/Utils.cpp +++ b/prnt/hpcups/Utils.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ Utils.cpp : implementaiton of utility functions - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/Utils.h b/prnt/hpcups/Utils.h index f66c8e8a0..c4210d429 100644 --- a/prnt/hpcups/Utils.h +++ b/prnt/hpcups/Utils.h @@ -1,7 +1,7 @@ /*****************************************************************************\ Utils.cpp : implementaiton of utility functions - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/dbuscomm.cpp b/prnt/hpcups/dbuscomm.cpp index dc41960c8..ad53d7334 100644 --- a/prnt/hpcups/dbuscomm.cpp +++ b/prnt/hpcups/dbuscomm.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dbuscomm.cpp : Interface for DBusCommunicator class - Copyright (c) 1996 - 2011, Hewlett-Packard Co. + Copyright (c) 1996 - 2011, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/dbuscomm.h b/prnt/hpcups/dbuscomm.h index 9932473b9..230a70118 100644 --- a/prnt/hpcups/dbuscomm.h +++ b/prnt/hpcups/dbuscomm.h @@ -1,7 +1,7 @@ /*****************************************************************************\ dbuscomm.h : Interface for DBusCommunicator class - Copyright (c) 1996 - 2011, Hewlett-Packard Co. + Copyright (c) 1996 - 2011, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/dj3320ColorMaps.cpp b/prnt/hpcups/dj3320ColorMaps.cpp index a51782a1a..8dfe17a50 100644 --- a/prnt/hpcups/dj3320ColorMaps.cpp +++ b/prnt/hpcups/dj3320ColorMaps.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj3320ColorMaps.cpp : Implimentation for the DJ3320 color maps - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary formsUL, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright noticeUL, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/dj3600ColorMaps.cpp b/prnt/hpcups/dj3600ColorMaps.cpp index 23a82a221..04abdcdc3 100644 --- a/prnt/hpcups/dj3600ColorMaps.cpp +++ b/prnt/hpcups/dj3600ColorMaps.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj3600ColorMaps.cpp : Implimentation for the DJ3600 color maps - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/dj400ColorMaps.cpp b/prnt/hpcups/dj400ColorMaps.cpp index b8e3a19f9..d0e5abc83 100644 --- a/prnt/hpcups/dj400ColorMaps.cpp +++ b/prnt/hpcups/dj400ColorMaps.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj400ColorMaps.cpp : Color maps for DJ400 - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/dj4100ColorMaps.cpp b/prnt/hpcups/dj4100ColorMaps.cpp index 33cd30991..21eb6279c 100644 --- a/prnt/hpcups/dj4100ColorMaps.cpp +++ b/prnt/hpcups/dj4100ColorMaps.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj4100_cmap.cpp : Implimentation for the DJ4100 color maps - Copyright (c) 1996 - 2006, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/dj600ColorMaps.cpp b/prnt/hpcups/dj600ColorMaps.cpp index 91b7cf9a5..37529c24b 100644 --- a/prnt/hpcups/dj600ColorMaps.cpp +++ b/prnt/hpcups/dj600ColorMaps.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj600ColorMaps.cpp : Color maps for the DJ600 - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/dj8xxColorMaps.cpp b/prnt/hpcups/dj8xxColorMaps.cpp index 4d71174cf..2fad2c54c 100644 --- a/prnt/hpcups/dj8xxColorMaps.cpp +++ b/prnt/hpcups/dj8xxColorMaps.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj8xxColorMaps.cpp : Color maps for DJ850/855,870, 895, 825/845, 890 - Copyright (c) 1996 - 2009, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/dj970ColorMaps.cpp b/prnt/hpcups/dj970ColorMaps.cpp index 33b1a09bb..a1f5d37d0 100644 --- a/prnt/hpcups/dj970ColorMaps.cpp +++ b/prnt/hpcups/dj970ColorMaps.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj970_maps.cpp : Color maps for DJ970 - Copyright (c) 1996 - 2001UL, Hewlett-Packard Co. + Copyright (c) 1996 - 2001UL, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/hpjbig_wrapper.h b/prnt/hpcups/hpjbig_wrapper.h index 230e29805..caea0e315 100644 --- a/prnt/hpcups/hpjbig_wrapper.h +++ b/prnt/hpcups/hpjbig_wrapper.h @@ -1,7 +1,7 @@ /*****************************************************************************\ hpjbig_wrapper.h : header file for hpjbig_wrapper.c - Copyright (c) 1996 - 2007, Hewlett-Packard Co. + Copyright (c) 1996 - 2007, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpcups/resources.h b/prnt/hpcups/resources.h index ee8f6606b..49f1a726a 100644 --- a/prnt/hpcups/resources.h +++ b/prnt/hpcups/resources.h @@ -1,7 +1,7 @@ /*****************************************************************************\ resources.h : externs for open source imaging - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/PrinterProperties.cpp b/prnt/hpijs/PrinterProperties.cpp index 9dcf07222..716a98f77 100644 --- a/prnt/hpijs/PrinterProperties.cpp +++ b/prnt/hpijs/PrinterProperties.cpp @@ -1,5 +1,5 @@ /*****************************************************************************\ - Copyright (c) 2002 - 2006, Hewlett-Packard Co. + Copyright (c) 2002 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -10,7 +10,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/PrinterProperties.h b/prnt/hpijs/PrinterProperties.h index 83a4947a8..19b392ad7 100644 --- a/prnt/hpijs/PrinterProperties.h +++ b/prnt/hpijs/PrinterProperties.h @@ -1,5 +1,5 @@ /*****************************************************************************\ - Copyright (c) 2002 - 2006, Hewlett-Packard Co. + Copyright (c) 2002 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -10,7 +10,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/apollo21xx.cpp b/prnt/hpijs/apollo21xx.cpp index 77243365a..2af1d2478 100644 --- a/prnt/hpijs/apollo21xx.cpp +++ b/prnt/hpijs/apollo21xx.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ apollo21xx.cpp : Implimentation for the Apollo21xx class - Copyright (c) 2000, 2001, Hewlett-Packard Co. + Copyright (c) 2000, 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/apollo21xx.h b/prnt/hpijs/apollo21xx.h index 6c13b4790..bf9013fb1 100644 --- a/prnt/hpijs/apollo21xx.h +++ b/prnt/hpijs/apollo21xx.h @@ -1,7 +1,7 @@ /*****************************************************************************\ apollo21xx.h : Interface for the Apollo21xx class - Copyright (c) 2000, 2001, Hewlett-Packard Co. + Copyright (c) 2000, 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/apollo2560.cpp b/prnt/hpijs/apollo2560.cpp index a76c5dd75..d4519810f 100644 --- a/prnt/hpijs/apollo2560.cpp +++ b/prnt/hpijs/apollo2560.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ apollo2560.cpp : Implimentation for the Apollo2560 class - Copyright (c) 2000, 2001, Hewlett-Packard Co. + Copyright (c) 2000, 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/apollo2560.h b/prnt/hpijs/apollo2560.h index add781bf9..bf3e6bf64 100644 --- a/prnt/hpijs/apollo2560.h +++ b/prnt/hpijs/apollo2560.h @@ -1,7 +1,7 @@ /*****************************************************************************\ apollo2560.h : Interface for the Apollo2560 class - Copyright (c) 2000, 2001, Hewlett-Packard Co. + Copyright (c) 2000, 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/apollo2xxx.cpp b/prnt/hpijs/apollo2xxx.cpp index 51727a213..d46ca87d6 100644 --- a/prnt/hpijs/apollo2xxx.cpp +++ b/prnt/hpijs/apollo2xxx.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ apollo2xxx.cpp : Implimentation for the Apollo2xxx class - Copyright (c) 2000, 2001, Hewlett-Packard Co. + Copyright (c) 2000, 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/apollo2xxx.h b/prnt/hpijs/apollo2xxx.h index 3e40bb394..7688470b5 100644 --- a/prnt/hpijs/apollo2xxx.h +++ b/prnt/hpijs/apollo2xxx.h @@ -1,7 +1,7 @@ /*****************************************************************************\ apollo2xxx.h : Interface for the Apollo2xxx class - Copyright (c) 2000, 2001, Hewlett-Packard Co. + Copyright (c) 2000, 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/breaks_open.cpp b/prnt/hpijs/breaks_open.cpp index fbd37f86d..ebfdb95d0 100644 --- a/prnt/hpijs/breaks_open.cpp +++ b/prnt/hpijs/breaks_open.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ breaks_open.cpp : Open Source Imaging Error Diffusion Tables - Copyright (c) 1994 - 2001, Hewlett-Packard Co. + Copyright (c) 1994 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/bug.h b/prnt/hpijs/bug.h index 1caf238f4..90203ad88 100644 --- a/prnt/hpijs/bug.h +++ b/prnt/hpijs/bug.h @@ -2,7 +2,7 @@ bug.h - debug support - (c) 2009 Copyright Hewlett-Packard Development Company, LP + (c) 2009 Copyright HP Development Company, LP Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/prnt/hpijs/capture.cpp b/prnt/hpijs/capture.cpp index afca47fb6..748841891 100644 --- a/prnt/hpijs/capture.cpp +++ b/prnt/hpijs/capture.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ capture.cpp : Implimentation for capturing functions - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/colormatch.cpp b/prnt/hpijs/colormatch.cpp index 0c98b770f..af13b786a 100644 --- a/prnt/hpijs/colormatch.cpp +++ b/prnt/hpijs/colormatch.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ colormatch.cpp : Implimentation for the ColorMatcher class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/colormatch.h b/prnt/hpijs/colormatch.h index d58fc1fb1..f7161d4fb 100644 --- a/prnt/hpijs/colormatch.h +++ b/prnt/hpijs/colormatch.h @@ -1,7 +1,7 @@ /*****************************************************************************\ colormatch.h : Interface for the ColorMatcher class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/colormatcher_open.cpp b/prnt/hpijs/colormatcher_open.cpp index bcb18d569..e8beb34dd 100644 --- a/prnt/hpijs/colormatcher_open.cpp +++ b/prnt/hpijs/colormatcher_open.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ colormatcher_open.cpp : Implimentation for the ColorMatcher_Open class - Copyright (c) 1996 - 2002, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/colormatcher_open.h b/prnt/hpijs/colormatcher_open.h index ec8c42d25..7e0af23f8 100644 --- a/prnt/hpijs/colormatcher_open.h +++ b/prnt/hpijs/colormatcher_open.h @@ -1,7 +1,7 @@ /*****************************************************************************\ colormatcher_open.h : Interface for the ColorMatcher_Open class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/compression.cpp b/prnt/hpijs/compression.cpp index 7ccc5f79d..fcac793b6 100644 --- a/prnt/hpijs/compression.cpp +++ b/prnt/hpijs/compression.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ compression.cpp : Implimentation for the Compressor class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/compression.h b/prnt/hpijs/compression.h index 499a36a59..81882caa8 100644 --- a/prnt/hpijs/compression.h +++ b/prnt/hpijs/compression.h @@ -1,7 +1,7 @@ /*****************************************************************************\ compression.h : Interface for BertCompress and BertUncompress - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/config.h b/prnt/hpijs/config.h index 7fe03be0b..78fe95f3f 100644 --- a/prnt/hpijs/config.h +++ b/prnt/hpijs/config.h @@ -1,7 +1,7 @@ /*****************************************************************************\ config.h : configuration include header - Copyright (c) 1996 - 2002, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/context.h b/prnt/hpijs/context.h index fa07a6ffb..97e04fea3 100644 --- a/prnt/hpijs/context.h +++ b/prnt/hpijs/context.h @@ -1,7 +1,7 @@ /*****************************************************************************\ context.h : Interface/Implimentation for the PrintContext class - Copyright (c) 1996 - 2008, Hewlett-Packard Co. + Copyright (c) 1996 - 2008, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/context2.cpp b/prnt/hpijs/context2.cpp index 92a0089f1..c3df48258 100644 --- a/prnt/hpijs/context2.cpp +++ b/prnt/hpijs/context2.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ context.cpp : Implimentation for the PrintContext class - Copyright (c) 1996 - 2008, Hewlett-Packard Co. + Copyright (c) 1996 - 2008, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/create_so.cpp b/prnt/hpijs/create_so.cpp index 295292bbb..b1e6cb82e 100644 --- a/prnt/hpijs/create_so.cpp +++ b/prnt/hpijs/create_so.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ create_so.cpp : Open Source Imaging Create Scaler implimentation - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/creator.cpp b/prnt/hpijs/creator.cpp index fe6f2badb..0d2b6b083 100644 --- a/prnt/hpijs/creator.cpp +++ b/prnt/hpijs/creator.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ creator.cpp : Open Source Imaging Halftoner and ColorMatcher Creation - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/debug.h b/prnt/hpijs/debug.h index e31ab47fb..ea5e8a83d 100644 --- a/prnt/hpijs/debug.h +++ b/prnt/hpijs/debug.h @@ -1,7 +1,7 @@ /*****************************************************************************\ debug.h : Interface for debuging support - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj3320.cpp b/prnt/hpijs/dj3320.cpp index d94516124..496be98eb 100644 --- a/prnt/hpijs/dj3320.cpp +++ b/prnt/hpijs/dj3320.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj3320.cpp : Implimentation for the DJ3320 class - Copyright (c) 2001 - 2006, Hewlett-Packard Co. + Copyright (c) 2001 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj3320.h b/prnt/hpijs/dj3320.h index 05182a273..1f9966b3d 100644 --- a/prnt/hpijs/dj3320.h +++ b/prnt/hpijs/dj3320.h @@ -1,7 +1,7 @@ /*****************************************************************************\ DJ3320.h : Interface for the DJ3320 class - Copyright (c) 2001 - 2002, Hewlett-Packard Co. + Copyright (c) 2001 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj3320_cmap.cpp b/prnt/hpijs/dj3320_cmap.cpp index 4892ea715..f511d7849 100644 --- a/prnt/hpijs/dj3320_cmap.cpp +++ b/prnt/hpijs/dj3320_cmap.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj3320_cmap.cpp : Implimentation for the DJ3320 color maps - Copyright (c) 1996 - 2003UL, Hewlett-Packard Co. + Copyright (c) 1996 - 2003UL, HP Co. All rights reserved. Redistribution and use in source and binary formsUL, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright noticeUL, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj350.cpp b/prnt/hpijs/dj350.cpp index 4f1a75ec8..751aeb12b 100644 --- a/prnt/hpijs/dj350.cpp +++ b/prnt/hpijs/dj350.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj350.cpp : Implimentation for the DJ350 class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj350.h b/prnt/hpijs/dj350.h index 9eae97a5c..4e222e731 100644 --- a/prnt/hpijs/dj350.h +++ b/prnt/hpijs/dj350.h @@ -1,7 +1,7 @@ /*****************************************************************************\ dj350.h : Interface for the DJ350 class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj3600.cpp b/prnt/hpijs/dj3600.cpp index 366771468..58ca3f389 100644 --- a/prnt/hpijs/dj3600.cpp +++ b/prnt/hpijs/dj3600.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj3600.cpp : Implimentation for the DJ3600 class - Copyright (c) 2003-2003, Hewlett-Packard Co. + Copyright (c) 2003-2003, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj3600.h b/prnt/hpijs/dj3600.h index cad77eaa7..ee9c6b771 100644 --- a/prnt/hpijs/dj3600.h +++ b/prnt/hpijs/dj3600.h @@ -1,7 +1,7 @@ /*****************************************************************************\ dj3600.h : Interface for the DJ3600 printer class - Copyright (c) 2003 - 2003, Hewlett-Packard Co. + Copyright (c) 2003 - 2003, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj3600_cmap.cpp b/prnt/hpijs/dj3600_cmap.cpp index 769f9ade9..c3e4354e1 100644 --- a/prnt/hpijs/dj3600_cmap.cpp +++ b/prnt/hpijs/dj3600_cmap.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj3320_cmap.cpp : Implimentation for the DJ3600 color maps - Copyright (c) 1996 - 2003, Hewlett-Packard Co. + Copyright (c) 1996 - 2003, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj400.h b/prnt/hpijs/dj400.h index 85ae28f99..e89fd103f 100644 --- a/prnt/hpijs/dj400.h +++ b/prnt/hpijs/dj400.h @@ -1,7 +1,7 @@ /*****************************************************************************\ dj400.h : Interface for the DJ400 class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj4100.h b/prnt/hpijs/dj4100.h index 895265c9f..7e36bbfa1 100644 --- a/prnt/hpijs/dj4100.h +++ b/prnt/hpijs/dj4100.h @@ -1,7 +1,7 @@ /*****************************************************************************\ dj4100.h : Interface for the DJ4100 printer class - Copyright (c) 2003 - 2006, Hewlett-Packard Co. + Copyright (c) 2003 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj4100_cmap.cpp b/prnt/hpijs/dj4100_cmap.cpp index 1404c69f4..42e5a48bd 100644 --- a/prnt/hpijs/dj4100_cmap.cpp +++ b/prnt/hpijs/dj4100_cmap.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj4100_cmap.cpp : Implimentation for the DJ4100 color maps - Copyright (c) 1996 - 2006, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj540.cpp b/prnt/hpijs/dj540.cpp index cb8dd5c6f..98ab07aac 100644 --- a/prnt/hpijs/dj540.cpp +++ b/prnt/hpijs/dj540.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj540.cpp : Implimentation for the DJ540 class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj540.h b/prnt/hpijs/dj540.h index 13d4a3840..916e4e413 100644 --- a/prnt/hpijs/dj540.h +++ b/prnt/hpijs/dj540.h @@ -1,7 +1,7 @@ /*****************************************************************************\ dj540.h : Interface for the DJ540 class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj55xx.h b/prnt/hpijs/dj55xx.h index 3b2b393eb..791e75c7f 100644 --- a/prnt/hpijs/dj55xx.h +++ b/prnt/hpijs/dj55xx.h @@ -1,7 +1,7 @@ /*****************************************************************************\ dj55xx.h : Interface for the generic VIP printer class - Copyright (c) 2001 - 2002, Hewlett-Packard Co. + Copyright (c) 2001 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj600.cpp b/prnt/hpijs/dj600.cpp index 2d299b9f0..0b1a34294 100644 --- a/prnt/hpijs/dj600.cpp +++ b/prnt/hpijs/dj600.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj600.cpp : Implimentation for the DJ600 class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj600.h b/prnt/hpijs/dj600.h index d50523558..df21d87ba 100644 --- a/prnt/hpijs/dj600.h +++ b/prnt/hpijs/dj600.h @@ -1,7 +1,7 @@ /*****************************************************************************\ dj600.h : Interface for the DJ600 class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj600_maps.cpp b/prnt/hpijs/dj600_maps.cpp index 6476bcd11..288361a8f 100644 --- a/prnt/hpijs/dj600_maps.cpp +++ b/prnt/hpijs/dj600_maps.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj600_maps.cpp : Color maps for the DJ600 - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj630.cpp b/prnt/hpijs/dj630.cpp index e351ac9ad..dd939aa3d 100644 --- a/prnt/hpijs/dj630.cpp +++ b/prnt/hpijs/dj630.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj630.cpp : Implimentation for the DJ630 class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj630.h b/prnt/hpijs/dj630.h index 447c643a6..6ea0a10bf 100644 --- a/prnt/hpijs/dj630.h +++ b/prnt/hpijs/dj630.h @@ -1,7 +1,7 @@ /*****************************************************************************\ dj630.h : Interface for the DJ630 class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj660.cpp b/prnt/hpijs/dj660.cpp index 41e0180bf..5e124c735 100644 --- a/prnt/hpijs/dj660.cpp +++ b/prnt/hpijs/dj660.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj660.cpp : Implimentation for the DJ660 class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj660.h b/prnt/hpijs/dj660.h index 6886506c8..e684f41d7 100644 --- a/prnt/hpijs/dj660.h +++ b/prnt/hpijs/dj660.h @@ -1,7 +1,7 @@ /*****************************************************************************\ dj660.h : Interface for the DJ660 class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj660_maps.cpp b/prnt/hpijs/dj660_maps.cpp index c61500c8f..7f29cbba7 100644 --- a/prnt/hpijs/dj660_maps.cpp +++ b/prnt/hpijs/dj660_maps.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj660_maps.cpp : Color maps for the DJ660 - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj690.cpp b/prnt/hpijs/dj690.cpp index c9ff4d422..bb44b52c3 100644 --- a/prnt/hpijs/dj690.cpp +++ b/prnt/hpijs/dj690.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj690.cpp : Implimentation for the DJ6xxPhoto class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj690.h b/prnt/hpijs/dj690.h index 234618dfa..7bf941fb1 100644 --- a/prnt/hpijs/dj690.h +++ b/prnt/hpijs/dj690.h @@ -1,7 +1,7 @@ /*****************************************************************************\ dj690.h : Interface for the DJ6xxPhoto class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj690_maps.cpp b/prnt/hpijs/dj690_maps.cpp index bbc4c9b76..a8248c6f1 100644 --- a/prnt/hpijs/dj690_maps.cpp +++ b/prnt/hpijs/dj690_maps.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj690_maps.cpp : Color maps for DJ6xxPhoto - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj6xx.cpp b/prnt/hpijs/dj6xx.cpp index 88c6704c1..7d1099334 100644 --- a/prnt/hpijs/dj6xx.cpp +++ b/prnt/hpijs/dj6xx.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj6xx.cpp : Implimentation for the DJ6XX class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj6xx.h b/prnt/hpijs/dj6xx.h index 7fd817245..a7b2f1072 100644 --- a/prnt/hpijs/dj6xx.h +++ b/prnt/hpijs/dj6xx.h @@ -1,7 +1,7 @@ /*****************************************************************************\ dj6xx.h : Interface for the DJ6XX class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj850.cpp b/prnt/hpijs/dj850.cpp index 566d42c80..4b16b6732 100644 --- a/prnt/hpijs/dj850.cpp +++ b/prnt/hpijs/dj850.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj850.cpp : Implimentation for the DJ850 class - Copyright (c) 1996 - 2002, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj850.h b/prnt/hpijs/dj850.h index a1d63f27f..f44d1d55a 100644 --- a/prnt/hpijs/dj850.h +++ b/prnt/hpijs/dj850.h @@ -1,7 +1,7 @@ /*****************************************************************************\ dj850.h : Interface for the DJ850 class - Copyright (c) 1996 - 2002, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj850_maps.cpp b/prnt/hpijs/dj850_maps.cpp index 69485330a..928c411d9 100644 --- a/prnt/hpijs/dj850_maps.cpp +++ b/prnt/hpijs/dj850_maps.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj850_maps.cpp : Color maps for DJ850/855,870 - Copyright (c) 1996 - 2002, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj890.cpp b/prnt/hpijs/dj890.cpp index 86822c349..eff7814bc 100644 --- a/prnt/hpijs/dj890.cpp +++ b/prnt/hpijs/dj890.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj890.cpp : Implimentation for the DJ890 class - Copyright (c) 1996 - 2002, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj890.h b/prnt/hpijs/dj890.h index 5a7132e0a..d4688f207 100644 --- a/prnt/hpijs/dj890.h +++ b/prnt/hpijs/dj890.h @@ -1,7 +1,7 @@ /*****************************************************************************\ dj890.h : Interface for the DJ890 class - Copyright (c) 1996 - 2002, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj895_maps.cpp b/prnt/hpijs/dj895_maps.cpp index ed9ad981c..ff23db5b4 100644 --- a/prnt/hpijs/dj895_maps.cpp +++ b/prnt/hpijs/dj895_maps.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj895_maps.cpp : Color maps for DJ895 - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj895_maps2.cpp b/prnt/hpijs/dj895_maps2.cpp index 399f03476..2f6d85779 100644 --- a/prnt/hpijs/dj895_maps2.cpp +++ b/prnt/hpijs/dj895_maps2.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj895_maps2.cpp : Color maps for DJ895 - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj8x5.cpp b/prnt/hpijs/dj8x5.cpp index f69e5ef6b..dfec94b3b 100644 --- a/prnt/hpijs/dj8x5.cpp +++ b/prnt/hpijs/dj8x5.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj8x5.cpp : Implimentation for the DJ8x5 class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj8x5.h b/prnt/hpijs/dj8x5.h index 7c9f3fb4a..5e2e5ed2b 100644 --- a/prnt/hpijs/dj8x5.h +++ b/prnt/hpijs/dj8x5.h @@ -1,7 +1,7 @@ /*****************************************************************************\ dj8x5.h : Interface for the DJ8x5 class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj8xx.cpp b/prnt/hpijs/dj8xx.cpp index 6fec85cb1..b8209cb91 100644 --- a/prnt/hpijs/dj8xx.cpp +++ b/prnt/hpijs/dj8xx.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj8xx.cpp : Implimentation for the DJ8xx class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj8xx.h b/prnt/hpijs/dj8xx.h index b1f4c5469..adf9b1245 100644 --- a/prnt/hpijs/dj8xx.h +++ b/prnt/hpijs/dj8xx.h @@ -1,7 +1,7 @@ /*****************************************************************************\ dj8xx.h : Interface for the DJ8xx class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj970_maps.cpp b/prnt/hpijs/dj970_maps.cpp index 1029bce2b..d5d25d54e 100644 --- a/prnt/hpijs/dj970_maps.cpp +++ b/prnt/hpijs/dj970_maps.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj970_maps.cpp : Color maps for DJ970 - Copyright (c) 1996 - 2001UL, Hewlett-Packard Co. + Copyright (c) 1996 - 2001UL, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj970_maps2.cpp b/prnt/hpijs/dj970_maps2.cpp index 74dcf23fd..1fdca2223 100644 --- a/prnt/hpijs/dj970_maps2.cpp +++ b/prnt/hpijs/dj970_maps2.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj970_maps2.cpp : Color maps for DJ970 - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj970_maps3.cpp b/prnt/hpijs/dj970_maps3.cpp index a526747f8..fcf38774a 100644 --- a/prnt/hpijs/dj970_maps3.cpp +++ b/prnt/hpijs/dj970_maps3.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj970_maps3.cpp : Color maps for DJ970 - Copyright (c) 1996 - 2002, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj9xx.cpp b/prnt/hpijs/dj9xx.cpp index fb55a34db..356fc9c7f 100644 --- a/prnt/hpijs/dj9xx.cpp +++ b/prnt/hpijs/dj9xx.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj9xx.cpp : Implimentation for the DJ9xx class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj9xx.h b/prnt/hpijs/dj9xx.h index 0877ea3aa..50d180bf9 100644 --- a/prnt/hpijs/dj9xx.h +++ b/prnt/hpijs/dj9xx.h @@ -1,7 +1,7 @@ /*****************************************************************************\ dj9xx.h : Interface for the DJ9xx class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj9xxvip.cpp b/prnt/hpijs/dj9xxvip.cpp index f1dc14ea7..519036c81 100644 --- a/prnt/hpijs/dj9xxvip.cpp +++ b/prnt/hpijs/dj9xxvip.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ dj9xxvip.cpp : Implimentation for the DJ9xxVIP class - Copyright (c) 1996 - 2002, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/dj9xxvip.h b/prnt/hpijs/dj9xxvip.h index 07563fc13..85eb3ac9a 100644 --- a/prnt/hpijs/dj9xxvip.h +++ b/prnt/hpijs/dj9xxvip.h @@ -1,7 +1,7 @@ /*****************************************************************************\ dj9xxvip.h : Interface for the DJ9xxVIP class - Copyright (c) 1996 - 2002, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/djd2600.h b/prnt/hpijs/djd2600.h index e108daf0f..d2476bd1c 100644 --- a/prnt/hpijs/djd2600.h +++ b/prnt/hpijs/djd2600.h @@ -1,7 +1,7 @@ /*****************************************************************************\ djd2600.h : Interface for the DJ D2600 printer class - Copyright (c) 2003 - 2009, Hewlett-Packard Co. + Copyright (c) 2003 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/djgenericvip.cpp b/prnt/hpijs/djgenericvip.cpp index e461e34b8..b7e79dc58 100644 --- a/prnt/hpijs/djgenericvip.cpp +++ b/prnt/hpijs/djgenericvip.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ djgenericvip.cpp : Implimentation for the generic VIP class - Copyright (c) 2001-2006, Hewlett-Packard Co. + Copyright (c) 2001-2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/djgenericvip.h b/prnt/hpijs/djgenericvip.h index 5ce083440..046c0086f 100644 --- a/prnt/hpijs/djgenericvip.h +++ b/prnt/hpijs/djgenericvip.h @@ -1,7 +1,7 @@ /*****************************************************************************\ djgenericvip.h : Interface for the generic VIP printer class - Copyright (c) 2001 - 2006, Hewlett-Packard Co. + Copyright (c) 2001 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/ernieplatform.h b/prnt/hpijs/ernieplatform.h index 40195c279..1667822dd 100644 --- a/prnt/hpijs/ernieplatform.h +++ b/prnt/hpijs/ernieplatform.h @@ -1,7 +1,7 @@ /*****************************************************************************\ ernieplatform.h : Interface for ernie - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/filterhpa.cpp b/prnt/hpijs/filterhpa.cpp index f00aab541..2cd23b98e 100644 --- a/prnt/hpijs/filterhpa.cpp +++ b/prnt/hpijs/filterhpa.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ filterhpa.cpp : Implimentation for the TErnieFilter class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/filterhpa.h b/prnt/hpijs/filterhpa.h index a2a5c526b..acd37a25b 100644 --- a/prnt/hpijs/filterhpa.h +++ b/prnt/hpijs/filterhpa.h @@ -1,7 +1,7 @@ /*****************************************************************************\ filterhpa.h : Interface for the TErnieFilter class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/font.h b/prnt/hpijs/font.h index c3405dc52..f24c65527 100644 --- a/prnt/hpijs/font.h +++ b/prnt/hpijs/font.h @@ -1,7 +1,7 @@ /*****************************************************************************\ font.h : Interface for the font classes - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/gdevijs-krgb-1.5-gs8.61.patch b/prnt/hpijs/gdevijs-krgb-1.5-gs8.61.patch index d00bcf444..eb55acf47 100644 --- a/prnt/hpijs/gdevijs-krgb-1.5-gs8.61.patch +++ b/prnt/hpijs/gdevijs-krgb-1.5-gs8.61.patch @@ -7,7 +7,7 @@ diff -uNr old/gdevijs.c new/gdevijs.c * before opening this device. + * + * 11/26/03 David Suffield (gdevijs-krgb-1.0.patch) -+ * (c) 2003-2004 Copyright Hewlett-Packard Development Company, LP ++ * (c) 2003-2004 Copyright HP Development Company, LP + * + * 1. Removed hpijs 1.0-1.0.2 workarounds, use hpijs 1.0.3 or higher. + * 2. Added krgb support. diff --git a/prnt/hpijs/global_types.h b/prnt/hpijs/global_types.h index 711f737e2..dd7169c34 100644 --- a/prnt/hpijs/global_types.h +++ b/prnt/hpijs/global_types.h @@ -1,7 +1,7 @@ /*****************************************************************************\ global_types.h : global types, enums, and #defines for APDK - Copyright (c) 1996 - 2008, Hewlett-Packard Co. + Copyright (c) 1996 - 2008, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/globals.cpp b/prnt/hpijs/globals.cpp index 7c2cca144..6c88af2fb 100644 --- a/prnt/hpijs/globals.cpp +++ b/prnt/hpijs/globals.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ globals.cpp : Global functions for APDK - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/halftoner.cpp b/prnt/hpijs/halftoner.cpp index dc7278e47..4c75951a1 100644 --- a/prnt/hpijs/halftoner.cpp +++ b/prnt/hpijs/halftoner.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ halftoner.cpp : Implimentation for the Halftoner class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/halftoner.h b/prnt/hpijs/halftoner.h index 41acd15cd..5f4389154 100644 --- a/prnt/hpijs/halftoner.h +++ b/prnt/hpijs/halftoner.h @@ -1,7 +1,7 @@ /*****************************************************************************\ halftoner.h : Interface for the Halftoner class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/halftoner_open.cpp b/prnt/hpijs/halftoner_open.cpp index 23483a643..2c35a9afd 100644 --- a/prnt/hpijs/halftoner_open.cpp +++ b/prnt/hpijs/halftoner_open.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ halftoner_open.cpp : Open Source Imaging Halftoning - Copyright (c) 1994 - 2001, Hewlett-Packard Co. + Copyright (c) 1994 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/halftoner_open.h b/prnt/hpijs/halftoner_open.h index 70d28acf1..fdf20954b 100644 --- a/prnt/hpijs/halftoner_open.h +++ b/prnt/hpijs/halftoner_open.h @@ -1,7 +1,7 @@ /*****************************************************************************\ halftoner_open.h : Open Source Imaging Halftoning Interface - Copyright (c) 1994 - 2001, Hewlett-Packard Co. + Copyright (c) 1994 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/header.h b/prnt/hpijs/header.h index 71728319e..28dc8d3d4 100644 --- a/prnt/hpijs/header.h +++ b/prnt/hpijs/header.h @@ -1,7 +1,7 @@ /*****************************************************************************\ header.h : standard include header - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/header2.cpp b/prnt/hpijs/header2.cpp index ace354c39..846add5e0 100644 --- a/prnt/hpijs/header2.cpp +++ b/prnt/hpijs/header2.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ header.cpp : Implimentation for the Header class - Copyright (c) 1996 - 2008, Hewlett-Packard Co. + Copyright (c) 1996 - 2008, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp index 66e4faa05..8514775d4 100644 --- a/prnt/hpijs/hpcupsfax.cpp +++ b/prnt/hpijs/hpcupsfax.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ hpcupsfax.cpp : HP CUPS fax filter - Copyright (c) 2001 - 2010, Hewlett-Packard Co. + Copyright (c) 2001 - 2010, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/prnt/hpijs/hpcupsfax.h b/prnt/hpijs/hpcupsfax.h index 8c9eb7844..f42256d0d 100644 --- a/prnt/hpijs/hpcupsfax.h +++ b/prnt/hpijs/hpcupsfax.h @@ -1,7 +1,7 @@ /*****************************************************************************\ hpcupsfax.h : HP Cups Fax Filter - Copyright (c) 2001 - 2002, Hewlett-Packard Co. + Copyright (c) 2001 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/prnt/hpijs/hpijs.cpp b/prnt/hpijs/hpijs.cpp index 4cd021429..64b01213f 100644 --- a/prnt/hpijs/hpijs.cpp +++ b/prnt/hpijs/hpijs.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ hpijs.cpp : HP Inkjet Server - Copyright (c) 2001 - 2008, Hewlett-Packard Co. + Copyright (c) 2001 - 2008, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -597,8 +597,8 @@ int main (int argc, char *argv[], char *evenp[]) const char *arg = argv[1]; if ((arg[0] == '-') && (arg[1] == 'h')) { - fprintf(stdout, "\nHewlett-Packard Co. Inkjet Server %s\n", VERSION); - fprintf(stdout, "Copyright (c) 2001-2004, Hewlett-Packard Co.\n"); + fprintf(stdout, "\nHP Co. Inkjet Server %s\n", VERSION); + fprintf(stdout, "Copyright (c) 2001-2004, HP Co.\n"); exit(0); } } diff --git a/prnt/hpijs/hpijs.h b/prnt/hpijs/hpijs.h index 2f4a9d3a8..7a07581e5 100644 --- a/prnt/hpijs/hpijs.h +++ b/prnt/hpijs/hpijs.h @@ -1,7 +1,7 @@ /*****************************************************************************\ hpijs.h : HP Inkjet Server - Copyright (c) 2001 - 2002, Hewlett-Packard Co. + Copyright (c) 2001 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/prnt/hpijs/hpijsfax.cpp b/prnt/hpijs/hpijsfax.cpp index 3edb35d3b..d986d9790 100644 --- a/prnt/hpijs/hpijsfax.cpp +++ b/prnt/hpijs/hpijsfax.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ hpijs.cpp : HP Inkjet Server - Copyright (c) 2001 - 2004, Hewlett-Packard Co. + Copyright (c) 2001 - 2004, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/prnt/hpijs/hpijsfax.h b/prnt/hpijs/hpijsfax.h index 5f4426e21..64761edcc 100644 --- a/prnt/hpijs/hpijsfax.h +++ b/prnt/hpijs/hpijsfax.h @@ -1,7 +1,7 @@ /*****************************************************************************\ hpijsfax.h : HP Inkjet Server - Copyright (c) 2001 - 2002, Hewlett-Packard Co. + Copyright (c) 2001 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/prnt/hpijs/hpiom.c b/prnt/hpijs/hpiom.c index 87b8e0222..8932192d8 100644 --- a/prnt/hpijs/hpiom.c +++ b/prnt/hpijs/hpiom.c @@ -2,7 +2,7 @@ hpiom.c - HP I/O message handler - (c) 2003-2004 Copyright Hewlett-Packard Development Company, LP + (c) 2003-2004 Copyright HP Development Company, LP Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/hpiom.h b/prnt/hpijs/hpiom.h index ed31fa6c9..568b4dc3b 100644 --- a/prnt/hpijs/hpiom.h +++ b/prnt/hpijs/hpiom.h @@ -2,7 +2,7 @@ hpiom.h - HP I/O message handler - (c) 2003-2004 Copyright Hewlett-Packard Development Company, LP + (c) 2003-2004 Copyright HP Development Company, LP Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/hpjbig_wrapper.h b/prnt/hpijs/hpjbig_wrapper.h index 230e29805..caea0e315 100644 --- a/prnt/hpijs/hpjbig_wrapper.h +++ b/prnt/hpijs/hpjbig_wrapper.h @@ -1,7 +1,7 @@ /*****************************************************************************\ hpjbig_wrapper.h : header file for hpjbig_wrapper.c - Copyright (c) 1996 - 2007, Hewlett-Packard Co. + Copyright (c) 1996 - 2007, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/hpprint_c_api.h b/prnt/hpijs/hpprint_c_api.h index d127f8465..e4f4155bf 100644 --- a/prnt/hpijs/hpprint_c_api.h +++ b/prnt/hpijs/hpprint_c_api.h @@ -1,7 +1,7 @@ /*****************************************************************************\ hpprint_c_api.h : Interface for C access to APDK - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/hpprintapi.h b/prnt/hpijs/hpprintapi.h index 86b5af958..93f68d2fe 100644 --- a/prnt/hpijs/hpprintapi.h +++ b/prnt/hpijs/hpprintapi.h @@ -1,7 +1,7 @@ /*****************************************************************************\ hpprintapi.h : Interface/Implimentation for the APDK API - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/hptypes.h b/prnt/hpijs/hptypes.h index af5aa6292..9be7dc3a4 100644 --- a/prnt/hpijs/hptypes.h +++ b/prnt/hpijs/hptypes.h @@ -1,7 +1,7 @@ /*****************************************************************************\ hptypes.h : HP types defined used by imaging modeules - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/htfed.h b/prnt/hpijs/htfed.h index e8b9d891a..e711bf8ee 100644 --- a/prnt/hpijs/htfed.h +++ b/prnt/hpijs/htfed.h @@ -1,7 +1,7 @@ /*****************************************************************************\ hfed.h : Open Source Imaging error diffusion prototypes - Copyright (c) 1994 - 2001, Hewlett-Packard Co. + Copyright (c) 1994 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/htmtxhi.cpp b/prnt/hpijs/htmtxhi.cpp index b55c956d9..df0164bdd 100644 --- a/prnt/hpijs/htmtxhi.cpp +++ b/prnt/hpijs/htmtxhi.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ htmtxhi.cpp : Implimentation for Multilevel (HiFipe) dither matrix - Copyright (c) 1994 - 2001, Hewlett-Packard Co. + Copyright (c) 1994 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/internal.h b/prnt/hpijs/internal.h index fb3f1b0dd..a13f06198 100644 --- a/prnt/hpijs/internal.h +++ b/prnt/hpijs/internal.h @@ -1,7 +1,7 @@ /*****************************************************************************\ internal.h : Interface for internal classes - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/interp.h b/prnt/hpijs/interp.h index 4f4d803b0..81c4c9255 100644 --- a/prnt/hpijs/interp.h +++ b/prnt/hpijs/interp.h @@ -1,7 +1,7 @@ /*****************************************************************************\ interp.h : ResSyn routines and structures - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/interp_data_50.h b/prnt/hpijs/interp_data_50.h index eb4ab0a72..770b27b50 100644 --- a/prnt/hpijs/interp_data_50.h +++ b/prnt/hpijs/interp_data_50.h @@ -1,7 +1,7 @@ /*****************************************************************************\ interp_data_50.h : constant data - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/io_defs.h b/prnt/hpijs/io_defs.h index 3a13ed643..7ada68464 100644 --- a/prnt/hpijs/io_defs.h +++ b/prnt/hpijs/io_defs.h @@ -1,7 +1,7 @@ /*****************************************************************************\ io_defs.h : I/O definitions - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/job.cpp b/prnt/hpijs/job.cpp index 5f93f653a..ea095f4e3 100644 --- a/prnt/hpijs/job.cpp +++ b/prnt/hpijs/job.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ job.cpp : Implimentation for the Job class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/job.h b/prnt/hpijs/job.h index fcb041f4f..54d0343cd 100644 --- a/prnt/hpijs/job.h +++ b/prnt/hpijs/job.h @@ -1,7 +1,7 @@ /*****************************************************************************\ job.h : Interface/Implimentation for the Job class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/ldlencap.h b/prnt/hpijs/ldlencap.h index bb6c3a20a..62630b5c5 100644 --- a/prnt/hpijs/ldlencap.h +++ b/prnt/hpijs/ldlencap.h @@ -1,7 +1,7 @@ /*****************************************************************************\ ldlencap.h : definitions for the lidil encapsulation - Copyright (c) 2001 - 2002, Hewlett-Packard Co. + Copyright (c) 2001 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/ljcolor.cpp b/prnt/hpijs/ljcolor.cpp index aec700c67..0ecbfc606 100644 --- a/prnt/hpijs/ljcolor.cpp +++ b/prnt/hpijs/ljcolor.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ ljcolor.cpp : Implimentation for the LJColor class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/ljcolor.h b/prnt/hpijs/ljcolor.h index b5f5fbf70..5a854398b 100644 --- a/prnt/hpijs/ljcolor.h +++ b/prnt/hpijs/ljcolor.h @@ -1,7 +1,7 @@ /*****************************************************************************\ ljcolor.h : Interface for the LJColor class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/ljfastraster.cpp b/prnt/hpijs/ljfastraster.cpp index df8935227..8c7073a3a 100644 --- a/prnt/hpijs/ljfastraster.cpp +++ b/prnt/hpijs/ljfastraster.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ ljfastraster.cpp : Implimentation for the LJFastRaster class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/ljfastraster.h b/prnt/hpijs/ljfastraster.h index 7f8801a5a..6fdce4927 100644 --- a/prnt/hpijs/ljfastraster.h +++ b/prnt/hpijs/ljfastraster.h @@ -1,7 +1,7 @@ /*****************************************************************************\ LJFastRaster.h : Interface for the LJFastRaster class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/ljjetready.cpp b/prnt/hpijs/ljjetready.cpp index 048eca2e9..6942d2992 100644 --- a/prnt/hpijs/ljjetready.cpp +++ b/prnt/hpijs/ljjetready.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ ljjetready.cpp : Implimentation for the LJJetReady class - Copyright (c) 1996 - 2008, Hewlett-Packard Co. + Copyright (c) 1996 - 2008, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/ljjetready.h b/prnt/hpijs/ljjetready.h index 5390ab979..9101fba74 100644 --- a/prnt/hpijs/ljjetready.h +++ b/prnt/hpijs/ljjetready.h @@ -1,7 +1,7 @@ /*****************************************************************************\ LJJetReady.h : Interface for the LJJetReady class - Copyright (c) 1996 - 2008, Hewlett-Packard Co. + Copyright (c) 1996 - 2008, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/ljm1005.cpp b/prnt/hpijs/ljm1005.cpp index 726355421..2522a6b69 100644 --- a/prnt/hpijs/ljm1005.cpp +++ b/prnt/hpijs/ljm1005.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ ljm1005.cpp : Implementation for the LJM1005 class - Copyright (c) 1996 - 2006, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/ljm1005.h b/prnt/hpijs/ljm1005.h index fbe27a7aa..6fab55870 100644 --- a/prnt/hpijs/ljm1005.h +++ b/prnt/hpijs/ljm1005.h @@ -1,7 +1,7 @@ /*****************************************************************************\ ljm1005.h : Interface for the LJM1005 class - Copyright (c) 1996 - 2006, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/ljmono.cpp b/prnt/hpijs/ljmono.cpp index 6c2473e13..67a0077d6 100644 --- a/prnt/hpijs/ljmono.cpp +++ b/prnt/hpijs/ljmono.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ ljmono.cpp : Implimentation for the LJMono class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/ljmono.h b/prnt/hpijs/ljmono.h index 21b613ab7..37abecdae 100644 --- a/prnt/hpijs/ljmono.h +++ b/prnt/hpijs/ljmono.h @@ -1,7 +1,7 @@ /*****************************************************************************\ ljmono.h : Interface for the LJMono class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/ljp1xxx.h b/prnt/hpijs/ljp1xxx.h index 4676b1acd..4250577a2 100644 --- a/prnt/hpijs/ljp1xxx.h +++ b/prnt/hpijs/ljp1xxx.h @@ -1,7 +1,7 @@ /*****************************************************************************\
ljp1xxx.h : Interface for the LJP1XXX class
- Copyright (c) 2008, Hewlett-Packard Co.
+ Copyright (c) 2008, HP Co.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- 3. Neither the name of Hewlett-Packard nor the names of its
+ 3. Neither the name of HP nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
diff --git a/prnt/hpijs/ljzjs.cpp b/prnt/hpijs/ljzjs.cpp index e02505c69..a4ca45395 100644 --- a/prnt/hpijs/ljzjs.cpp +++ b/prnt/hpijs/ljzjs.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ ljzjs.cpp : Implementation for the LJZjs class - Copyright (c) 1996 - 2007, Hewlett-Packard Co. + Copyright (c) 1996 - 2007, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/ljzjs.h b/prnt/hpijs/ljzjs.h index 1ec7f7682..e01838462 100644 --- a/prnt/hpijs/ljzjs.h +++ b/prnt/hpijs/ljzjs.h @@ -1,7 +1,7 @@ /*****************************************************************************\ ljzjs.h : Interface for the LJZjs class - Copyright (c) 1996 - 2007, Hewlett-Packard Co. + Copyright (c) 1996 - 2007, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/ljzjscolor.cpp b/prnt/hpijs/ljzjscolor.cpp index ebb45e3f0..9cdea109d 100644 --- a/prnt/hpijs/ljzjscolor.cpp +++ b/prnt/hpijs/ljzjscolor.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ ljzjscolor.cpp : Implementation for the LJZjsColor class - Copyright (c) 1996 - 2006, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/ljzjscolor.h b/prnt/hpijs/ljzjscolor.h index 1492b7e8c..0f157f875 100644 --- a/prnt/hpijs/ljzjscolor.h +++ b/prnt/hpijs/ljzjscolor.h @@ -1,7 +1,7 @@ /*****************************************************************************\
ljzjscolor.h : Interface for the LJZjsColor class
- Copyright (c) 1996 - 2006, Hewlett-Packard Co.
+ Copyright (c) 1996 - 2015, HP Co.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- 3. Neither the name of Hewlett-Packard nor the names of its
+ 3. Neither the name of HP nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
diff --git a/prnt/hpijs/ljzjsmono.cpp b/prnt/hpijs/ljzjsmono.cpp index 48556e14c..08010c2b5 100644 --- a/prnt/hpijs/ljzjsmono.cpp +++ b/prnt/hpijs/ljzjsmono.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ ljzjsmono.cpp : Implementation for the LJZjsMono class - Copyright (c) 1996 - 2007, Hewlett-Packard Co. + Copyright (c) 1996 - 2007, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/ljzjsmono.h b/prnt/hpijs/ljzjsmono.h index cbcf56392..dec7ddce2 100644 --- a/prnt/hpijs/ljzjsmono.h +++ b/prnt/hpijs/ljzjsmono.h @@ -1,7 +1,7 @@ /*****************************************************************************\ ljzjsmono.h : Interface for the LJZjsMono class - Copyright (c) 1996 - 2007, Hewlett-Packard Co. + Copyright (c) 1996 - 2007, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/models.cpp b/prnt/hpijs/models.cpp index dcb289f40..73fa9d99c 100644 --- a/prnt/hpijs/models.cpp +++ b/prnt/hpijs/models.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ models.cpp : Printer model mapping - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/models.h b/prnt/hpijs/models.h index e5c030110..b965c9538 100644 --- a/prnt/hpijs/models.h +++ b/prnt/hpijs/models.h @@ -1,7 +1,7 @@ /*****************************************************************************\ models.h : Models types - Copyright (c) 1996 - 2008, Hewlett-Packard Co. + Copyright (c) 1996 - 2008, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/ojprokx50.h b/prnt/hpijs/ojprokx50.h index fdb379cfe..eb2c270ec 100644 --- a/prnt/hpijs/ojprokx50.h +++ b/prnt/hpijs/ojprokx50.h @@ -1,7 +1,7 @@ /*****************************************************************************\ ojprokx50.h : Interface for the generic VIP printer class - Copyright (c) 2001 - 2002, Hewlett-Packard Co. + Copyright (c) 2001 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/phobos_cmaps.cpp b/prnt/hpijs/phobos_cmaps.cpp index b2758baad..51c1d71c7 100644 --- a/prnt/hpijs/phobos_cmaps.cpp +++ b/prnt/hpijs/phobos_cmaps.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ phobos_cmaps.cpp : Color maps for DJ8x5 - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/pmselect.cpp b/prnt/hpijs/pmselect.cpp index 6711865fb..6e88f4126 100644 --- a/prnt/hpijs/pmselect.cpp +++ b/prnt/hpijs/pmselect.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ pmselect.cpp : Implimentation for the ModeSet class - Copyright (c) 2001 - 2002, Hewlett-Packard Co. + Copyright (c) 2001 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/pmselect.h b/prnt/hpijs/pmselect.h index 9015e005f..215f63872 100644 --- a/prnt/hpijs/pmselect.h +++ b/prnt/hpijs/pmselect.h @@ -1,7 +1,7 @@ /*****************************************************************************\ pmselect.h : Interface for the ModeSet class - Copyright (c) 2001 - 2002, Hewlett-Packard Co. + Copyright (c) 2001 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/printer.cpp b/prnt/hpijs/printer.cpp index 74df6ef56..d61ecf5ea 100644 --- a/prnt/hpijs/printer.cpp +++ b/prnt/hpijs/printer.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ printer.cpp : Implimentation for the Printer class - Copyright (c) 1996 - 2006, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/printer.h b/prnt/hpijs/printer.h index b16d4c041..3c7a7555e 100644 --- a/prnt/hpijs/printer.h +++ b/prnt/hpijs/printer.h @@ -1,7 +1,7 @@ /*****************************************************************************\ printer.h : Interface for the Printer class - Copyright (c) 1996 - 2008, Hewlett-Packard Co. + Copyright (c) 1996 - 2008, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/printerfactory.cpp b/prnt/hpijs/printerfactory.cpp index 67150a855..765ed2950 100644 --- a/prnt/hpijs/printerfactory.cpp +++ b/prnt/hpijs/printerfactory.cpp @@ -1,5 +1,5 @@ /*****************************************************************************\ - Copyright (c) 2002 - 2002, Hewlett-Packard Co. + Copyright (c) 2002 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -10,7 +10,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/printerfactory.h b/prnt/hpijs/printerfactory.h index 4477c0398..c8d282716 100644 --- a/prnt/hpijs/printerfactory.h +++ b/prnt/hpijs/printerfactory.h @@ -1,5 +1,5 @@ /*****************************************************************************\ - Copyright (c) 2002 - 2002, Hewlett-Packard Co. + Copyright (c) 2002 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -10,7 +10,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/printerproxy.cpp b/prnt/hpijs/printerproxy.cpp index d6c74ed6e..cf0669c28 100644 --- a/prnt/hpijs/printerproxy.cpp +++ b/prnt/hpijs/printerproxy.cpp @@ -1,5 +1,5 @@ /*****************************************************************************\ - Copyright (c) 2002 - 2002, Hewlett-Packard Co. + Copyright (c) 2002 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -10,7 +10,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/printerproxy.h b/prnt/hpijs/printerproxy.h index 0da9ffd41..389a574d9 100644 --- a/prnt/hpijs/printerproxy.h +++ b/prnt/hpijs/printerproxy.h @@ -1,5 +1,5 @@ /*****************************************************************************\ - Copyright (c) 2002 - 2002, Hewlett-Packard Co. + Copyright (c) 2002 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -10,7 +10,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/pscript.h b/prnt/hpijs/pscript.h index 6b3d98a7b..22755a908 100644 --- a/prnt/hpijs/pscript.h +++ b/prnt/hpijs/pscript.h @@ -1,7 +1,7 @@ /*****************************************************************************\ pscript.h : Interface for the PScript class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/psp100.cpp b/prnt/hpijs/psp100.cpp index a92beb4f8..dc4109d1d 100644 --- a/prnt/hpijs/psp100.cpp +++ b/prnt/hpijs/psp100.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ psp100.cpp : Implimentation for the PSP100 class - Copyright (c) 2001, Hewlett-Packard Co. + Copyright (c) 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/psp100.h b/prnt/hpijs/psp100.h index 6ae79f106..98eb86a61 100644 --- a/prnt/hpijs/psp100.h +++ b/prnt/hpijs/psp100.h @@ -1,7 +1,7 @@ /*****************************************************************************\ psp100.h : Interface for the PSP100 class - Copyright (c) 2001-2002, Hewlett-Packard Co. + Copyright (c) 2001-2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/psp470.h b/prnt/hpijs/psp470.h index 12f708636..a5701d23a 100644 --- a/prnt/hpijs/psp470.h +++ b/prnt/hpijs/psp470.h @@ -1,7 +1,7 @@ /*****************************************************************************\ psp470.h : Interface for the PSP470 class - Copyright (c) 2001-2002, Hewlett-Packard Co. + Copyright (c) 2001-2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/quickconnect.cpp b/prnt/hpijs/quickconnect.cpp index df7b2b6f7..2207e19bb 100644 --- a/prnt/hpijs/quickconnect.cpp +++ b/prnt/hpijs/quickconnect.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\
quickconnect.cpp : Implementation for the QuickConnect class
- Copyright (c) 2008, Hewlett-Packard Co.
+ Copyright (c) 2008, HP Co.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- 3. Neither the name of Hewlett-Packard nor the names of its
+ 3. Neither the name of HP nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
diff --git a/prnt/hpijs/quickconnect.h b/prnt/hpijs/quickconnect.h index 9de221b44..9b3ec860f 100644 --- a/prnt/hpijs/quickconnect.h +++ b/prnt/hpijs/quickconnect.h @@ -1,7 +1,7 @@ /*****************************************************************************\
quickconnect.h : Interface for the QuickConnect class
- Copyright (c) 2008, Hewlett-Packard Co.
+ Copyright (c) 2008, HP Co.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- 3. Neither the name of Hewlett-Packard nor the names of its
+ 3. Neither the name of HP nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
diff --git a/prnt/hpijs/registry.cpp b/prnt/hpijs/registry.cpp index c11edba10..ce587c394 100644 --- a/prnt/hpijs/registry.cpp +++ b/prnt/hpijs/registry.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ registry.cpp : Implimentation for the DeviceRegistry class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/resources.h b/prnt/hpijs/resources.h index c40bf63ea..1313dfdf6 100644 --- a/prnt/hpijs/resources.h +++ b/prnt/hpijs/resources.h @@ -1,7 +1,7 @@ /*****************************************************************************\ resources.h : externs for open source imaging - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/scaler.cpp b/prnt/hpijs/scaler.cpp index 9b272f10b..3dd05dba5 100644 --- a/prnt/hpijs/scaler.cpp +++ b/prnt/hpijs/scaler.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ scaler.cpp : Implimentation for the Scaler class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/scaler_open.cpp b/prnt/hpijs/scaler_open.cpp index 2e2b7e419..401ce1de6 100644 --- a/prnt/hpijs/scaler_open.cpp +++ b/prnt/hpijs/scaler_open.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ scaler_open.cpp : Implimentation for the Scaler_Open class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/scaler_open.h b/prnt/hpijs/scaler_open.h index be7e9b856..950f77da2 100644 --- a/prnt/hpijs/scaler_open.h +++ b/prnt/hpijs/scaler_open.h @@ -1,7 +1,7 @@ /*****************************************************************************\ scaler_open.h : Interface for the Scaler_Open class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/scaler_prop.h b/prnt/hpijs/scaler_prop.h index 814ff2449..735e6c3c6 100644 --- a/prnt/hpijs/scaler_prop.h +++ b/prnt/hpijs/scaler_prop.h @@ -1,7 +1,7 @@ /*****************************************************************************\ scaler_prop.h : Interface for the Scaler_Prop class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/script.cpp b/prnt/hpijs/script.cpp index df7e39e1c..ef5dbdedd 100644 --- a/prnt/hpijs/script.cpp +++ b/prnt/hpijs/script.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ script.cpp : Implimentation for scripting - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/script.h b/prnt/hpijs/script.h index ac01adc05..535161cc4 100644 --- a/prnt/hpijs/script.h +++ b/prnt/hpijs/script.h @@ -1,7 +1,7 @@ /*****************************************************************************\ script.h : Interface for Scripter classes - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/services.cpp b/prnt/hpijs/services.cpp index 186d27f52..026ef1ac9 100644 --- a/prnt/hpijs/services.cpp +++ b/prnt/hpijs/services.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ services.cpp : HP Inkjet Server - Copyright (c) 2001 - 2004, Hewlett-Packard Co. + Copyright (c) 2001 - 2004, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/prnt/hpijs/services.h b/prnt/hpijs/services.h index 43344276f..ea46ca2de 100644 --- a/prnt/hpijs/services.h +++ b/prnt/hpijs/services.h @@ -1,7 +1,7 @@ /*****************************************************************************\ services.h : HP Inkjet Server - Copyright (c) 2001 - 2002, Hewlett-Packard Co. + Copyright (c) 2001 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/prnt/hpijs/systemservices.cpp b/prnt/hpijs/systemservices.cpp index ee8d3a43c..95f5a6499 100644 --- a/prnt/hpijs/systemservices.cpp +++ b/prnt/hpijs/systemservices.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ systemservice.cpp : Implimentation for the SystemServices class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/systemservices.h b/prnt/hpijs/systemservices.h index 7712a3363..421a2fc67 100644 --- a/prnt/hpijs/systemservices.h +++ b/prnt/hpijs/systemservices.h @@ -1,7 +1,7 @@ /*****************************************************************************\ systemservices.h : Interface for the SystemServices class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/translator.cpp b/prnt/hpijs/translator.cpp index e4b851506..f53f2f11b 100644 --- a/prnt/hpijs/translator.cpp +++ b/prnt/hpijs/translator.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ translator.h : Implimentation for the RasterSender class - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/version.cpp b/prnt/hpijs/version.cpp index f0ad64fc4..bc3ed068d 100644 --- a/prnt/hpijs/version.cpp +++ b/prnt/hpijs/version.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ version.cpp : Definition of DeveloperString - Copyright (c) 1996 - 2001, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/hpijs/versioncode.cpp b/prnt/hpijs/versioncode.cpp index a07d9ada7..cbff6309d 100644 --- a/prnt/hpijs/versioncode.cpp +++ b/prnt/hpijs/versioncode.cpp @@ -1,7 +1,7 @@ /*****************************************************************************\ versioncode.cpp : version information routines - Copyright (c) 1996 - 2002, Hewlett-Packard Co. + Copyright (c) 1996 - 2015, HP Co. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of Hewlett-Packard nor the names of its + 3. Neither the name of HP nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/prnt/ldl.py b/prnt/ldl.py index 7a4cad6f6..e3f77f725 100644 --- a/prnt/ldl.py +++ b/prnt/ldl.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/prnt/pcl.py b/prnt/pcl.py index 9acd0193c..434912135 100644 --- a/prnt/pcl.py +++ b/prnt/pcl.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by 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 f4e8d2946..8539c5e17 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 49ef25b5c..e4b14033b 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 5a32c843d..1da653d4a 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 67f936e46..9b758c22f 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 6680398fc..3f06e40f2 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 d42898af6..1c51f8c49 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 59e3a0c45..848e02a97 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 012cd5a95..c8745d899 100644 --- a/prnt/ps/hp-cm8060_mfp_with_edgeline-ps.ppd.gz +++ b/prnt/ps/hp-cm8060_mfp_with_edgeline-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet-ps.ppd.gz b/prnt/ps/hp-color_laserjet-ps.ppd.gz Binary files differindex 8b3981aff..b15d74b16 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 a51e9e7d7..21348f43e 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 99e2cc516..7bc6eaaab 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 abd532521..a3c95dfcf 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 2e3a9606c..199fa897b 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 71a52fee4..6f4bea653 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 73fb193ae..20aadd75d 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 4b4d2fd08..56c4b4449 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 d592c8dfc..3d3889e1d 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 ae3753c1c..e90377d1b 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 004542bb7..e5f9a4338 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 0165513b3..390d64bbe 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 7e88c972e..f73df6bf2 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 b04809c1c..6350fb5cf 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 d7863f373..d468d3c60 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 42277d747..0cf4d5f38 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 67062544f..7aae50fdc 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 3baa299d8..308b64a8c 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 5124b6f8d..eb5e4ec44 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 b7ecfb154..1665048b2 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 9cb96a08a..22dc351d9 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 bac57579f..754a02f70 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 bc237cfd7..71090d780 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 91bda2bff..00236fa89 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 4e6d7c0b0..efc4c3561 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 3d7a3f403..422b6940e 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 45d9f9a9f..bfc69dcbd 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 eebe637b2..463ac9626 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 bd60c3959..d2ed78a1b 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 5b9e9b224..aa5cfe8cc 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 1cf96596f..6fca7e6c1 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 8dd20dc65..17a912098 100644 --- a/prnt/ps/hp-color_laserjet_9500_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_9500_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz Binary files differindex cd6af0d59..6667ab72f 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 76fc8ae21..8e64926ce 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 4734f360c..3d3eb70d5 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 b66db3d21..859ca974a 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 77086a3de..c4391ed33 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 6b30eff88..aa8b71a19 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 02baf3a04..088dd6348 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 5aca1b6cb..fd65bc112 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 42d2798c9..07d37d73c 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 b0b89b246..a8209fd3d 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 1cf7afbe5..5f016334d 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 99a478186..4dd6660ad 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 1856c3f60..a929c9faa 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 16b272504..cda7f6ef0 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 45a61bace..4cce5c3b5 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 7a6c6c265..62c1f19bd 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 0b5ee791c..412330692 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 051aaf6e8..3d75964ee 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 c1ff326c8..890fbe080 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 4faf0616a..ebdf5deb8 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 756216194..0dd4c774f 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 c543fb043..da45a10a1 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 608ee24e7..15e4de30f 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 c7ce0e9cc..20e1a85bc 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 de55368c8..362e6932a 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 ceda90951..73fa07611 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 f887180be..e5cf83216 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 c61fa1af3..ffdb5ba0a 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 0972701af..2213af7d2 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 f3f646bd4..cdc684ee2 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 9e05b3a11..41f3bb9cc 100644 --- a/prnt/ps/hp-color_laserjet_cp6015-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp6015-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz b/prnt/ps/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz Binary files differindex 4cb358560..9b97d500f 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 ce01d41ef..c6e596252 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_m452-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m452-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..b2c0dc4fe --- /dev/null +++ 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 differnew file mode 100644 index 000000000..67a102c52 --- /dev/null +++ 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 32e612ca9..429cc3bba 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 b1d17ab2a..ead0725fc 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_m651-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m651-ps.ppd.gz Binary files differindex 1f1f215e8..505152e77 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_m750-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m750-ps.ppd.gz Binary files differindex 9635f48c0..a56f6f4ff 100644 --- a/prnt/ps/hp-color_laserjet_m750-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m750-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz Binary files differindex fa3039349..3cd286b0d 100644 --- a/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_m274-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m274-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..378612eda --- /dev/null +++ b/prnt/ps/hp-color_laserjet_mfp_m274-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 differnew file mode 100644 index 000000000..3e82aaca7 --- /dev/null +++ b/prnt/ps/hp-color_laserjet_mfp_m577-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 84064fc5d..93f7a923f 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_pro_m252-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_m252-ps.ppd.gz Binary files differindex c2a986e8c..f1e45b1f3 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_mfp_m277-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz Binary files differindex 857441cc5..0f0a53396 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_m476-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz Binary files differindex 067060a41..be8fe1427 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 differnew file mode 100644 index 000000000..0ead9e91f --- /dev/null +++ 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 differnew file mode 100644 index 000000000..21ecf748e --- /dev/null +++ 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 5b94a3ac6..4b1e3953b 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 a5b2fbf50..0a444d220 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 161767370..8186065af 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 eb1e82df6..7985d41d1 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 d7f95aaaf..71f397ffd 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 4e97b87dd..6baaede27 100644 --- a/prnt/ps/hp-designjet_4520ps-ps.ppd.gz +++ b/prnt/ps/hp-designjet_4520ps-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_d5800-ps.ppd.gz b/prnt/ps/hp-designjet_d5800-ps.ppd.gz Binary files differindex 762b9aa30..4c3759e0e 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 dc2bfa3fd..8a7de9d1d 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 ca9c7fc29..cb1d5775a 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 55382f0c9..fffb71fb0 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 aab8d5e96..f265a8686 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 d893524b5..c26f41135 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 9c0d1c1d4..a39d98c54 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 9076f8ab4..dae9d93a3 100644 --- a/prnt/ps/hp-designjet_t1500-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_t1500-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_t2300_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t2300_postscript-ps.ppd.gz Binary files differindex 717cd2974..6a45c2560 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 275f52b99..63d2c92f5 100644 --- a/prnt/ps/hp-designjet_t2500-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_t2500-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_t3500-ps.ppd.gz b/prnt/ps/hp-designjet_t3500-ps.ppd.gz Binary files differindex ce84b66cc..0349fc718 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 08f056a10..64f929d2c 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 4007647ab..7f46ec95d 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 059c7c9d5..5c084f11b 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 348238bb0..1fafe89ef 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 41088ec3e..aa3ba30f4 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 b5143c87e..7237860cd 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 25abfdb26..7f167711b 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 a1e1a5e90..65b696180 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 9fc02094e..015c9f18c 100644 --- a/prnt/ps/hp-designjet_t920-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_t920-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz Binary files differindex 7638f0334..8b52c0e01 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 20fc193b2..5c4e1bc5a 100644 --- a/prnt/ps/hp-designjet_z5400-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_z5400-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz b/prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz Binary files differindex 5d497957a..488d90ce5 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 15a51cdb2..3435d2c96 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 fc132cf2e..b9c20be69 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 490ff5e1d..0bf576e42 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 79a710098..42d1ac986 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_z6800_photo-postscript.ppd.gz b/prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz Binary files differindex 2400b2b00..1d55d6c33 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-laserjet_100_color_mfp_m175-ps.ppd.gz b/prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz Binary files differindex b854e09c6..36493115e 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 910cd5c8c..bb7782c05 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 a8739fe76..199775ba0 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 6625be0cf..42b7e16db 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 070b1e9c0..b983a732b 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 1ef030ddc..4dfe006c2 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 8c04f7eb4..50318b7cd 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 c81818610..1f3b7ad90 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 7d941d371..e9cec426f 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 d8392a981..3cb71d154 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 0fd422182..beb46489c 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 a6f7c3a52..a2d7a0f90 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 881d2e56a..ceb4f0612 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 2d9254dc8..973bf611b 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 9789b11af..7fe8a669d 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 285950f20..1d0db036c 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 5a9718c59..1606db39f 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 5aa2409f3..9ab1a2fc6 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 425b7dbf1..2179e2c4a 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 3aa62df43..b0edf8613 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 7c5682c15..0309e3eea 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 d90f764d7..dccd29974 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 d524f0211..4640333f1 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 5fd421ece..af6576971 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 13ff0ae3e..c54615c7e 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 64031c6af..c40ade609 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 f101d3c76..919216443 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 e9a67f661..598825502 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 cb0b1f4d1..380c5f72d 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 1bdc762ec..6875e3663 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 62f77860f..740c63784 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 01f9ba121..61dbb6789 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 abb5a2d6d..64b3bd59f 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 5077750c7..b8dab4ece 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 2e2bd7ebe..683ad315c 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 02c5db71c..55ac9d330 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 c7bb3ad19..996bd6cee 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 2f2e34980..4d8b435e0 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 9d3d454b6..b252aac4b 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 0ba9ea98d..e3ecfa012 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 5cf9c5d89..8f3e1f491 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 cca3148b6..ac6d779ea 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 57655c803..238cb7996 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 e7b72b389..f6303d0e5 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 f0b34622b..16492870c 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 dbceaa227..30637f3b5 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 604ce3345..3b13c9e89 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 87df140c5..e6eb2c241 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 f7d43001d..2aa952414 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 d08c7dd22..9967ac4df 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 200b3c5df..6417c416c 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 ff04e6563..80e36b71c 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 8ce9ea31f..8f4886b8a 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 99f907176..567840400 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 d9d4dbe54..3294c1713 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 fba183861..3ab705123 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 dfa78abd5..47dddc3ab 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 a72060361..6a5acc3e2 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 6011c8c35..2b724aac7 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 6da252618..4870ef4af 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 5086f46ce..34d9eb1a2 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 c5436d27c..c421f42a2 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 ed421f3fb..bda19b46d 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 79a60776c..a4a6e4f87 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 b1a6eb95a..d7e78cc44 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 209a72189..945a5fe85 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 8329e70bd..ffbfc0548 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 ef1d196bf..2c7d6b45c 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 ac55dae65..17c0dcf1a 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 c836365a7..86f8ed6c8 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 93c2a9f77..a9fe064f8 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 d6e75a951..21e05c1dd 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 dd4eb5d2c..3652def15 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 c2572fb65..161c03185 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 2e71474e5..f44949b96 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 ec96597b4..2091948c2 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 bbf07de3d..adb6b81ca 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 a48b72bfd..8b64bca4e 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 328892782..882d295c0 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 22c289472..c8edc9f7d 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 2ab737e1b..290c10a50 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 e8a347f01..06bee0dd2 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 058d9a06d..579a3a131 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 a71b6504e..05ecc517a 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 e25edf3cc..8a0cce350 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 126046cda..f90e198af 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 dbb9aa83d..9b4a33aa4 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 33ed19f3f..bfe7ecf36 100644 --- a/prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_flow_mfp_m525-ps.ppd.gz b/prnt/ps/hp-laserjet_flow_mfp_m525-ps.ppd.gz Binary files differindex 6331b9021..bdb9319a4 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_m630-ps.ppd.gz b/prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz Binary files differindex 54e6867df..399f5859d 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 847c4dbe3..b827e45cc 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 a447333a2..7a192090e 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 0c9743b82..afc40b35c 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 383bb49ae..38fbb4617 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 6703159dc..c358277e7 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 5a9843759..f06ad607e 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 cf74baaa5..2be75e9a0 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 a07016167..d892a9cb2 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 e345827ff..fc9f7ab13 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 501f6d5da..3bc072bbc 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 e585be4dc..09d1e84ce 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 c0fbeb40f..55833f258 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 1f8556eea..22f658d45 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 differnew file mode 100644 index 000000000..c1170536c --- /dev/null +++ b/prnt/ps/hp-laserjet_m506-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 f0f69dd3a..ad13bb42c 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_m806-ps.ppd.gz b/prnt/ps/hp-laserjet_m806-ps.ppd.gz Binary files differindex d8a20666d..ff092c406 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 88c99aabb..1a61f74d3 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 420fb2321..8823b9b85 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 78a363efe..5cb564ddf 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_m426_m427-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m426_m427-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..d8444041e --- /dev/null +++ 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 89622af44..35039d97f 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 differnew file mode 100644 index 000000000..00fe513be --- /dev/null +++ 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 c1e0bc299..5104ae78d 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_m725-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz Binary files differindex a3218e451..f5d20894f 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 64dcd6dd1..0b850e7c5 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 9dda53baa..568f01404 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 eaaa70dbf..b65c15a20 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 00b8d7b10..b2ae03ad4 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 53086403e..2aed2611f 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 5afd7e908..d98f75718 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_m201_m202-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz Binary files differindex 2f518efd9..3f6ae80ca 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_m402_m403-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m402_m403-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..22f5d6fc5 --- /dev/null +++ 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 differnew file mode 100644 index 000000000..238383d34 --- /dev/null +++ b/prnt/ps/hp-laserjet_pro_m402_m403d-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 119331c73..86b85bea8 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 c1ed523a4..e5f6cfb39 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 db4dc032c..e020f7a28 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_m435-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz Binary files differindex 1f00a4113..de567ea84 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 81d60ae0a..27202a954 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 424103890..d45e08e84 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 6cdbb40cb..75d18e647 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 414c2c3b4..44ea7d521 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 d23b4cba4..19fc5c81b 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 7d5fcf2b8..bd9506875 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 8da9867de..94f3dde4f 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 3bf2654c6..6f4e6eeba 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 674ebd5d6..ad6da09cf 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 43a113024..ac13eda00 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 fe2eacda4..e8145e9a6 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 52d1a0863..54ec0d3ff 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 @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/protocol/discovery/mdns.c b/protocol/discovery/mdns.c new file mode 100644 index 000000000..3240ea906 --- /dev/null +++ b/protocol/discovery/mdns.c @@ -0,0 +1,475 @@ +/***************************************************************************** + 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; + + 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; + } + + DBG("pSocket = [%d]: %m\n", *psocket); + *psocket = udp_socket; + 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 size = 0; + + unsigned char* mdl = normalized_mdl; + while (i < len) + { + size = *p++; + i += size + 1; + + if (strncmp(p, "mdl=", 4) == 0) + { + for (j = 4; 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); + + /* 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 new file mode 100644 index 000000000..8fccc82e2 --- /dev/null +++ b/protocol/discovery/mdns.h @@ -0,0 +1,104 @@ +/*****************************************************************************\ + + 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 33e7bd2c0..24b6b5544 100644 --- a/protocol/hp_ipp.c +++ b/protocol/hp_ipp.c @@ -1,7 +1,7 @@ /******************************************************************************\ -Copyright 2015 Hewlett-Packard Development Company, L.P. +Copyright 2015 HP Development Company, L.P. This program is free software; you can redistribute it and/or modify it under the terms of version 2 of the GNU General Public License as published by the @@ -670,7 +670,7 @@ HPIPP_RESULT parseResponseHeader(char *header, int *content_length, int *chunked *chunked = 1; *content_length = 0; } - else if (ptr = strcasestr(header, "Content-Length:")) + else if (ptr = strstr(header,"Content-Length:")) { *content_length = strtol(ptr + strlen("Content-Length:"), NULL, BASE_DECIMAL); *chunked = 0; @@ -845,8 +845,11 @@ enum HPMUD_RESULT sendUSBRequest(char *buf, int size, raw_ipp *responseptr, char /* Open ipp channel. */ if ((stat = hpmud_open_channel(hd, HPMUD_S_IPP_CHANNEL, &cd)) != HPMUD_R_OK) { - BUG("Channel open failed with status code = %d\n", stat); - goto abort; + if ((stat = hpmud_open_channel(hd, HPMUD_S_IPP_CHANNEL2, &cd)) != HPMUD_R_OK) + { + BUG("Channel open failed with status code = %d\n", stat); + goto abort; + } } //Write request on the channel diff --git a/protocol/hp_ipp.h b/protocol/hp_ipp.h index 02adc6dca..3853f8432 100644 --- a/protocol/hp_ipp.h +++ b/protocol/hp_ipp.h @@ -1,6 +1,6 @@ /******************************************************************************\ -Copyright 2015 Hewlett-Packard Development Company, L.P. +Copyright 2015 HP Development Company, L.P. This program is free software; you can redistribute it and/or modify it under the terms of version 2 of the GNU General Public License as published by the diff --git a/protocol/hp_ipp_i.h b/protocol/hp_ipp_i.h index e4e506a9e..3c126076a 100644 --- a/protocol/hp_ipp_i.h +++ b/protocol/hp_ipp_i.h @@ -1,6 +1,6 @@ /******************************************************************************\ -Copyright 2015 Hewlett-Packard Development Company, L.P. +Copyright 2015 HP Development Company, L.P. This program is free software; you can redistribute it and/or modify it under the terms of version 2 of the GNU General Public License as published by the @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2011 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -37,12 +37,14 @@ import signal import time import socket import operator +import scanext # Local from base.g import * from base.sixext import PY3 from base import tui, device, module, utils, os_utils from prnt import cups +from scan import sane username = prop.username @@ -222,8 +224,19 @@ try: ]) + sane.init() + sane_devices = sane.getDevices() + devicelist = {} + for d, mfg, mdl, t in sane_devices: + try: + devicelist[d] + except KeyError: + devicelist[d] = [mdl] + else: + devicelist[d].append(mdl) + sane.deInit() device_uri = mod.getDeviceUri(device_uri, printer_name, - back_end_filter=['hpaio'], filter={'scan-type': (operator.gt, 0)}) + back_end_filter=['hpaio'], filter={'scan-type': (operator.gt, 0)}, devices=devicelist) if not device_uri: sys.exit(1) @@ -602,8 +615,6 @@ try: else: # INTERACTIVE_MODE from base.sixext.moves import queue - from scan import sane - import scanext try: import subprocess diff --git a/scan/__init__.py b/scan/__init__.py index ffdcaff09..c740ead61 100644 --- a/scan/__init__.py +++ b/scan/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/scan/sane.py b/scan/sane.py index 996e00dec..b6fea7eb8 100755 --- a/scan/sane.py +++ b/scan/sane.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/scan/sane/bb_ledm.c b/scan/sane/bb_ledm.c index bf2c093c3..b233d1e28 100644 --- a/scan/sane/bb_ledm.c +++ b/scan/sane/bb_ledm.c @@ -1,6 +1,6 @@ /************************************************************************************\ bb_ledm.c - HP SANE backend support for ledm based multi-function peripherals - (c) 2010 Copyright Hewlett-Packard Development Company, LP + (c) 2010 Copyright HP Development Company, LP Primary Author: Naga Samrat Chowdary, Narla Contributing Authors: Yashwant Kumar Sahu, Sarbeswar Meher diff --git a/scan/sane/common.c b/scan/sane/common.c index 22fce82ea..3144fcfe1 100755 --- a/scan/sane/common.c +++ b/scan/sane/common.c @@ -2,7 +2,7 @@ common.c - common code for scl, pml, and soap backends - (c) 2001-2006 Copyright Hewlett-Packard Development Company, LP + (c) 2001-2006 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 diff --git a/scan/sane/common.h b/scan/sane/common.h index b42a28749..0f67542df 100644 --- a/scan/sane/common.h +++ b/scan/sane/common.h @@ -2,7 +2,7 @@ common.h - common code for scl, pml and soap backends - (c) 2001-2006 Copyright Hewlett-Packard Development Company, LP + (c) 2001-2006 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 diff --git a/scan/sane/escl.c b/scan/sane/escl.c new file mode 100644 index 000000000..7983fd40f --- /dev/null +++ b/scan/sane/escl.c @@ -0,0 +1,1117 @@ +/************************************************************************************\ + escl.c - HP SANE backend support for eSCL based multi-function peripherals + (c) 2012-15 Copyright HP Development Company, LP + + Primary Author: Sarbeswar Meher + +\************************************************************************************/ + +# ifndef _GNU_SOURCE +# define _GNU_SOURCE +# endif + +# include <stdarg.h> +# include <syslog.h> +# include <stdio.h> +# include <string.h> +# include <dlfcn.h> +# include <fcntl.h> +# include <unistd.h> +# include "saneopts.h" +# include "common.h" +# include "hpmud.h" +# include "hpip.h" +# include "escl.h" +# include "escli.h" +# include "io.h" +#include "utils.h" + +# define DEBUG_DECLARE_ONLY +# include "sanei_debug.h" + +static struct escl_session *session = NULL; + + +static int bb_load(struct escl_session *ps, const char *so) +{ + int stat=1; + + /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ + if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL) + { + if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL) + goto bugout; + } + + /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ + if ((ps->math_handle = load_library("libm.so")) == NULL) + { + if ((ps->math_handle = load_library("libm.so.6")) == NULL) + goto bugout; + } + if ((ps->bb_handle = load_plugin_library(UTILS_SCAN_PLUGIN_LIBRARY, so)) == NULL) + { + SendScanEvent(ps->uri, EVENT_PLUGIN_FAIL); + goto bugout; + } + if ((ps->bb_open = get_library_symbol(ps->bb_handle, "bb_open")) == NULL) + goto bugout; + _DBG("Calling bb_open\n"); + if ((ps->bb_close = get_library_symbol(ps->bb_handle, "bb_close")) == NULL) + goto bugout; + + if ((ps->bb_get_parameters = get_library_symbol(ps->bb_handle, "bb_get_parameters")) == NULL) + goto bugout; + + if ((ps->bb_check_scanner_to_continue = get_library_symbol(ps->bb_handle, "bb_check_scanner_to_continue")) == NULL) + goto bugout; + + if ((ps->bb_start_scan = get_library_symbol(ps->bb_handle, "bb_start_scan")) == NULL) + goto bugout; + + if ((ps->bb_end_scan = get_library_symbol(ps->bb_handle, "bb_end_scan")) == NULL) + goto bugout; + + if ((ps->bb_get_image_data = get_library_symbol(ps->bb_handle, "bb_get_image_data")) == NULL) + goto bugout; + + if ((ps->bb_end_page = get_library_symbol(ps->bb_handle, "bb_end_page")) == NULL) + goto bugout; + _DBG("Calling bb_load EXIT\n"); + stat=0; + +bugout: + return stat; +} + +static int bb_unload(struct escl_session *ps) +{ + _DBG("Calling escl bb_unload: \n"); + if (ps->bb_handle) + { + dlclose(ps->bb_handle); + ps->bb_handle = NULL; + } + if (ps->hpmud_handle) + { + dlclose(ps->hpmud_handle); + ps->hpmud_handle = NULL; + } + if (ps->math_handle) + { + dlclose(ps->math_handle); + ps->math_handle = NULL; + } + return 0; +} + +static int escl_set_extents(struct escl_session *ps) +{ + int stat = 0; + _DBG("escl_set_extents minWidth=%d minHeight=%d Source Range[%d, %d, %d, %d] Current Range[%d, %d, %d, %d]\n", + ps->min_width, ps->min_height, + ps->tlxRange.max, ps->brxRange.max, ps->tlyRange.max, ps->bryRange.max, + ps->currentTlx, ps->currentBrx, ps->currentTly, ps->currentBry); + + if ((ps->currentBrx > ps->currentTlx) && (ps->currentBrx - ps->currentTlx >= ps->min_width) && (ps->currentBrx - ps->currentTlx <= ps->tlxRange.max)) + { + ps->effectiveTlx = ps->currentTlx; + ps->effectiveBrx = ps->currentBrx; + } + else + { + ps->effectiveTlx = ps->currentTlx = 0; /* current setting is not valid, zero it */ + ps->effectiveBrx = ps->currentBrx = ps->brxRange.max; + } + + if ((ps->currentBry > ps->currentTly) && (ps->currentBry - ps->currentTly > ps->min_height) && (ps->currentBry - ps->currentTly <= ps->tlyRange.max)) + { + ps->effectiveTly = ps->currentTly; + ps->effectiveBry = ps->currentBry; + } + else + { + ps->effectiveTly = ps->currentTly = 0; /* current setting is not valid, zero it */ + ps->effectiveBry = ps->currentBry = ps->bryRange.max; + } + return stat; +} /* escl_set_extents */ + +static struct escl_session *create_session() +{ + struct escl_session *ps; + + if ((ps = malloc(sizeof(struct escl_session))) == NULL) + { + return NULL; + } + memset(ps, 0, sizeof(struct escl_session)); + ps->tag = "ESCL"; + ps->dd = -1; + ps->cd = -1; + memset(ps->job_id, 0, sizeof(ps->job_id)); + ps->page_id = 0; + return ps; +} /* create_session */ + +/* Get raw data (ie: uncompressed data) from image processor. */ +static int get_ip_data(struct escl_session *ps, SANE_Byte *data, SANE_Int maxLength, SANE_Int *length) +{ + int ip_ret=IP_INPUT_ERROR; + unsigned int outputAvail=maxLength, outputUsed=0, outputThisPos; + unsigned char *input, *output = data; + unsigned int inputAvail, inputUsed=0, inputNextPos; + enum ESCL_RESULT stat = ESCL_R_IO_ERROR; + + _DBG("get_ip_data....\n"); + if (!ps->ip_handle) goto bugout; + + stat = ps->bb_get_image_data(ps, outputAvail); + if(stat == ESCL_R_IO_ERROR) goto bugout; + + if (ps->cnt > 0) + { + inputAvail = ps->cnt; + input = &ps->buf[ps->index]; + } + else + { + input = NULL; + inputAvail = 0; + } + + /* Transform input data to output. Note, output buffer may consume more bytes than input buffer (ie: jpeg to raster). */ + ip_ret = ipConvert(ps->ip_handle, inputAvail, input, &inputUsed, &inputNextPos, outputAvail, output, &outputUsed, &outputThisPos); + + _DBG("ip_ret=%x cnt=%d index=%d input=%p inputAvail=%d inputUsed=%d inputNextPos=%d output=%p outputAvail=%d outputUsed=%d outputThisPos=%d\n", ip_ret, ps->cnt, ps->index, input, + inputAvail, inputUsed, inputNextPos, output, outputAvail, outputUsed, outputThisPos); + + if (input != NULL) + { + if (inputAvail == inputUsed) + { + ps->index = ps->cnt = 0; // + } + else + { + ps->cnt -= inputUsed; // save left over buffer for next soap_read + ps->index += inputUsed; + } + } + + if (data) + *length = outputUsed; + + /* For sane do not send output data simultaneously with IP_DONE. */ + if (ip_ret & IP_DONE && outputUsed) + ip_ret &= ~IP_DONE; + +bugout: + _DBG("get_ip_data returning (%d).\n", ip_ret); + return ip_ret; +} /* get_ip_data */ + + +static int set_scan_mode_side_effects(struct escl_session *ps, enum COLOR_ENTRY scanMode) +{ + int j=0; + + _DBG("set_scan_mode_side_effects....\n"); + memset(ps->compressionList, 0, sizeof(ps->compressionList)); + memset(ps->compressionMap, 0, sizeof(ps->compressionMap)); + + switch (scanMode) + { + case CE_K1: /* same as GRAY8 */ + case CE_GRAY8: + case CE_COLOR8: + default: + ps->compressionList[j] = STR_COMPRESSION_JPEG; + ps->compressionMap[j++] = SF_JPEG; + ps->currentCompression = SF_JPEG; + ps->option[ESCL_OPTION_JPEG_QUALITY].cap |= SANE_CAP_SOFT_SELECT; /* enable jpeg quality */ + break; + } + return 0; +} /* set_scan_mode_side_effects */ + +static int set_input_source_side_effects(struct escl_session *ps, enum INPUT_SOURCE source) +{ + + _DBG("set_input_source_side_effects....\n"); + switch (source) + { + case IS_CAMERA: + ps->min_width = ps->camera_min_width; + ps->min_height = ps->camera_min_height; + ps->tlxRange.max = ps->camera_tlxRange.max; + ps->brxRange.max = ps->camera_brxRange.max; + ps->tlyRange.max = ps->camera_tlyRange.max; + ps->bryRange.max = ps->camera_bryRange.max; + break; + case IS_ADF: + ps->min_width = ps->adf_min_width; + ps->min_height = ps->adf_min_height; + ps->tlxRange.max = ps->adf_tlxRange.max; + ps->brxRange.max = ps->adf_brxRange.max; + ps->tlyRange.max = ps->adf_tlyRange.max; + ps->bryRange.max = ps->adf_bryRange.max; + break; + case IS_ADF_DUPLEX: + ps->min_width = ps->duplex_min_width; + ps->min_height = ps->duplex_min_height; + ps->tlxRange.max = ps->duplex_tlxRange.max; + ps->brxRange.max = ps->duplex_brxRange.max; + ps->tlyRange.max = ps->duplex_tlyRange.max; + ps->bryRange.max = ps->duplex_bryRange.max; + break; + case IS_PLATEN: + default: + ps->min_width = ps->platen_min_width; + ps->min_height = ps->platen_min_height; + ps->tlxRange.max = ps->platen_tlxRange.max; + ps->brxRange.max = ps->platen_brxRange.max; + ps->tlyRange.max = ps->platen_tlyRange.max; + ps->bryRange.max = ps->platen_bryRange.max; + break; + } + return 0; +} /* set_input_source_side_effects */ + +static int init_options(struct escl_session *ps) +{ + _DBG("init_options....\n"); + ps->option[ESCL_OPTION_COUNT].name = "option-cnt"; + ps->option[ESCL_OPTION_COUNT].title = SANE_TITLE_NUM_OPTIONS; + ps->option[ESCL_OPTION_COUNT].desc = SANE_DESC_NUM_OPTIONS; + ps->option[ESCL_OPTION_COUNT].type = SANE_TYPE_INT; + ps->option[ESCL_OPTION_COUNT].unit = SANE_UNIT_NONE; + ps->option[ESCL_OPTION_COUNT].size = sizeof(SANE_Int); + ps->option[ESCL_OPTION_COUNT].cap = SANE_CAP_SOFT_DETECT; + ps->option[ESCL_OPTION_COUNT].constraint_type = SANE_CONSTRAINT_NONE; + + ps->option[ESCL_OPTION_GROUP_SCAN_MODE].name = "mode-group"; + ps->option[ESCL_OPTION_GROUP_SCAN_MODE].title = SANE_TITLE_SCAN_MODE; + ps->option[ESCL_OPTION_GROUP_SCAN_MODE].type = SANE_TYPE_GROUP; + + ps->option[ESCL_OPTION_SCAN_MODE].name = SANE_NAME_SCAN_MODE; + ps->option[ESCL_OPTION_SCAN_MODE].title = SANE_TITLE_SCAN_MODE; + ps->option[ESCL_OPTION_SCAN_MODE].desc = SANE_DESC_SCAN_MODE; + ps->option[ESCL_OPTION_SCAN_MODE].type = SANE_TYPE_STRING; + ps->option[ESCL_OPTION_SCAN_MODE].unit = SANE_UNIT_NONE; + ps->option[ESCL_OPTION_SCAN_MODE].size = MAX_STRING_SIZE; + ps->option[ESCL_OPTION_SCAN_MODE].cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT; + ps->option[ESCL_OPTION_SCAN_MODE].constraint_type = SANE_CONSTRAINT_STRING_LIST; + ps->option[ESCL_OPTION_SCAN_MODE].constraint.string_list = ps->scanModeList; + + ps->option[ESCL_OPTION_INPUT_SOURCE].name = SANE_NAME_SCAN_SOURCE; + ps->option[ESCL_OPTION_INPUT_SOURCE].title = SANE_TITLE_SCAN_SOURCE; + ps->option[ESCL_OPTION_INPUT_SOURCE].desc = SANE_DESC_SCAN_SOURCE; + ps->option[ESCL_OPTION_INPUT_SOURCE].type = SANE_TYPE_STRING; + ps->option[ESCL_OPTION_INPUT_SOURCE].unit = SANE_UNIT_NONE; + ps->option[ESCL_OPTION_INPUT_SOURCE].size = MAX_STRING_SIZE; + ps->option[ESCL_OPTION_INPUT_SOURCE].cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT; + ps->option[ESCL_OPTION_INPUT_SOURCE].constraint_type = SANE_CONSTRAINT_STRING_LIST; + ps->option[ESCL_OPTION_INPUT_SOURCE].constraint.string_list = ps->inputSourceList; + + ps->option[ESCL_OPTION_SCAN_RESOLUTION].name = SANE_NAME_SCAN_RESOLUTION; + ps->option[ESCL_OPTION_SCAN_RESOLUTION].title = SANE_TITLE_SCAN_RESOLUTION; + ps->option[ESCL_OPTION_SCAN_RESOLUTION].desc = SANE_DESC_SCAN_RESOLUTION; + ps->option[ESCL_OPTION_SCAN_RESOLUTION].type = SANE_TYPE_INT; + ps->option[ESCL_OPTION_SCAN_RESOLUTION].unit = SANE_UNIT_DPI; + ps->option[ESCL_OPTION_SCAN_RESOLUTION].size = sizeof(SANE_Int); + ps->option[ESCL_OPTION_SCAN_RESOLUTION].cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT; + ps->option[ESCL_OPTION_SCAN_RESOLUTION].constraint_type = SANE_CONSTRAINT_WORD_LIST; + ps->option[ESCL_OPTION_SCAN_RESOLUTION].constraint.word_list = ps->resolutionList; + + ps->option[ESCL_OPTION_GROUP_ADVANCED].name = "advanced-group"; + ps->option[ESCL_OPTION_GROUP_ADVANCED].title = STR_TITLE_ADVANCED; + ps->option[ESCL_OPTION_GROUP_ADVANCED].type = SANE_TYPE_GROUP; + ps->option[ESCL_OPTION_GROUP_ADVANCED].cap = SANE_CAP_ADVANCED; + + ps->option[ESCL_OPTION_COMPRESSION].name = STR_NAME_COMPRESSION; + ps->option[ESCL_OPTION_COMPRESSION].title = STR_TITLE_COMPRESSION; + ps->option[ESCL_OPTION_COMPRESSION].desc = STR_DESC_COMPRESSION; + ps->option[ESCL_OPTION_COMPRESSION].type = SANE_TYPE_STRING; + ps->option[ESCL_OPTION_COMPRESSION].unit = SANE_UNIT_NONE; + ps->option[ESCL_OPTION_COMPRESSION].size = MAX_STRING_SIZE; + ps->option[ESCL_OPTION_COMPRESSION].cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT | SANE_CAP_ADVANCED; + ps->option[ESCL_OPTION_COMPRESSION].constraint_type = SANE_CONSTRAINT_STRING_LIST; + ps->option[ESCL_OPTION_COMPRESSION].constraint.string_list = ps->compressionList; + + ps->option[ESCL_OPTION_JPEG_QUALITY].name = STR_NAME_JPEG_QUALITY; + ps->option[ESCL_OPTION_JPEG_QUALITY].title = STR_TITLE_JPEG_QUALITY; + ps->option[ESCL_OPTION_JPEG_QUALITY].desc = STR_DESC_JPEG_QUALITY; + ps->option[ESCL_OPTION_JPEG_QUALITY].type = SANE_TYPE_INT; + ps->option[ESCL_OPTION_JPEG_QUALITY].unit = SANE_UNIT_NONE; + ps->option[ESCL_OPTION_JPEG_QUALITY].size = sizeof(SANE_Int); + ps->option[ESCL_OPTION_JPEG_QUALITY].cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT | SANE_CAP_ADVANCED; + ps->option[ESCL_OPTION_JPEG_QUALITY].constraint_type = SANE_CONSTRAINT_RANGE; + ps->option[ESCL_OPTION_JPEG_QUALITY].constraint.range = &ps->jpegQualityRange; + ps->jpegQualityRange.min = MIN_JPEG_COMPRESSION_FACTOR; + ps->jpegQualityRange.max = MAX_JPEG_COMPRESSION_FACTOR; + ps->jpegQualityRange.quant = 0; + + ps->option[ESCL_OPTION_GROUP_GEOMETRY].name = "geometry-group"; + ps->option[ESCL_OPTION_GROUP_GEOMETRY].title = STR_TITLE_GEOMETRY; + ps->option[ESCL_OPTION_GROUP_GEOMETRY].type = SANE_TYPE_GROUP; + ps->option[ESCL_OPTION_GROUP_GEOMETRY].cap = SANE_CAP_ADVANCED; + + ps->option[ESCL_OPTION_TL_X].name = SANE_NAME_SCAN_TL_X; + ps->option[ESCL_OPTION_TL_X].title = SANE_TITLE_SCAN_TL_X; + ps->option[ESCL_OPTION_TL_X].desc = SANE_DESC_SCAN_TL_X; + ps->option[ESCL_OPTION_TL_X].type = SANE_TYPE_FIXED; + ps->option[ESCL_OPTION_TL_X].unit = SANE_UNIT_MM; + ps->option[ESCL_OPTION_TL_X].size = sizeof(SANE_Int); + ps->option[ESCL_OPTION_TL_X].cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT; + ps->option[ESCL_OPTION_TL_X].constraint_type = SANE_CONSTRAINT_RANGE; + ps->option[ESCL_OPTION_TL_X].constraint.range = &ps->tlxRange; + ps->tlxRange.min = 0; + ps->tlxRange.quant = 0; + + ps->option[ESCL_OPTION_TL_Y].name = SANE_NAME_SCAN_TL_Y; + ps->option[ESCL_OPTION_TL_Y].title = SANE_TITLE_SCAN_TL_Y; + ps->option[ESCL_OPTION_TL_Y].desc = SANE_DESC_SCAN_TL_Y; + ps->option[ESCL_OPTION_TL_Y].type = SANE_TYPE_FIXED; + ps->option[ESCL_OPTION_TL_Y].unit = SANE_UNIT_MM; + ps->option[ESCL_OPTION_TL_Y].size = sizeof(SANE_Int); + ps->option[ESCL_OPTION_TL_Y].cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT; + ps->option[ESCL_OPTION_TL_Y].constraint_type = SANE_CONSTRAINT_RANGE; + ps->option[ESCL_OPTION_TL_Y].constraint.range = &ps->tlyRange; + ps->tlyRange.min = 0; + ps->tlyRange.quant = 0; + + ps->option[ESCL_OPTION_BR_X].name = SANE_NAME_SCAN_BR_X; + ps->option[ESCL_OPTION_BR_X].title = SANE_TITLE_SCAN_BR_X; + ps->option[ESCL_OPTION_BR_X].desc = SANE_DESC_SCAN_BR_X; + ps->option[ESCL_OPTION_BR_X].type = SANE_TYPE_FIXED; + ps->option[ESCL_OPTION_BR_X].unit = SANE_UNIT_MM; + ps->option[ESCL_OPTION_BR_X].size = sizeof(SANE_Int); + ps->option[ESCL_OPTION_BR_X].cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT; + ps->option[ESCL_OPTION_BR_X].constraint_type = SANE_CONSTRAINT_RANGE; + ps->option[ESCL_OPTION_BR_X].constraint.range = &ps->brxRange; + ps->brxRange.min = 0; + ps->brxRange.quant = 0; + + ps->option[ESCL_OPTION_BR_Y].name = SANE_NAME_SCAN_BR_Y; + ps->option[ESCL_OPTION_BR_Y].title = SANE_TITLE_SCAN_BR_Y; + ps->option[ESCL_OPTION_BR_Y].desc = SANE_DESC_SCAN_BR_Y; + ps->option[ESCL_OPTION_BR_Y].type = SANE_TYPE_FIXED; + ps->option[ESCL_OPTION_BR_Y].unit = SANE_UNIT_MM; + ps->option[ESCL_OPTION_BR_Y].size = sizeof(SANE_Int); + ps->option[ESCL_OPTION_BR_Y].cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT; + ps->option[ESCL_OPTION_BR_Y].constraint_type = SANE_CONSTRAINT_RANGE; + ps->option[ESCL_OPTION_BR_Y].constraint.range = &ps->bryRange; + ps->bryRange.min = 0; + ps->bryRange.quant = 0; + +return 0; +} /* init_options */ + +/*----------------------------------- ESCL API Calls ------------------------------------*/ + +SANE_Status __attribute__ ((visibility ("hidden"))) escl_open(SANE_String_Const device, SANE_Handle *handle) +{ + struct hpmud_model_attributes ma; + int stat = SANE_STATUS_IO_ERROR; + + _DBG("escl_open() session=%p\n", session); + if(session) + { + return SANE_STATUS_DEVICE_BUSY; + } + if((session = create_session()) == NULL) + return SANE_STATUS_NO_MEM; + + /* Set session to specified device. */ + snprintf(session->uri, sizeof(session->uri)-1, "hp:%s", device); /* prepend "hp:" */ + + /* Get actual model attributes from models.dat */ + hpmud_query_model(session->uri, &ma); + session->scan_type = ma.scantype; + + if (hpmud_open_device(session->uri, ma.mfp_mode, &session->dd) != HPMUD_R_OK) + goto bugout; + + if (bb_load(session, SCAN_PLUGIN_ESCL)) + goto bugout; + _DBG("escl_open() calling %s PASSED\n", SCAN_PLUGIN_ESCL); + init_options(session); + + if (session->bb_open (session)) + goto bugout; + + /* Set supported Scan Modes as determined by bb_open. */ + escl_control_option(session, ESCL_OPTION_SCAN_MODE, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */ + + /* Set scan input sources as determined by bb_open. */ + escl_control_option(session, ESCL_OPTION_INPUT_SOURCE, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */ + + /* Set supported resolutions. */ + escl_control_option(session, ESCL_OPTION_SCAN_RESOLUTION, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */ + + /* Set supported compression */ + escl_control_option(session, ESCL_OPTION_COMPRESSION, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */ + + /* Determine supported jpeg quality factor as determined by bb_open. */ + escl_control_option(session, ESCL_OPTION_JPEG_QUALITY, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */ + + /* Set x,y extents. See bb_open */ + escl_control_option(session, ESCL_OPTION_TL_X, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */ + escl_control_option(session, ESCL_OPTION_TL_Y, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */ + escl_control_option(session, ESCL_OPTION_BR_X, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */ + escl_control_option(session, ESCL_OPTION_BR_Y, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */ + + *handle = (SANE_Handle *)session; + + stat = SANE_STATUS_GOOD; + +bugout: + if(stat != SANE_STATUS_GOOD) + { + bb_unload(session); + if (session->cd > 0) + hpmud_close_channel(session->dd, session->cd); + if (session->dd > 0) + hpmud_close_device(session->dd); + free(session); + session = NULL; + } + return stat; +} /* escl_open */ + +const SANE_Option_Descriptor *escl_get_option_descriptor(SANE_Handle handle, SANE_Int option) +{ + struct escl_session *ps = (struct escl_session *)handle; + + // DBG8("sane_hpaio_get_option_descriptor(option=%s) \n", ps->option[option].name); + + if (option < 0 || option >= ESCL_OPTION_MAX) + return NULL; + + return &ps->option[option]; +} /* escl_get_option_descriptor */ + +SANE_Status escl_control_option(SANE_Handle handle, SANE_Int option, SANE_Action action, void *value, SANE_Int *set_result) +{ + struct escl_session *ps = (struct escl_session *)handle; + SANE_Int *int_value = value, mset_result=0; + int i, stat=SANE_STATUS_INVAL; + int found = 0; + + switch(option) + { + case ESCL_OPTION_COUNT: + if (action == SANE_ACTION_GET_VALUE) + { + *int_value = ESCL_OPTION_MAX; + stat = SANE_STATUS_GOOD; + } + break; + case ESCL_OPTION_SCAN_MODE: + if(action == SANE_ACTION_GET_VALUE) + { + for(i=0; ps->scanModeList[i]; i++) + { + if(ps->currentScanMode == ps->scanModeMap[i]) + { + strcpy(value, ps->scanModeList[i]); + stat = SANE_STATUS_GOOD; + break; + } + } + } + else if (action == SANE_ACTION_SET_VALUE) + { + for (i=0; ps->scanModeList[i]; i++) + { + if (strcasecmp(ps->scanModeList[i], value) == 0) + { + ps->currentScanMode = ps->scanModeMap[i]; + set_scan_mode_side_effects(ps, ps->currentScanMode); + mset_result |= SANE_INFO_RELOAD_PARAMS | SANE_INFO_RELOAD_OPTIONS; + stat = SANE_STATUS_GOOD; + break; + } + } + } + else + { /* Set default. */ + ps->currentScanMode = CE_COLOR8; + set_scan_mode_side_effects(ps, ps->currentScanMode); + stat = SANE_STATUS_GOOD; + } + break; + case ESCL_OPTION_INPUT_SOURCE: + if (action == SANE_ACTION_GET_VALUE) + { + for (i=0; ps->inputSourceList[i]; i++) + { + if (ps->currentInputSource == ps->inputSourceMap[i]) + { + strcpy(value, ps->inputSourceList[i]); + stat = SANE_STATUS_GOOD; + break; + } + } + } + else if (action == SANE_ACTION_SET_VALUE) + { + for (i=0; ps->inputSourceList[i]; i++) + { + if (strcasecmp(ps->inputSourceList[i], value) == 0) + { + ps->currentInputSource = ps->inputSourceMap[i]; + set_input_source_side_effects(ps, ps->currentInputSource); + if(ps->currentInputSource == IS_PLATEN) + { + i = session->platen_resolutionList[0] + 1; + while(i--) + { + session->resolutionList[i] = session->platen_resolutionList[i]; + if(session->resolutionList[i] == ps->currentResolution) + found = 1; + } + } + else if(ps->currentInputSource == IS_ADF) + { + i = session->adf_resolutionList[0] + 1; + while(i--) + { + session->resolutionList[i] = session->adf_resolutionList[i]; + if(session->resolutionList[i] == ps->currentResolution) + found = 1; + } + } + else if(ps->currentInputSource == IS_ADF_DUPLEX) + { + i = session->duplex_resolutionList[0] + 1; + while(i--) + { + session->resolutionList[i] = session->duplex_resolutionList[i]; + if(session->resolutionList[i] == ps->currentResolution) + found = 1; + } + } + else if(ps->currentInputSource == IS_CAMERA) + { + i = session->camera_resolutionList[0] + 1; + while(i--) session->resolutionList[i] = session->camera_resolutionList[i]; + } + + if(found == 0) + { + _DBG("Resolution (%d) is not supported in input source (%d).\n", ps->currentResolution, ps->currentInputSource); + ps->currentResolution = session->resolutionList[1]; + } + + mset_result |= SANE_INFO_RELOAD_PARAMS | SANE_INFO_RELOAD_OPTIONS; + stat = SANE_STATUS_GOOD; + break; + } + } + } + else + { /* Set default. */ + ps->currentInputSource = IS_PLATEN; + set_input_source_side_effects(ps, ps->currentInputSource); + mset_result |= SANE_INFO_RELOAD_PARAMS | SANE_INFO_RELOAD_OPTIONS; + stat = SANE_STATUS_GOOD; + } + break; + case ESCL_OPTION_SCAN_RESOLUTION: + if (action == SANE_ACTION_GET_VALUE) + { + *int_value = ps->currentResolution; + stat = SANE_STATUS_GOOD; + } + else if (action == SANE_ACTION_SET_VALUE) + { + for (i=1; i <= ps->resolutionList[0]; i++) + { + if (ps->resolutionList[i] == *int_value) + { + ps->currentResolution = *int_value; + if(ps->currentResolution == 4800) SendScanEvent(ps->uri, EVENT_SIZE_WARNING); + mset_result |= SANE_INFO_RELOAD_PARAMS; + stat = SANE_STATUS_GOOD; + break; + } + } + } + else + { /* Set default. */ + ps->currentResolution = 75; + stat = SANE_STATUS_GOOD; + } + break; + case ESCL_OPTION_COMPRESSION: + if (action == SANE_ACTION_GET_VALUE) + { + for (i=0; ps->compressionList[i]; i++) + { + if (ps->currentCompression == ps->compressionMap[i]) + { + strcpy(value, ps->compressionList[i]); + stat = SANE_STATUS_GOOD; + break; + } + } + } + else if (action == SANE_ACTION_SET_VALUE) + { + for (i=0; ps->compressionList[i]; i++) + { + if (strcasecmp(ps->compressionList[i], value) == 0) + { + ps->currentCompression = ps->compressionMap[i]; + stat = SANE_STATUS_GOOD; + break; + } + } + } + else + { /* Set default. */ + ps->currentCompression = SF_JPEG; + stat = SANE_STATUS_GOOD; + } + break; + case ESCL_OPTION_JPEG_QUALITY: + if (action == SANE_ACTION_GET_VALUE) + { + *int_value = ps->currentJpegQuality; + stat = SANE_STATUS_GOOD; + } + else if (action == SANE_ACTION_SET_VALUE) + { + if (*int_value >= MIN_JPEG_COMPRESSION_FACTOR && *int_value <= MAX_JPEG_COMPRESSION_FACTOR) + { + ps->currentJpegQuality = *int_value; + stat = SANE_STATUS_GOOD; + break; + } + } + else + { /* Set default. */ + ps->currentJpegQuality = SAFER_JPEG_COMPRESSION_FACTOR; + stat = SANE_STATUS_GOOD; + } + break; + case ESCL_OPTION_TL_X: + if (action == SANE_ACTION_GET_VALUE) + { + *int_value = ps->currentTlx; + stat = SANE_STATUS_GOOD; + } + else if (action == SANE_ACTION_SET_VALUE) + { + if (*int_value >= ps->tlxRange.min && *int_value <= ps->tlxRange.max) + { + ps->currentTlx = *int_value; + mset_result |= SANE_INFO_RELOAD_PARAMS; + stat = SANE_STATUS_GOOD; + break; + } + } + else + { /* Set default. */ + ps->currentTlx = ps->tlxRange.min; + stat = SANE_STATUS_GOOD; + } + break; + case ESCL_OPTION_TL_Y: + if (action == SANE_ACTION_GET_VALUE) + { + *int_value = ps->currentTly; + stat = SANE_STATUS_GOOD; + } + else if (action == SANE_ACTION_SET_VALUE) + { + if (*int_value >= ps->tlyRange.min && *int_value <= ps->tlyRange.max) + { + + ps->currentTly = *int_value; + mset_result |= SANE_INFO_RELOAD_PARAMS; + stat = SANE_STATUS_GOOD; + break; + } + } + else + { /* Set default. */ + ps->currentTly = ps->tlyRange.min; + stat = SANE_STATUS_GOOD; + } + break; + case ESCL_OPTION_BR_X: + if (action == SANE_ACTION_GET_VALUE) + { + *int_value = ps->currentBrx; + stat = SANE_STATUS_GOOD; + } + else if (action == SANE_ACTION_SET_VALUE) + { + if (*int_value >= ps->brxRange.min && *int_value <= ps->brxRange.max) + { + ps->currentBrx = *int_value; + mset_result |= SANE_INFO_RELOAD_PARAMS; + stat = SANE_STATUS_GOOD; + break; + } + } + else + { /* Set default. */ + ps->currentBrx = ps->brxRange.max; + stat = SANE_STATUS_GOOD; + } + break; + case ESCL_OPTION_BR_Y: + if (action == SANE_ACTION_GET_VALUE) + { + *int_value = ps->currentBry; + stat = SANE_STATUS_GOOD; + } + else if (action == SANE_ACTION_SET_VALUE) + { + if (*int_value >= ps->bryRange.min && *int_value <= ps->bryRange.max) + { + ps->currentBry = *int_value; + mset_result |= SANE_INFO_RELOAD_PARAMS; + stat = SANE_STATUS_GOOD; + break; + } + } + else + { /* Set default. */ + ps->currentBry = ps->bryRange.max; + stat = SANE_STATUS_GOOD; + } + break; + default: + break; + } + + if (set_result) + *set_result = mset_result; + //DBG8("escl_control_option (option=%s) action=%d\n", ps->option[option].name, action); + if (stat != SANE_STATUS_GOOD) + { + BUG("control_option failed: option=%s action=%s\n", ps->option[option].name, action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto"); + } + + return stat; +} /* escl_control_option */ + +SANE_Status escl_get_parameters(SANE_Handle handle, SANE_Parameters *params) +{ + struct escl_session *ps = (struct escl_session *)handle; + + escl_set_extents(ps); + + /* Get scan parameters for sane client. */ + ps->bb_get_parameters(ps, params, ps->ip_handle ? SPO_STARTED : SPO_BEST_GUESS); + + /*_DBG("sane_hpaio_get_parameters(): format=%d, last_frame=%d, lines=%d, depth=%d, pixels_per_line=%d, bytes_per_line=%d\n", + params->format, params->last_frame, params->lines, params->depth, params->pixels_per_line, params->bytes_per_line); + */ + return SANE_STATUS_GOOD; +} /* escl_get_parameters */ + +static void escl_send_event(struct escl_session *ps, SANE_Status stat) +{ + int event = 0; + switch(stat) + { + case SANE_STATUS_NO_DOCS: + event = EVENT_SCAN_ADF_NO_DOCS; + break; + case SANE_STATUS_JAMMED: + event = EVENT_SCAN_ADF_JAM; + break; + case SANE_STATUS_DEVICE_BUSY: + event = EVENT_SCAN_BUSY; + break; + case SANE_STATUS_UNSUPPORTED: + event = EVENT_SCAN_ADF_MISPICK; + break; + case SANE_STATUS_CANCELLED: + event = EVENT_SCAN_CANCEL; + break; + case SANE_STATUS_ACCESS_DENIED: + case SANE_STATUS_INVAL: + case SANE_STATUS_NO_MEM: + break; + case SANE_STATUS_GOOD: + default: + break; + } + + SendScanEvent (ps->uri, event); + _DBG("escl_send_event event[%d] uri[%s]\n", event, ps->uri); +} + +SANE_Status escl_start(SANE_Handle handle) +{ + struct escl_session *ps = (struct escl_session *)handle; + SANE_Parameters pp; + IP_IMAGE_TRAITS traits; + IP_XFORM_SPEC xforms[IP_MAX_XFORMS], *pXform=xforms; + SANE_Status stat = SANE_STATUS_IO_ERROR; + int ret; + + _DBG("escl_start entry. uri=[%s] InputSource=[%d]\n", ps->uri, ps->currentInputSource); + + ps -> user_cancel = 0; + ps -> cnt = 0; + ps -> index = 0; + + set_input_source_side_effects(ps, ps->currentInputSource); + if (escl_set_extents(ps)) + { + stat = SANE_STATUS_INVAL; + goto bugout; + } + + stat = ps->bb_check_scanner_to_continue(ps); + + escl_send_event(ps, stat); + if(stat != SANE_STATUS_GOOD) return stat; + + /* Start scan and get actual image traits. */ + stat = ps->bb_start_scan(ps); + + if (stat != SANE_STATUS_GOOD) return stat; + + if(ps->user_cancel) + { + stat = SANE_STATUS_GOOD ; + goto bugout; + } + + SendScanEvent(ps->uri, EVENT_START_SCAN_JOB); + _DBG("escl_start() EVENT_START_SCAN_JOB uri=[%s]\n", ps->uri); + memset(xforms, 0, sizeof(xforms)); + + /* Setup image-processing pipeline for xform. */ + if (ps->currentScanMode == CE_COLOR8 || ps->currentScanMode == CE_GRAY8) + { + switch(ps->currentCompression) + { + case SF_JPEG: + pXform->aXformInfo[IP_JPG_DECODE_FROM_DENALI].dword = 0; /* 0=no */ + ADD_XFORM(X_JPG_DECODE); + pXform->aXformInfo[IP_CNV_COLOR_SPACE_WHICH_CNV].dword = IP_CNV_YCC_TO_SRGB; + pXform->aXformInfo[IP_CNV_COLOR_SPACE_GAMMA].dword = 0x00010000; + ADD_XFORM(X_CNV_COLOR_SPACE); + break; + case SF_RAW: + default: + break; + } + } + else + { /* Must be BLACK_AND_WHITE1 (Lineart). */ + switch(ps->currentCompression) + { + case SF_JPEG: + pXform->aXformInfo[IP_JPG_DECODE_FROM_DENALI].dword = 0; /* 0=no */ + ADD_XFORM(X_JPG_DECODE); + pXform->aXformInfo[IP_GRAY_2_BI_THRESHOLD].dword = 127; + ADD_XFORM(X_GRAY_2_BI); + break; + case SF_RAW: + pXform->aXformInfo[IP_GRAY_2_BI_THRESHOLD].dword = 127; + ADD_XFORM(X_GRAY_2_BI); + default: + break; + } + } + + /* Setup x/y cropping for xform. (Actually we let cm1017 do it's own cropping) */ + pXform->aXformInfo[IP_CROP_LEFT].dword = 0; + pXform->aXformInfo[IP_CROP_RIGHT].dword = 0; + pXform->aXformInfo[IP_CROP_TOP].dword = 0; + pXform->aXformInfo[IP_CROP_MAXOUTROWS].dword = 0; + ADD_XFORM(X_CROP); + + /* Setup x/y padding for xform. (Actually we let cm1017 do it's own padding) */ + pXform->aXformInfo[IP_PAD_LEFT].dword = 0; /* # of pixels to add to left side */ + pXform->aXformInfo[IP_PAD_RIGHT].dword = 0; /* # of pixels to add to right side */ + pXform->aXformInfo[IP_PAD_TOP].dword = 0; /* # of rows to add to top */ + pXform->aXformInfo[IP_PAD_BOTTOM].dword = 0; /* # of rows to add to bottom */ + pXform->aXformInfo[IP_PAD_VALUE].dword = ps->currentScanMode == CE_K1 ? 0 : -1; /* lineart white = 0, rgb white = -1 */ + pXform->aXformInfo[IP_PAD_MIN_HEIGHT].dword = 0; + ADD_XFORM(X_PAD); + + /* Open image processor. */ + if ((ret = ipOpen(pXform-xforms, xforms, 0, &ps->ip_handle)) != IP_DONE) + { + stat = SANE_STATUS_INVAL; + goto bugout; + } + + /* Get scan parameters for image processor. */ + if (ps->currentCompression == SF_RAW) + ps->bb_get_parameters(ps, &pp, SPO_STARTED_JR); /* hpraw, use actual parameters */ + else + ps->bb_get_parameters(ps, &pp, SPO_BEST_GUESS); /* jpeg, use best guess */ + traits.iPixelsPerRow = pp.pixels_per_line; + switch(ps->currentScanMode) + { + case CE_K1: /* lineart (let IP create Mono from Gray8) */ + traits.iBitsPerPixel = 1; + break; + case CE_GRAY8: + traits.iBitsPerPixel = 8; /* grayscale */ + break; + case CE_COLOR8: + default: + traits.iBitsPerPixel = 24; /* color */ + break; + } + traits.lHorizDPI = ps->currentResolution << 16; + traits.lVertDPI = ps->currentResolution << 16; + traits.lNumRows = pp.lines; + traits.iNumPages = 1; + traits.iPageNum = 1; + traits.iComponentsPerPixel = ((traits.iBitsPerPixel % 3) ? 1 : 3); + ipSetDefaultInputTraits(ps->ip_handle, &traits); + _DBG("escl_start() ipSetDefaultInputTraits lines=%ld pixels_per_line=%d\n", traits.lNumRows, traits.iPixelsPerRow); + + /* If jpeg get output image attributes from the image processor. */ + if (ps->currentCompression == SF_JPEG) + { + /* Enable parsed header flag. */ + ipResultMask(ps->ip_handle, IP_PARSED_HEADER); + _DBG("escl_start() before get_ip_data\n"); + /* Wait for image processor to process header so we know the exact size of the image for sane_get_params. */ + while (1) + { + ret = get_ip_data(ps, NULL, 0, NULL); + if (ret & (IP_INPUT_ERROR | IP_FATAL_ERROR)) + { + _DBG("escl_start() Inside whileSANE_STATUS_IO_ERROR****\n"); + stat = SANE_STATUS_IO_ERROR; + goto bugout; + } + else if (ret & IP_DONE) + { + _DBG("escl_start() Inside while SANE_STATUS_EOF****\n"); + stat = SANE_STATUS_EOF; + goto bugout; + } + + if (ret & IP_PARSED_HEADER) + { + _DBG("escl_start() Inside while IP_PARSED_HEADER****\n"); + ipGetImageTraits(ps->ip_handle, NULL, &ps->image_traits); /* get valid image traits */ + _DBG("escl_start() ipGetImageTraits lines=%ld pixels_per_line=%d\n", ps->image_traits.lNumRows, ps->image_traits.iPixelsPerRow); + ipResultMask(ps->ip_handle, 0); /* disable parsed header flag */ + break; + } + } + } + else + { + ipGetImageTraits(ps->ip_handle, NULL, &ps->image_traits); /* get valid image traits */ + _DBG("escl_start() ipGetImageTraits lines=%ld pixels_per_line=%d\n", ps->image_traits.lNumRows, ps->image_traits.iPixelsPerRow); + } + + stat = SANE_STATUS_GOOD; + +bugout: + _DBG("escl_start() returning stat=%d****\n", stat); + if (stat != SANE_STATUS_GOOD) + { + if (ps->ip_handle) + { + ipClose(ps->ip_handle); + ps->ip_handle = 0; + } + ps->bb_end_scan(ps, stat == SANE_STATUS_IO_ERROR ? 1: 0); + } + return stat; +} /* escl_start */ + +SANE_Status escl_read(SANE_Handle handle, SANE_Byte *data, SANE_Int maxLength, SANE_Int *length) +{ + struct escl_session *ps = (struct escl_session *)handle; + int ret, stat=SANE_STATUS_IO_ERROR; + + _DBG("escl_read entry (ps->user_cancel = %d)....\n", ps->user_cancel); + + if(ps->user_cancel) + { + _DBG("escl_read() EVENT_SCAN_CANCEL****uri=[%s]\n", ps->uri); + SendScanEvent(ps->uri, EVENT_SCAN_CANCEL); + return SANE_STATUS_CANCELLED; + } + + ret = get_ip_data(ps, data, maxLength, length); + + if(ret & (IP_INPUT_ERROR | IP_FATAL_ERROR)) + { + goto bugout; + } + + if(ret == IP_DONE) + { + stat = SANE_STATUS_EOF; + SendScanEvent(ps->uri, EVENT_END_SCAN_JOB); + _DBG("escl_read() EVENT_END_SCAN_JOB uri=%s\n", ps->uri); + } + else stat= SANE_STATUS_GOOD; + +bugout: + _DBG("escl_read() returning stat=[%d]\n", stat); + if (stat != SANE_STATUS_GOOD) + { + if (ps->ip_handle) + { + /* Note always call ipClose when SANE_STATUS_EOF, do not depend on sane_cancel because sane_cancel is only called at the end of a batch job. */ + ipClose(ps->ip_handle); + ps->ip_handle = 0; + } + ps->bb_end_page(ps, stat); + } + + DBG8("-sane_hpaio_read() output=%p bytes_read=%d maxLength=%d status=%d\n", data, *length, maxLength, stat); + + return stat; +} /* escl_read */ + +void escl_cancel(SANE_Handle handle) +{ + struct escl_session *ps = (struct escl_session *)handle; + + _DBG("escl_cancel...\n"); + + ps->user_cancel = 1; + /* Sane_cancel is always called at the end of the scan job. + Note that on a multiple page scan job sane_cancel is called only once */ + if (ps->ip_handle) + { + ipClose(ps->ip_handle); + ps->ip_handle = 0; + } + ps->bb_end_scan(ps, 1); +} /* escl_cancel */ + +void escl_close(SANE_Handle handle) +{ + struct escl_session *ps = (struct escl_session *)handle; + + if (ps == NULL || ps != session) + { + BUG("invalid sane_close\n"); + return; + } + + ps->bb_close(ps); + bb_unload(ps); + + if (ps->dd > 0) + hpmud_close_device(ps->dd); + + free(ps); + session = NULL; +} /* escl_close */ diff --git a/scan/sane/escl.h b/scan/sane/escl.h new file mode 100644 index 000000000..76f14f26f --- /dev/null +++ b/scan/sane/escl.h @@ -0,0 +1,45 @@ +/************************************************************************************\ + + escl.h - HP SANE backend support for eSCL based multi-function peripherals + + (c) 2012-15 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. + + Primary Author: Sarbeswar Meher + +\************************************************************************************/ + +# ifndef _ESCL_H +# define _ESCL_H + +# include "sane.h" +# include "hpip.h" +# include "hpmud.h" + +SANE_Status escl_open(SANE_String_Const device, SANE_Handle *handle); +void escl_close(SANE_Handle handle); +const SANE_Option_Descriptor * escl_get_option_descriptor(SANE_Handle handle, SANE_Int option); +SANE_Status escl_control_option(SANE_Handle handle, SANE_Int option, SANE_Action action, void *value, SANE_Int *info); +SANE_Status escl_get_parameters(SANE_Handle handle, SANE_Parameters *params); +SANE_Status escl_start(SANE_Handle handle); +SANE_Status escl_read(SANE_Handle handle, SANE_Byte *data, SANE_Int maxLength, SANE_Int *length); +void escl_cancel(SANE_Handle handle); + +# endif // _ESCL_H + diff --git a/scan/sane/escli.h b/scan/sane/escli.h new file mode 100644 index 000000000..a06d7154e --- /dev/null +++ b/scan/sane/escli.h @@ -0,0 +1,199 @@ +/************************************************************************************\ + + escli.h - HP SANE backend support for eSCL based multi-function peripherals + + (c) 2012-15 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. + + Primary Author: Sarbeswar Meher + +\************************************************************************************/ + +# ifndef _ESCLI_H +# define _ESCLI_H + +# include "sane.h" +# include "hpip.h" +# include "hpmud.h" + +# define ESCL_CONTRAST_MIN -127 +# define ESCL_CONTRAST_MAX 127 +# define ESCL_CONTRAST_DEFAULT 0 +# define MM_PER_INCH 25.4 + + +# define _STRINGIZE(x) #x +# define STRINGIZE(x) _STRINGIZE(x) + +# define ESCL_DEBUG //(uncomment to enable log) +# define _BUG(args...) syslog(LOG_ERR, __FILE__ " " STRINGIZE(__LINE__) ": " args) +# ifdef ESCL_DEBUG +# define _DBG(args...) syslog(LOG_INFO, __FILE__ " " STRINGIZE(__LINE__) ": " args) +# else +# define _DBG(args...) +# endif + +enum ESCL_OPTION_NUMBER +{ + ESCL_OPTION_COUNT = 0, + ESCL_OPTION_GROUP_SCAN_MODE, + ESCL_OPTION_SCAN_MODE, + ESCL_OPTION_SCAN_RESOLUTION, + ESCL_OPTION_INPUT_SOURCE, /* platen, ADF, Camera */ + ESCL_OPTION_GROUP_ADVANCED, + ESCL_OPTION_CONTRAST, + ESCL_OPTION_COMPRESSION, + ESCL_OPTION_JPEG_QUALITY, + ESCL_OPTION_GROUP_GEOMETRY, + ESCL_OPTION_TL_X, + ESCL_OPTION_TL_Y, + ESCL_OPTION_BR_X, + ESCL_OPTION_BR_Y, + ESCL_OPTION_PAGES_TO_SCAN, + ESCL_OPTION_MAX +}; + +# define MAX_LIST_SIZE 32 +# define MAX_STRING_SIZE 32 + +enum SCAN_FORMAT +{ + SF_RAW = 1, + SF_JPEG, + SF_MAX +}; + +enum INPUT_SOURCE +{ + IS_PLATEN = 1, + IS_ADF, + IS_ADF_DUPLEX, + IS_CAMERA, + IS_MAX +}; + +enum COLOR_ENTRY +{ + CE_K1 = 1, + CE_GRAY8, + CE_COLOR8, + CE_MAX +}; + +enum SCAN_PARAM_OPTION +{ + SPO_BEST_GUESS = 0, /* scan not started, return "best guess" scan parameters */ + SPO_STARTED = 1, /* scan started, return "job resonse" or "image processor" scan parameters */ + SPO_STARTED_JR = 2, /* scan started, but return "job response" scan parameters only */ +}; + +enum ESCL_RESULT +{ + ESCL_R_OK = 0, + ESCL_R_IO_ERROR, + ESCL_R_EOF, + ESCL_R_IO_TIMEOUT, + ESCL_R_MALLOC_ERROR, + ESCL_R_INVALID_BUF_SIZE, +}; + +struct escl_session +{ + char *tag; /* handle identifier */ + char uri[HPMUD_LINE_SIZE]; /* device uri */ + HPMUD_DEVICE dd; /* hpiod device descriptor */ + HPMUD_CHANNEL cd; /* hpiod eSCL channel descriptor */ + char model[HPMUD_LINE_SIZE]; + char url[256]; + char ip[32]; + int scan_type; + int user_cancel; + + IP_IMAGE_TRAITS image_traits; /* specified by image header */ + + SANE_Option_Descriptor option[ESCL_OPTION_MAX]; + + SANE_String_Const inputSourceList[IS_MAX]; + enum INPUT_SOURCE inputSourceMap[IS_MAX]; + enum INPUT_SOURCE currentInputSource; + + SANE_Int resolutionList[MAX_LIST_SIZE]; + SANE_Int currentResolution; + + SANE_String_Const scanModeList[CE_MAX]; + enum COLOR_ENTRY scanModeMap[CE_MAX]; + enum COLOR_ENTRY currentScanMode; + + SANE_String_Const compressionList[SF_MAX]; + enum SCAN_FORMAT compressionMap[SF_MAX]; + enum SCAN_FORMAT currentCompression; + + SANE_Range jpegQualityRange; + SANE_Int currentJpegQuality; + + SANE_Range tlxRange, tlyRange, brxRange, bryRange; + SANE_Fixed currentTlx, currentTly, currentBrx, currentBry; + SANE_Fixed effectiveTlx, effectiveTly, effectiveBrx, effectiveBry; + SANE_Fixed min_width, min_height; + + SANE_Int platen_resolutionList[MAX_LIST_SIZE]; + SANE_Fixed platen_min_width, platen_min_height; + SANE_Range platen_tlxRange, platen_tlyRange, platen_brxRange, platen_bryRange; + + SANE_Int adf_resolutionList[MAX_LIST_SIZE]; + SANE_Fixed adf_min_width, adf_min_height; + SANE_Range adf_tlxRange, adf_tlyRange, adf_brxRange, adf_bryRange; + + SANE_Int duplex_resolutionList[MAX_LIST_SIZE]; + SANE_Fixed duplex_min_width, duplex_min_height; + SANE_Range duplex_tlxRange, duplex_tlyRange, duplex_brxRange, duplex_bryRange; + + SANE_Int camera_resolutionList[MAX_LIST_SIZE]; + SANE_Fixed camera_min_width, camera_min_height; + SANE_Range camera_tlxRange, camera_tlyRange, camera_brxRange, camera_bryRange; + + IP_HANDLE ip_handle; + + int index; /* image buffer index */ + int cnt; /* image buffer count */ + //unsigned char buf[32768]; /* image chunk buffer */ + unsigned char buf[4*1000*1000]; /* image chunk buffer */ + + void *bb_session; + /* Add new elements here. */ + char job_id[64]; + int page_id; + + void *hpmud_handle; /* returned by dlopen */ + void *math_handle; /* returned by dlopen */ + void *bb_handle; /* returned by dlopen */ + + int (*bb_open)(struct escl_session *ps); + int (*bb_close)(struct escl_session *ps); + int (*bb_get_parameters)(struct escl_session *ps, SANE_Parameters *pp, int scan_started); + SANE_Status (*bb_check_scanner_to_continue)(struct escl_session *ps); + SANE_Status (*bb_start_scan)(struct escl_session *ps); + enum ESCL_RESULT (*bb_get_image_data)(struct escl_session *ps, int max_length); /* see cnt and buf above */ + int (*bb_end_page)(struct escl_session *ps, int io_error); + int (*bb_end_scan)(struct escl_session *ps, int io_error); +}; + + +# endif // _ESCLI_H + diff --git a/scan/sane/hpaio.c b/scan/sane/hpaio.c index 98aba5afd..40bbcec32 100644 --- a/scan/sane/hpaio.c +++ b/scan/sane/hpaio.c @@ -2,7 +2,7 @@ hpaio.c - HP SANE backend for multi-function peripherals (libsane-hpaio) - (c) 2001-2008 Copyright Hewlett-Packard Development Company, LP + (c) 2001-2008 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 @@ -38,13 +38,13 @@ #include "hpmud.h" #include "hpip.h" #include "hp_ipp.h" - #include "soap.h" #include "soapht.h" #include "marvell.h" #include "hpaio.h" -# include "ledm.h" +#include "ledm.h" #include "sclpml.h" +#include "escl.h" #define DEBUG_DECLARE_ONLY #include "sanei_debug.h" @@ -53,7 +53,7 @@ static SANE_Device **DeviceList = NULL; static int AddDeviceList(char *uri, char *model, SANE_Device ***pd) { - int i; + int i = 0, uri_length = 0; if (*pd == NULL) { @@ -62,21 +62,31 @@ static int AddDeviceList(char *uri, char *model, SANE_Device ***pd) memset(*pd, 0, sizeof(SANE_Device *) * MAX_DEVICE); } + uri += 3; /* Skip "hp:" */ + uri_length = strlen(uri); + if(strstr(uri, "&queue=false")) + uri_length -= 12; // Last 12 bytes of URI i.e "&queue=false" + /* Find empty slot in array of pointers. */ - for (i=0; i<MAX_DEVICE; i++) + for (i=0; i < MAX_DEVICE; i++) { if ((*pd)[i] == NULL) { /* Allocate Sane_Device and members. */ (*pd)[i] = malloc(sizeof(SANE_Device)); - (*pd)[i]->name = malloc(strlen(uri)); - strcpy((char *)(*pd)[i]->name, uri+3); /* remove "hp:" */ + (*pd)[i]->name = malloc(strlen(uri)+1); + strcpy((char *)(*pd)[i]->name, uri); (*pd)[i]->model = strdup(model); (*pd)[i]->vendor = "Hewlett-Packard"; (*pd)[i]->type = "all-in-one"; break; } + + //Check for Duplicate URI. If URI is added already then don't add it again. + if( strncasecmp((*pd)[i]->name, uri, uri_length) == 0 ) + break; } + return 0; } @@ -225,63 +235,71 @@ static int GetCupsPrinters(char ***printer) return cnt; } +static int AddDevice(char *uri) +{ + struct hpmud_model_attributes ma; + char model[HPMUD_LINE_SIZE]; + int scan_type; + int device_added = 0; + + hpmud_query_model(uri, &ma); + if (ma.scantype > 0) + { + hpmud_get_uri_model(uri, model, sizeof(model)); + AddDeviceList(uri, model, &DeviceList); + device_added = 1; + } + else + { + DBG(6,"unsupported scantype=%d %s\n", ma.scantype, uri); + } + + return device_added; +} + static int DevDiscovery(int localOnly) { - struct hpmud_model_attributes ma; - char message[HPMUD_LINE_SIZE*64]; - char uri[HPMUD_LINE_SIZE]; - char model[HPMUD_LINE_SIZE]; - char *tail; - int i, scan_type, cnt=0, total=0, bytes_read; - char **cups_printer=NULL; /* list of printers */ - enum HPMUD_RESULT stat; - - stat = hpmud_probe_devices(HPMUD_BUS_ALL, message, sizeof(message), &cnt, &bytes_read); - - if (stat != HPMUD_R_OK) + char message[HPMUD_LINE_SIZE*64]; + char uri[HPMUD_LINE_SIZE]; + char *tail = message; + int i, scan_type, cnt=0, total=0, bytes_read; + char **cups_printer=NULL; /* list of printers */ + char* token = NULL; + enum HPMUD_RESULT stat; + + stat = hpmud_probe_devices(HPMUD_BUS_ALL, message, sizeof(message), &cnt, &bytes_read); + if (stat != HPMUD_R_OK) goto bugout; - /* Look for local all-in-one scan devices (defined by hpmud). */ - tail = message; - for (i=0; i<cnt; i++) - { - scan_type = 0; - GetUriLine(tail, uri, &tail); - hpmud_query_model(uri, &ma); - if (ma.scantype > 0) - { - hpmud_get_uri_model(uri, model, sizeof(model)); - AddDeviceList(uri, model, &DeviceList); - total++; - } - else - { - DBG(6,"unsupported scantype=%d %s\n", ma.scantype, uri); - } - } + /* Look for local all-in-one scan devices (defined by hpmud). */ + for (i=0; i<cnt; i++) + { + GetUriLine(tail, uri, &tail); + total += AddDevice(uri); + } - /* Check localOnly flag (used by saned) to decide whether to look for network all-in-one scan devices (defined by cups). */ - if (!localOnly) - { - cnt = GetCupsPrinters(&cups_printer); - for (i=0; i<cnt; i++) - { - hpmud_query_model(cups_printer[i], &ma); - if (ma.scantype > 0) - { - hpmud_get_uri_model(cups_printer[i], model, sizeof(model)); - AddDeviceList(cups_printer[i], model, &DeviceList); - total++; - } - else - { - DBG(6,"unsupported scantype=%d %s\n", ma.scantype, cups_printer[i]); - } - free(cups_printer[i]); - } - if (cups_printer) - free(cups_printer); - } + /* Look for Network Scan devices if localonly flag if FALSE. */ + if (!localOnly) + { + /* Look for all-in-one scan devices for which print queue created */ + cnt = GetCupsPrinters(&cups_printer); + for (i=0; i<cnt; i++) + { + total += AddDevice(cups_printer[i]); + free(cups_printer[i]); + } + if (cups_printer) + free(cups_printer); + + /* 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, ";"); + } + } bugout: return total; @@ -342,6 +360,8 @@ extern SANE_Status sane_hpaio_open(SANE_String_Const devicename, SANE_Handle * p return ledm_open(devicename, pHandle); if ((ma.scantype == HPMUD_SCANTYPE_SCL) || (ma.scantype == HPMUD_SCANTYPE_SCL_DUPLEX) ||(ma.scantype == HPMUD_SCANTYPE_PML)) return sclpml_open(devicename, pHandle); + if (ma.scantype == HPMUD_SCANTYPE_ESCL) + return escl_open(devicename, pHandle); else return SANE_STATUS_UNSUPPORTED; } /* sane_hpaio_open() */ @@ -358,6 +378,8 @@ extern void sane_hpaio_close(SANE_Handle handle) return ledm_close(handle); if (strcmp(*((char **)handle), "SCL-PML") == 0) return sclpml_close(handle); + if (strcmp(*((char **)handle), "ESCL") == 0) + return escl_close(handle); } /* sane_hpaio_close() */ extern const SANE_Option_Descriptor * sane_hpaio_get_option_descriptor(SANE_Handle handle, SANE_Int option) @@ -372,6 +394,8 @@ extern const SANE_Option_Descriptor * sane_hpaio_get_option_descriptor(SANE_Hand return ledm_get_option_descriptor(handle, option); if (strcmp(*((char **)handle), "SCL-PML") == 0) return sclpml_get_option_descriptor(handle, option); + if (strcmp(*((char **)handle), "ESCL") == 0) + return escl_get_option_descriptor(handle, option); else return NULL; } /* sane_hpaio_get_option_descriptor() */ @@ -388,6 +412,8 @@ extern SANE_Status sane_hpaio_control_option(SANE_Handle handle, SANE_Int option return ledm_control_option(handle, option, action, pValue, pInfo); if (strcmp(*((char **)handle), "SCL-PML") == 0) return sclpml_control_option(handle, option, action, pValue, pInfo); + if (strcmp(*((char **)handle), "ESCL") == 0) + return escl_control_option(handle, option, action, pValue, pInfo); else return SANE_STATUS_UNSUPPORTED; } /* sane_hpaio_control_option() */ @@ -404,6 +430,8 @@ extern SANE_Status sane_hpaio_get_parameters(SANE_Handle handle, SANE_Parameters return ledm_get_parameters(handle, pParams); if (strcmp(*((char **)handle), "SCL-PML") == 0) return sclpml_get_parameters(handle, pParams); + if (strcmp(*((char **)handle), "ESCL") == 0) + return escl_get_parameters(handle, pParams); else return SANE_STATUS_UNSUPPORTED; } /* sane_hpaio_get_parameters() */ @@ -420,6 +448,8 @@ extern SANE_Status sane_hpaio_start(SANE_Handle handle) return ledm_start(handle); if (strcmp(*((char **)handle), "SCL-PML") == 0) return sclpml_start(handle); + if (strcmp(*((char **)handle), "ESCL") == 0) + return escl_start(handle); else return SANE_STATUS_UNSUPPORTED; } /* sane_hpaio_start() */ @@ -437,6 +467,8 @@ extern SANE_Status sane_hpaio_read(SANE_Handle handle, SANE_Byte *data, SANE_Int return soapht_read(handle, data, maxLength, pLength); if (strcmp(*((char **)handle), "SCL-PML") == 0) return sclpml_read(handle, data, maxLength, pLength); + if (strcmp(*((char **)handle), "ESCL") == 0) + return escl_read(handle, data, maxLength, pLength); else return SANE_STATUS_UNSUPPORTED; @@ -455,6 +487,8 @@ extern void sane_hpaio_cancel( SANE_Handle handle ) return ledm_cancel(handle); if (strcmp(*((char **)handle), "SCL-PML") == 0) return sclpml_cancel(handle); + if (strcmp(*((char **)handle), "ESCL") == 0) + return escl_cancel(handle); } /* sane_hpaio_cancel() */ extern SANE_Status sane_hpaio_set_io_mode(SANE_Handle handle, SANE_Bool nonBlocking) diff --git a/scan/sane/hpaio.desc b/scan/sane/hpaio.desc index 77cd90e22..d4f2a4f7c 100644 --- a/scan/sane/hpaio.desc +++ b/scan/sane/hpaio.desc @@ -88,6 +88,9 @@ :model "HP Color LaserJet MFP m277n" :status :good +:model "HP Color LaserJet Pro MFP m274n" +:status :good + :model "HP Color LaserJet Pro MFP m476dn" :status :good @@ -97,6 +100,15 @@ :model "HP Color LaserJet Pro MFP m476nw" :status :good +:model "HP Color LaserJet Pro MFP m477 Fdn" +:status :good + +:model "HP Color LaserJet Pro MFP m477 Fdw" +:status :good + +:model "HP Color LaserJet Pro MFP m477 Fnw" +:status :good + :model "HP Color LaserJet Pro Mpf m176n" :status :good @@ -148,6 +160,9 @@ :model "HP Deskjet 2132 All-in-one Printer" :status :good +:model "HP Deskjet 2134 All-in-one Printer" +:status :good + :model "HP Deskjet 2510 All-in-one Printer" :status :good @@ -262,6 +277,12 @@ :model "HP Deskjet 3632 All-in-one Printer" :status :good +:model "HP Deskjet 3633 All-in-one Printer" +:status :good + +:model "HP Deskjet 3634 All-in-one Printer" +:status :good + :model "HP Deskjet f2110 All-in-one Printer" :status :good @@ -631,6 +652,15 @@ :model "HP Deskjet Ink Advantage 4518 E-all-in-one Printer" :status :good +:model "HP Deskjet Ink Advantage 4530 All-in-one" +:status :good + +:model "HP Deskjet Ink Advantage 4535 All-in-one" +:status :good + +:model "HP Deskjet Ink Advantage 4536 All-in-one" +:status :good + :model "HP Deskjet Ink Advantage 4610 All-in-one Printer Series" :status :good @@ -655,15 +685,42 @@ :model "HP Deskjet Ink Advantage 4648 E-all-in-one Printer" :status :good +:model "HP Deskjet Ink Advantage 4670 All-in-one" +:status :good + +:model "HP Deskjet Ink Advantage 4675 All-in-one" +:status :good + +:model "HP Deskjet Ink Advantage 4676 All-in-one" +:status :good + :model "HP Deskjet Ink Advantage 5525 E-all-in-one" :status :good +:model "HP Deskjet Ink Advantage 5570 All-in-one" +:status :good + +:model "HP Deskjet Ink Advantage 5575 All-in-one" +:status :good + +:model "HP Deskjet Ink Advantage 5640 All-in-one Printer Series" +:status :good + +:model "HP Deskjet Ink Advantage 5645 All-in-one Printer" +:status :good + :model "HP Deskjet Ink Advantage 6525 E-all-in-one" :status :good :model "HP Deskjet Ink Advantage k209a All-in-one Printer" :status :good +:model "HP Deskjet Ink Advantage Ultra 4720 All-in-one Printer Series" +:status :good + +:model "HP Deskjet Ink Advantage Ultra 4729 All-in-one Printer" +:status :good + :model "HP Envy 100 d410 Series" :status :good @@ -724,6 +781,12 @@ :model "HP Envy 4522 All-in-one Printer" :status :good +:model "HP Envy 4523 All-in-one Printer" +:status :good + +:model "HP Envy 4524 All-in-one Printer" +:status :good + :model "HP Envy 5530 E-all-in-one Printer" :status :good @@ -739,12 +802,27 @@ :model "HP Envy 5535 E-all-in-one Printer" :status :good +:model "HP Envy 5536 E-all-in-one Printer" +:status :good + +:model "HP Envy 5539 E-all-in-one Printer" +:status :good + :model "HP Envy 5540 All-in-one Printer" :status :good :model "HP Envy 5540 All-in-one Printer Series" :status :good +:model "HP Envy 5542 All-in-one Printer" +:status :good + +:model "HP Envy 5543 All-in-one Printer" +:status :good + +:model "HP Envy 5544 All-in-one Printer" +:status :good + :model "HP Envy 5545 All-in-one Printer" :status :good @@ -1135,6 +1213,24 @@ :model "HP LaserJet Pro MFP m226dw" :status :good +:model "HP LaserJet Pro MFP m426dw" +:status :good + +:model "HP LaserJet Pro MFP m426fdn" +:status :good + +:model "HP LaserJet Pro MFP m426fdw" +:status :good + +:model "HP LaserJet Pro MFP m427dn" +:status :good + +:model "HP LaserJet Pro MFP m427dw" +:status :good + +:model "HP LaserJet Pro MFP m427fdw" +:status :good + :model "HP LaserJet Pro MFP m435nw" :status :good @@ -1381,6 +1477,9 @@ :model "HP Officejet 4652 All-in-one Printer" :status :good +:model "HP Officejet 4654 All-in-one Printer" +:status :good + :model "HP Officejet 4655 All-in-one Printer" :status :good @@ -3163,3 +3262,6 @@ :model "HP PSC 950xi All-in-one Printer" :status :good +:model "HP Scanjet Pro 3500 f1 Flatbed Scanner" +:status :good + diff --git a/scan/sane/hpaio.h b/scan/sane/hpaio.h index ceaf65b0f..b64d86e3e 100644 --- a/scan/sane/hpaio.h +++ b/scan/sane/hpaio.h @@ -2,7 +2,7 @@ hpaio.h - HP SANE backend for multi-function peripherals (libsane-hpaio) - (c) 2001-2006 Copyright Hewlett-Packard Development Company, LP + (c) 2001-2006 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 diff --git a/scan/sane/http.c b/scan/sane/http.c index 8c1578e02..800df91bb 100644 --- a/scan/sane/http.c +++ b/scan/sane/http.c @@ -1,7 +1,7 @@ /************************************************************************************\ http.c - HTTP/1.1 feeder and consumer - (c) 2008 Copyright Hewlett-Packard Development Company, LP + (c) 2008 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 @@ -82,70 +82,31 @@ struct http_session struct stream_buffer s; }; -#if 0 -static char *strnstr(const char *haystack, const char *needle, size_t n) + +/* Copy stream data to data buffer and then clear stream. */ +int __attribute__ ((visibility ("hidden"))) clear_stream(HTTP_HANDLE handle, void *data, int max_size, int *bytes_read) { - int i, len=strlen(needle); - for (i=0; *haystack && i<n; ++haystack, i++) + DBG("clear_stream entry...\n"); + struct http_session *ps = (struct http_session *)handle; + int len=0, stat=1; + + if (ps->s.cnt > 0 && ps->s.cnt <= max_size ) { - if (strncmp(haystack, needle, len) == 0) - { - return ((char *)haystack); - } + len = ps->s.cnt; + DBG("Clearing (%d) bytes from the stream\n", len); + memcpy(data, &ps->s.buf[ps->s.index], len); + ps->s.index = ps->s.cnt = 0; /* stream is empty reset */ + stat = 0; } - return 0; -} -#endif -#if 0 -static void sysdump(const void *data, int size) -{ - /* Dump size bytes of *data. Output looks like: - * [0000] 75 6E 6B 6E 6F 77 6E 20 30 FF 00 00 00 00 39 00 unknown 0.....9. - */ - - unsigned char *p = (unsigned char *)data; - unsigned char c; - int n; - char bytestr[4] = {0}; - char addrstr[10] = {0}; - char hexstr[16*3 + 5] = {0}; - char charstr[16*1 + 5] = {0}; - for(n=1;n<=size;n++) { - if (n%16 == 1) { - /* store address for this line */ - snprintf(addrstr, sizeof(addrstr), "%.4d", (int)((p-(unsigned char *)data) & 0xffff)); - } - - c = *p; - if (isprint(c) == 0) { - c = '.'; - } - - /* store hex str (for left side) */ - snprintf(bytestr, sizeof(bytestr), "%02X ", *p); - strncat(hexstr, bytestr, sizeof(hexstr)-strlen(hexstr)-1); - - /* store char str (for right side) */ - snprintf(bytestr, sizeof(bytestr), "%c", c); - strncat(charstr, bytestr, sizeof(charstr)-strlen(charstr)-1); + *bytes_read = len; - if(n%16 == 0) { - /* line completed */ - DBG_SZ("[%4.4s] %-50.50s %s\n", addrstr, hexstr, charstr); - hexstr[0] = 0; - charstr[0] = 0; - } - p++; /* next byte */ - } + DBG("clear_stream returning with (stat = %d, bytes_read = %d)...\n", stat, *bytes_read); + return stat; - if (strlen(hexstr) > 0) { - /* print rest of buffer if not empty */ - DBG_SZ("[%4.4s] %-50.50s %s\n", addrstr, hexstr, charstr); - } } -#endif + /* Read data into stream buffer. Return specified "size" or less. Unused data is left in the stream. */ static int read_stream(struct http_session *ps, char *data, int size, int sec_timeout, int *bytes_read) @@ -154,8 +115,9 @@ static int read_stream(struct http_session *ps, char *data, int size, int sec_ti int tmo=sec_timeout; /* initial timeout */ int max=sizeof(ps->s.buf); enum HPMUD_RESULT ret; + int retry = 3; - DBG("read_stream() ps=%p data=%p size=%d timeout=%d s.index=%d s.cnt=%d\n", ps, data, size, sec_timeout, ps->s.index, ps->s.cnt); + //DBG("read_stream() ps=%p data=%p size=%d timeout=%d s.index=%d s.cnt=%d\n", ps, data, size, sec_timeout, ps->s.index, ps->s.cnt); *bytes_read = 0; @@ -178,16 +140,17 @@ static int read_stream(struct http_session *ps, char *data, int size, int sec_ti ps->s.index = ps->s.cnt = 0; /* stream is empty reset */ } *bytes_read = len; - DBG("-read_stream() bytes_read=%d s.index=%d s.cnt=%d\n", len, ps->s.index, ps->s.cnt); + //DBG("-read_stream() bytes_read=%d s.index=%d s.cnt=%d\n", len, ps->s.index, ps->s.cnt); return 0; } /* Stream is empty read more data from device. */ ret = hpmud_read_channel(ps->dd, ps->cd, &ps->s.buf[ps->s.index], max-(ps->s.index + ps->s.cnt), tmo, &len); - if (ret == HPMUD_R_IO_TIMEOUT) + while ( (ret == HPMUD_R_IO_TIMEOUT || ret == HPMUD_R_IO_ERROR) && retry--) { - BUG("timeout reading data sec_timeout=%d\n", tmo); - goto bugout; + usleep(100000); //Pause for 0.1 sec. Sometimes devices like scanjet 3500 take some time to prepare data. + ret = hpmud_read_channel(ps->dd, ps->cd, &ps->s.buf[ps->s.index], max-(ps->s.index + ps->s.cnt), tmo, &len); + DBG("hpmud_read_channel failed retrying (%d) more times)\n", retry); } if (ret != HPMUD_R_OK) { @@ -221,9 +184,9 @@ static int read_stream(struct http_session *ps, char *data, int size, int sec_ti *bytes_read = len; stat = 0; - DBG("-read_stream() bytes_read=%d s.index=%d s.cnt=%d\n", len, ps->s.index, ps->s.cnt); bugout: + DBG("-read_stream() bytes_read=%d s.index=%d s.cnt=%d stat=%d\n", len, ps->s.index, ps->s.cnt, stat); return stat; } @@ -315,10 +278,14 @@ bugout: enum HTTP_RESULT __attribute__ ((visibility ("hidden"))) http_close(HTTP_HANDLE handle) { struct http_session *ps = (struct http_session *)handle; - DBG("http_close() handle=%p\n", handle); - if (ps->cd > 0) - hpmud_close_channel(ps->dd, ps->cd); - free(ps); + + if(ps) + { + DBG("http_close() handle=%p\n", handle); + if (ps->cd > 0) + hpmud_close_channel(ps->dd, ps->cd); + free(ps); + } return HTTP_R_OK; } @@ -335,8 +302,17 @@ enum HTTP_RESULT __attribute__ ((visibility ("hidden"))) http_read_header(HTTP_H *bytes_read = 0; /* Read initial HTTP/1.1 header status line. */ - if (read_line(ps, data, max_size, tmo, &len)) - goto bugout; + while(1) + { + if (read_line(ps, data, max_size, tmo, &len)) + goto bugout; + if( !strncmp(data, "HTTP/1.1", 8)) + break; + else + { + DBG("HTTP Header not found. Searching header in next line (%d)\n", len); + } + } ps->http_status = strtol(data+9, NULL, 10); *bytes_read = total = len; @@ -346,8 +322,11 @@ enum HTTP_RESULT __attribute__ ((visibility ("hidden"))) http_read_header(HTTP_H BUG("invalid http_status=%d\n", ps->http_status); /* Dump any outstanding payload here. */ - while (!read_stream(ps, data, max_size, 1, &len)) + while (!read_stream(ps, data + total, max_size, 1, &len)) + { + total = (total+len) % max_size; BUG("dumping len=%d\n", len); + } goto bugout; } @@ -444,6 +423,29 @@ bugout: return stat; }; +enum HTTP_RESULT __attribute__ ((visibility ("hidden"))) http_read2(HTTP_HANDLE handle, void *data, int max_size, int tmo, int *bytes_read) +{ + struct http_session *ps = (struct http_session *)handle; + enum HTTP_RESULT stat = HTTP_R_IO_ERROR; + int len = 0, ret; + int retry = 5; + + while(retry--) + { + DBG("http_read2 entry.\n" ); + ret = hpmud_read_channel(ps->dd, ps->cd, (char *)data, max_size, tmo, bytes_read); + if(*bytes_read > 0) + { + DBG("http_read2 successful. (%d bytes read). \n", *bytes_read); + stat = HTTP_R_OK; + return 0; + } + DBG("http_read2 failed. Retrying (%d) more times before exiting.\n", retry); + usleep(100000); + } + DBG("http_read2 failed to read (bytes_read=%d)\n", *bytes_read); + return stat; +} /* Reads data from HTTP/1.1 chunked data stream until EOF. Returns max_size or less. */ enum HTTP_RESULT __attribute__ ((visibility ("hidden"))) http_read(HTTP_HANDLE handle, void *data, int max_size, int sec_timeout, int *bytes_read) { @@ -511,6 +513,7 @@ enum HTTP_RESULT __attribute__ ((visibility ("hidden"))) http_read_size(HTTP_HAN { struct http_session *ps = (struct http_session *)handle; enum HTTP_RESULT stat = HTTP_R_IO_ERROR; + int ch; if(ps && ps->state == HTTP_R_EOF) return HTTP_R_EOF; if(max_size == -1) @@ -524,7 +527,14 @@ enum HTTP_RESULT __attribute__ ((visibility ("hidden"))) http_read_size(HTTP_HAN *bytes_read=0; while(*bytes_read < max_size) { - *((char*)data + (*bytes_read)) = read_char(ps, sec_timeout); + ch = read_char(ps, sec_timeout); + if(ch == -1) + { + DBG("http_read_size(): IO error after %d bytes.\n",*bytes_read); + return HTTP_R_IO_ERROR; + } + + *((char*)data + (*bytes_read)) = ch; *bytes_read = *bytes_read+1; } diff --git a/scan/sane/http.h b/scan/sane/http.h index cfde791fe..172ce8073 100755 --- a/scan/sane/http.h +++ b/scan/sane/http.h @@ -2,7 +2,7 @@ http.h - HTTP/1.1 feeder and consumer - (c) 2008 Copyright Hewlett-Packard Development Company, LP + (c) 2008 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 @@ -49,7 +49,9 @@ enum HTTP_RESULT __attribute__ ((visibility ("hidden"))) http_read_payload(HTTP_ enum HTTP_RESULT __attribute__ ((visibility ("hidden"))) http_read(HTTP_HANDLE handle, void *data, int max_size, int sec_timout, int *bytes_read); enum HTTP_RESULT __attribute__ ((visibility ("hidden"))) http_read_size(HTTP_HANDLE handle, void *data, int max_size, int sec_timout, int *bytes_read); enum HTTP_RESULT __attribute__ ((visibility ("hidden"))) http_write(HTTP_HANDLE handle, void *data, int data_size, int sec_timout); +enum HTTP_RESULT __attribute__ ((visibility ("hidden"))) http_read2(HTTP_HANDLE handle, void *data, int max_size, int tmo, int *bytes_read); void __attribute__ ((visibility ("hidden"))) http_unchunk_data(char *buffer); +int __attribute__ ((visibility ("hidden"))) clear_stream(HTTP_HANDLE handle, void *data, int max_size, int *bytes_read); #endif // _HTTP_H diff --git a/scan/sane/io.c b/scan/sane/io.c index 1f1586491..450845843 100755 --- a/scan/sane/io.c +++ b/scan/sane/io.c @@ -2,7 +2,7 @@ io.c - HP SANE backend for multi-function peripherals (libsane-hpaio) - (c) 2001-2008 Copyright Hewlett-Packard Development Company, LP + (c) 2001-2008 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 diff --git a/scan/sane/io.h b/scan/sane/io.h index a47bc8b0d..f3f758145 100755 --- a/scan/sane/io.h +++ b/scan/sane/io.h @@ -2,7 +2,7 @@ io.h - HP SANE backend for multi-function peripherals (libsane-hpaio) - (c) 2001-2006 Copyright Hewlett-Packard Development Company, LP + (c) 2001-2006 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 diff --git a/scan/sane/ledm.c b/scan/sane/ledm.c index af86bff29..9a1ff02d1 100644 --- a/scan/sane/ledm.c +++ b/scan/sane/ledm.c @@ -1,7 +1,7 @@ /************************************************************************************ ledm.c - HP SANE backend support for LEDM based multi-function peripherals - (c) 2010 Copyright Hewlett-Packard Development Company, LP + (c) 2010 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 diff --git a/scan/sane/ledm.h b/scan/sane/ledm.h index ae7212a63..54027eb57 100644 --- a/scan/sane/ledm.h +++ b/scan/sane/ledm.h @@ -2,7 +2,7 @@ ledm.h - HP SANE backend support for LEDM based multi-function peripherals - (c) 2010 Copyright Hewlett-Packard Development Company, LP + (c) 2010 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 diff --git a/scan/sane/ledmi.h b/scan/sane/ledmi.h index cda7da139..57dcd9d22 100644 --- a/scan/sane/ledmi.h +++ b/scan/sane/ledmi.h @@ -2,7 +2,7 @@ ledmi.h - HP SANE backend support for LEDM based multi-function peripherals - (c) 2010 Copyright Hewlett-Packard Development Company, LP + (c) 2010 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 diff --git a/scan/sane/marvell.c b/scan/sane/marvell.c index 8242ae58e..ad267a3f1 100644 --- a/scan/sane/marvell.c +++ b/scan/sane/marvell.c @@ -2,7 +2,7 @@ marvell.c - HP SANE backend support for Marvell based multi-function peripherals - (c) 2008 Copyright Hewlett-Packard Development Company, LP + (c) 2008 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 diff --git a/scan/sane/marvell.h b/scan/sane/marvell.h index 18d177a03..872bde751 100755 --- a/scan/sane/marvell.h +++ b/scan/sane/marvell.h @@ -2,7 +2,7 @@ marvell.h - HP SANE backend support for Marvell based multi-function peripherals - (c) 2008 Copyright Hewlett-Packard Development Company, LP + (c) 2008 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 diff --git a/scan/sane/marvelli.h b/scan/sane/marvelli.h index 6174e0627..2bcd2ca38 100644 --- a/scan/sane/marvelli.h +++ b/scan/sane/marvelli.h @@ -3,7 +3,7 @@ marvelli.h - HP SANE backend support for Marvell based multi-function peripherals - (c) 2008 Copyright Hewlett-Packard Development Company, LP + (c) 2008 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 diff --git a/scan/sane/mfpdtf.c b/scan/sane/mfpdtf.c index 4591c2726..5ecdd2531 100755 --- a/scan/sane/mfpdtf.c +++ b/scan/sane/mfpdtf.c @@ -2,7 +2,7 @@ mfpdtf.c - HP Multi-Function Peripheral Data Transfer Format filter. - (c) 2001-2005 Copyright Hewlett-Packard Development Company, LP + (c) 2001-2005 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 diff --git a/scan/sane/mfpdtf.h b/scan/sane/mfpdtf.h index b51b0b965..e12f03162 100755 --- a/scan/sane/mfpdtf.h +++ b/scan/sane/mfpdtf.h @@ -2,7 +2,7 @@ mfpdtf.h - HP Multi-Function Peripheral Data Transfer Format filter. - (c) 2001-2005 Copyright Hewlett-Packard Development Company, LP + (c) 2001-2005 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 diff --git a/scan/sane/pml.c b/scan/sane/pml.c index 894a90ab1..8f7e3cb79 100755 --- a/scan/sane/pml.c +++ b/scan/sane/pml.c @@ -2,7 +2,7 @@ pml.c - HP SANE backend for multi-function peripherals (libsane-hpaio) - (c) 2001-2005 Copyright Hewlett-Packard Development Company, LP + (c) 2001-2005 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 diff --git a/scan/sane/pml.h b/scan/sane/pml.h index 86e68051d..620474885 100755 --- a/scan/sane/pml.h +++ b/scan/sane/pml.h @@ -2,7 +2,7 @@ pml.h - HP SANE backend for multi-function peripherals (libsane-hpaio) - (c) 2001-2005 Copyright Hewlett-Packard Development Company, LP + (c) 2001-2005 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 diff --git a/scan/sane/scl.c b/scan/sane/scl.c index 77f39e96c..cc640f444 100755 --- a/scan/sane/scl.c +++ b/scan/sane/scl.c @@ -2,7 +2,7 @@ scl.c - HP SANE backend for multi-function peripherals (libsane-hpaio) - (c) 2001-2006 Copyright Hewlett-Packard Development Company, LP + (c) 2001-2006 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 diff --git a/scan/sane/scl.h b/scan/sane/scl.h index e7b2ed682..5cf40579f 100755 --- a/scan/sane/scl.h +++ b/scan/sane/scl.h @@ -2,7 +2,7 @@ scl.h - HP SANE backend for multi-function peripherals (libsane-hpaio) - (c) 2001-2006 Copyright Hewlett-Packard Development Company, LP + (c) 2001-2006 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 diff --git a/scan/sane/sclpml.c b/scan/sane/sclpml.c index 235b8b6e5..9a5975f32 100644 --- a/scan/sane/sclpml.c +++ b/scan/sane/sclpml.c @@ -2,7 +2,7 @@ scl-pml.c - HP SANE backend for multi-function peripherals (libsane-hpaio) - (c) 2001-2014 Copyright Hewlett-Packard Development Company, LP + (c) 2001-2014 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 diff --git a/scan/sane/sclpml.h b/scan/sane/sclpml.h index af89decee..a0c7c9714 100644 --- a/scan/sane/sclpml.h +++ b/scan/sane/sclpml.h @@ -2,7 +2,7 @@ scl-pml.c - HP SANE backend for multi-function peripherals (libsane-hpaio) - (c) 2001-2014 Copyright Hewlett-Packard Development Company, LP + (c) 2001-2014 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 diff --git a/scan/sane/soap.c b/scan/sane/soap.c index 2e3232d22..07106fe6e 100644 --- a/scan/sane/soap.c +++ b/scan/sane/soap.c @@ -2,7 +2,7 @@ soap.c - HP SANE backend support for soap based multi-function peripherals - (c) 2006,2008 Copyright Hewlett-Packard Development Company, LP + (c) 2006,2008 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 diff --git a/scan/sane/soap.h b/scan/sane/soap.h index d1d52d6c7..55a3a5d1a 100755 --- a/scan/sane/soap.h +++ b/scan/sane/soap.h @@ -2,7 +2,7 @@ soap.h - HP SANE backend support for soap base multi-function peripherals - (c) 2006,2008 Copyright Hewlett-Packard Development Company, LP + (c) 2006,2008 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 diff --git a/scan/sane/soapht.c b/scan/sane/soapht.c index a7034227b..269ab2140 100644 --- a/scan/sane/soapht.c +++ b/scan/sane/soapht.c @@ -2,7 +2,7 @@ soapht.c - HP SANE backend support for soap based multi-function peripherals - (c) 2006,2008 Copyright Hewlett-Packard Development Company, LP + (c) 2006,2008 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 diff --git a/scan/sane/soapht.h b/scan/sane/soapht.h index c3dae9dc4..e3a82bf17 100755 --- a/scan/sane/soapht.h +++ b/scan/sane/soapht.h @@ -2,7 +2,7 @@ soapht.h - HP SANE backend support for soap base multi-function peripherals - (c) 2006,2008 Copyright Hewlett-Packard Development Company, LP + (c) 2006,2008 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 diff --git a/scan/sane/soaphti.h b/scan/sane/soaphti.h index 9e46ad720..e243ee3a6 100644 --- a/scan/sane/soaphti.h +++ b/scan/sane/soaphti.h @@ -2,7 +2,7 @@ soaphti.h - HP SANE backend support for soap based multi-function peripherals - (c) 2006,2008 Copyright Hewlett-Packard Development Company, LP + (c) 2006,2008 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 diff --git a/scan/sane/soapi.h b/scan/sane/soapi.h index 68e42018e..02b0a85d7 100644 --- a/scan/sane/soapi.h +++ b/scan/sane/soapi.h @@ -2,7 +2,7 @@ soapi.h - HP SANE backend support for soap based multi-function peripherals - (c) 2006,2008 Copyright Hewlett-Packard Development Company, LP + (c) 2006,2008 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 diff --git a/scan/sane/tables.h b/scan/sane/tables.h index 4ae0cf240..04c4530aa 100755 --- a/scan/sane/tables.h +++ b/scan/sane/tables.h @@ -2,7 +2,7 @@ tables.h - HP SANE backend for multi-function peripherals (libsane-hpaio) - (c) 2001-2004 Copyright Hewlett-Packard Development Company, LP + (c) 2001-2004 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 diff --git a/scan/sane/xml.c b/scan/sane/xml.c index 5c3780c6a..34ec2e6f7 100644 --- a/scan/sane/xml.c +++ b/scan/sane/xml.c @@ -2,7 +2,7 @@ xml.c - HP SANE backend support for xml parsing - (c) 2008 Copyright Hewlett-Packard Development Company, LP + (c) 2008 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 diff --git a/scan/sane/xml.h b/scan/sane/xml.h index 3ed1dc4e9..d27a262a5 100644 --- a/scan/sane/xml.h +++ b/scan/sane/xml.h @@ -2,7 +2,7 @@ xml.h - HP SANE backend support for xml parsing - (c) 2008 Copyright Hewlett-Packard Development Company, LP + (c) 2008 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 diff --git a/scan/scanext/scanext.c b/scan/scanext/scanext.c index ca80113f3..d3eae2914 100755 --- a/scan/scanext/scanext.c +++ b/scan/scanext/scanext.c @@ -1,7 +1,7 @@ /******************************************************************* scanext - Python extension class for SANE -Portions (c) Copyright 2007 Hewlett-Packard Development Company, L.P. +Portions (c) Copyright 2015 HP Development Company, L.P. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/selinux/hplip.fc b/selinux/hplip.fc new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/selinux/hplip.fc diff --git a/selinux/hplip.if b/selinux/hplip.if new file mode 100644 index 000000000..3eb6a3057 --- /dev/null +++ b/selinux/hplip.if @@ -0,0 +1 @@ +## <summary></summary> diff --git a/selinux/hplip.pp b/selinux/hplip.pp Binary files differnew file mode 100644 index 000000000..95576f161 --- /dev/null +++ b/selinux/hplip.pp diff --git a/selinux/hplip.te b/selinux/hplip.te new file mode 100644 index 000000000..bdaec19e8 --- /dev/null +++ b/selinux/hplip.te @@ -0,0 +1,62 @@ +module hplip 1.0; + +require { + type hplip_t; + type bin_t; + type hplip_exec_t; + type hplip_etc_t; + type cupsd_t; + type urandom_device_t; + type cupsd_etc_t; + type cupsd_exec_t; + # type cupsd_var_lib_t; + # type passwd_file_t; + type home_root_t; + type setfiles_t; + type fs_t; + type devlog_t; + type proc_t; + type print_spool_t; + type user_home_t; + type user_home_dir_t; + type system_dbusd_t; + type system_dbusd_var_run_t; + type unconfined_t; + # type unconfined_service_t; + type ldconfig_exec_t; + type usr_t; + type tmp_t; + type rpm_var_lib_t; + type snmpd_var_lib_t; + type chkpwd_t; + class lnk_file { relabelto read }; + class dir { add_name open read lock ioctl search write remove_name add_name getattr relabelto create setattr }; + class file { setattr write append rename link unlink create getattr execute read execute open ioctl execute_no_trans entrypoint lock relabelto relabelfrom}; + class fifo_file { read write create unlink open ioctl getattr }; + class process { transition siginh noatsecure rlimitinh sigchld }; + class filesystem { associate }; + class chr_file { open read open getattr }; + class unix_dgram_socket { create connect getopt setopt }; + class capability { dac_override net_admin }; + class dbus { send_msg }; + class unix_stream_socket { connectto }; + class sock_file { write }; +} + +type_transition cupsd_t usr_t:file bin_t; +#allow cupsd_t usr_t:dir { read getattr lock search ioctl add_name remove_name write }; +allow cupsd_t bin_t:file { create open getattr setattr read write append rename link unlink ioctl lock }; +allow cupsd_t user_home_t:dir { create open search getattr read write add_name remove_name }; +allow cupsd_t user_home_t:file { create open getattr read write lock }; +allow cupsd_t user_home_dir_t:dir { search getattr read write }; +#allow cupsd_t rpm_var_lib_t:dir { getattr search read write }; +#allow cupsd_t rpm_var_lib_t:file { getattr read write getattr open lock }; +allow cupsd_t self:capability net_admin; +allow cupsd_t user_home_t:fifo_file { create read write open unlink }; +#allow system_dbusd_t unconfined_service_t:process { rlimitinh siginh noatsecure }; +allow cupsd_t chkpwd_t:process { rlimitinh siginh noatsecure }; + +# Requied for RHEL +allow cupsd_t snmpd_var_lib_t:dir { write }; +allow hplip_t home_root_t:dir { search }; +allow hplip_t unconfined_t:dbus { send_msg }; diff --git a/sendfax.py b/sendfax.py index a57d890f0..e78ca2317 100755 --- a/sendfax.py +++ b/sendfax.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -311,19 +311,19 @@ else: # NON_INTERACTIVE_MODE allowable_mime_types = cups.getAllowableMIMETypes() - stat = '' - try : - p = subprocess.Popen('getenforce', stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stat, err = p.communicate() - stat = to_string_utf8(stat) - except OSError : - pass - except : - log.exception() - sys.exit(1) - if stat.strip('\n') == 'Enforcing' : - log.error('Unable to add file. Please disable SeLinux.\nEither disable it manually or run hp-doctor from terminal.') - sys.exit(0) + # stat = '' + # try : + # p = subprocess.Popen('getenforce', stdout=subprocess.PIPE, stderr=subprocess.PIPE) + # stat, err = p.communicate() + # stat = to_string_utf8(stat) + # except OSError : + # pass + # except : + # log.exception() + # sys.exit(1) + # if stat.strip('\n') == 'Enforcing' : + # log.error('Unable to add file. Please disable SeLinux.\nEither disable it manually or run hp-doctor from terminal.') + # sys.exit(0) for f in mod.args: path = os.path.realpath(f) @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/systray.py b/systray.py index b232fb871..c7be1cc4b 100644 --- a/systray.py +++ b/systray.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/testpage.py b/testpage.py index 71dd10509..80d34e701 100755 --- a/testpage.py +++ b/testpage.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/timedate.py b/timedate.py index 40e05b27c..cf7f4ef8b 100755 --- a/timedate.py +++ b/timedate.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/toolbox.py b/toolbox.py index b7c0aed15..b96127509 100755 --- a/toolbox.py +++ b/toolbox.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/__init__.py b/ui/__init__.py index 5722dcbcb..f81e64cff 100644 --- a/ui/__init__.py +++ b/ui/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/aboutdlg.py b/ui/aboutdlg.py index 7f116bb36..1641bb2bd 100644 --- a/ui/aboutdlg.py +++ b/ui/aboutdlg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/aboutdlg_base.py b/ui/aboutdlg_base.py index 4e87d46c2..8e6a8fb3b 100644 --- a/ui/aboutdlg_base.py +++ b/ui/aboutdlg_base.py @@ -107,7 +107,7 @@ class AboutDlg_base(QDialog): self.textLabel4_2.setText(self.__tr("<b>Device Manager Software Version:</b>")) self.ToolboxVersionText.setText(self.__tr("0.0.0")) self.textLabel2.setText(self.__tr("<b>Authors and Contributors:</b>\nDavid Suffield, Don Welch, Shiyun Yie, Raghothama Cauligi, John Oleinik, Cory Meisch, Foster Nuffer, Pete Parks, Jacqueline Pitter, David Paschal,\nSteve DeRoos, Mark Overton, Aaron Albright, Smith Kennedy, John Hosszu, Chris Wiesner, Henrique M. Holschuh, Till Kamppeter, Linus Araque, Mark Crawford, Charlie Moore, Naga Samrat Choudary, Suma Byrappa, Parul Singh, Srikant Lokare, Sanjay Kumar, Sarbeswar Meher, Goutam Kodu, Gaurav Sood, Raghavendra Chitpadi, Amarnath Chitumalla")) - self.textLabel3.setText(self.__tr("<b>License and Copyright:</b>\n(c) Copyright 2007 Hewlett-Packard Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.")) + self.textLabel3.setText(self.__tr("<b>License and Copyright:</b>\n(c) Copyright 2015 HP Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.")) def __tr(self,s,c = None): diff --git a/ui/aboutdlg_base.ui b/ui/aboutdlg_base.ui index 4686e30c3..8841651a8 100644 --- a/ui/aboutdlg_base.ui +++ b/ui/aboutdlg_base.ui @@ -175,7 +175,7 @@ Steve DeRoos, Mark Overton, Aaron Albright, Smith Kennedy, John Hosszu, Chris Wi </property> <property name="text"> <string><b>License and Copyright:</b> -(c) Copyright 2007 Hewlett-Packard Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.</string> +(c) Copyright 2015 HP Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.</string> </property> </widget> <widget class="QLayoutWidget" row="6" column="0"> diff --git a/ui/align10form.py b/ui/align10form.py index ce4dfdc0c..69a7e76c3 100644 --- a/ui/align10form.py +++ b/ui/align10form.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/align13form.py b/ui/align13form.py index a56becb33..da9ef01de 100644 --- a/ui/align13form.py +++ b/ui/align13form.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/alignform.py b/ui/alignform.py index b65d9f9f4..79666bcd0 100644 --- a/ui/alignform.py +++ b/ui/alignform.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/aligntype6form1.py b/ui/aligntype6form1.py index 24c90e34b..5b3984086 100644 --- a/ui/aligntype6form1.py +++ b/ui/aligntype6form1.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/aligntype6form2.py b/ui/aligntype6form2.py index 683047349..92b3d5821 100644 --- a/ui/aligntype6form2.py +++ b/ui/aligntype6form2.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/allowabletypesdlg.py b/ui/allowabletypesdlg.py index 91a238a8f..d97a59590 100644 --- a/ui/allowabletypesdlg.py +++ b/ui/allowabletypesdlg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/choosedevicedlg.py b/ui/choosedevicedlg.py index 15f42603f..794cb81f7 100644 --- a/ui/choosedevicedlg.py +++ b/ui/choosedevicedlg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/chooseprinterdlg.py b/ui/chooseprinterdlg.py index 07c67bfd5..ae1567ac5 100644 --- a/ui/chooseprinterdlg.py +++ b/ui/chooseprinterdlg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/cleaningform.py b/ui/cleaningform.py index 134a3cf25..b623f15b3 100644 --- a/ui/cleaningform.py +++ b/ui/cleaningform.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/cleaningform2.py b/ui/cleaningform2.py index 8f3b9c091..eb2158927 100644 --- a/ui/cleaningform2.py +++ b/ui/cleaningform2.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/coloradjform.py b/ui/coloradjform.py index 820f74059..8bdf6155a 100644 --- a/ui/coloradjform.py +++ b/ui/coloradjform.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/colorcal4form.py b/ui/colorcal4form.py index c5e5cdea0..336c29963 100644 --- a/ui/colorcal4form.py +++ b/ui/colorcal4form.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/colorcalform.py b/ui/colorcalform.py index c7944b54a..2bf5ed86b 100644 --- a/ui/colorcalform.py +++ b/ui/colorcalform.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/colorcalform2.py b/ui/colorcalform2.py index 9f9c21d07..c0263a328 100644 --- a/ui/colorcalform2.py +++ b/ui/colorcalform2.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/coverpageform.py b/ui/coverpageform.py index fef50660c..37a234545 100644 --- a/ui/coverpageform.py +++ b/ui/coverpageform.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/deviceuricombobox.py b/ui/deviceuricombobox.py index 784af9f6e..c8da43c42 100644 --- a/ui/deviceuricombobox.py +++ b/ui/deviceuricombobox.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2011 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/devmgr4.py b/ui/devmgr4.py index 61de7403e..cc2552f91 100644 --- a/ui/devmgr4.py +++ b/ui/devmgr4.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/faxaddrbookform.py b/ui/faxaddrbookform.py index 0e3eed22d..109462207 100644 --- a/ui/faxaddrbookform.py +++ b/ui/faxaddrbookform.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/faxsendjobform.py b/ui/faxsendjobform.py index d9df81b5b..106215c5e 100644 --- a/ui/faxsendjobform.py +++ b/ui/faxsendjobform.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/faxsettingsform.py b/ui/faxsettingsform.py index 3c1fb44ff..4e66278fa 100644 --- a/ui/faxsettingsform.py +++ b/ui/faxsettingsform.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/firmwaredialog.py b/ui/firmwaredialog.py index 442d1d498..16b313374 100644 --- a/ui/firmwaredialog.py +++ b/ui/firmwaredialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2011 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/imagepropertiesdlg.py b/ui/imagepropertiesdlg.py index db063043d..331082558 100644 --- a/ui/imagepropertiesdlg.py +++ b/ui/imagepropertiesdlg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/jobstoragemixin.py b/ui/jobstoragemixin.py index 09b9e8c4b..76d6908e5 100644 --- a/ui/jobstoragemixin.py +++ b/ui/jobstoragemixin.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/loadpaperform.py b/ui/loadpaperform.py index 28ff833c2..322906270 100644 --- a/ui/loadpaperform.py +++ b/ui/loadpaperform.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/makecopiesform.py b/ui/makecopiesform.py index b79b015b2..27f144b36 100644 --- a/ui/makecopiesform.py +++ b/ui/makecopiesform.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/nodevicesform.py b/ui/nodevicesform.py index 3d4cd76a8..01f6ae53b 100644 --- a/ui/nodevicesform.py +++ b/ui/nodevicesform.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/paperedgealignform.py b/ui/paperedgealignform.py index 2f81e0dc2..100bd1a70 100644 --- a/ui/paperedgealignform.py +++ b/ui/paperedgealignform.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/pluginform2.py b/ui/pluginform2.py index 2fdb07097..64e64aa77 100644 --- a/ui/pluginform2.py +++ b/ui/pluginform2.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/printerform.py b/ui/printerform.py index 193063b99..0c6c4f39e 100644 --- a/ui/printerform.py +++ b/ui/printerform.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/scrollcopy.py b/ui/scrollcopy.py index 40aecbe17..65de58c6d 100644 --- a/ui/scrollcopy.py +++ b/ui/scrollcopy.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/scrollfax.py b/ui/scrollfax.py index c36affd15..ab1d84038 100644 --- a/ui/scrollfax.py +++ b/ui/scrollfax.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/scrollprint.py b/ui/scrollprint.py index 4aa4fcfef..ed08521a5 100644 --- a/ui/scrollprint.py +++ b/ui/scrollprint.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/scrollprintsettings.py b/ui/scrollprintsettings.py index d06ad366a..e633aba2d 100644 --- a/ui/scrollprintsettings.py +++ b/ui/scrollprintsettings.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/scrollunload.py b/ui/scrollunload.py index 624efebf4..fdb48e82d 100644 --- a/ui/scrollunload.py +++ b/ui/scrollunload.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/scrollview.py b/ui/scrollview.py index 7bc3c3bd1..99fd53af1 100644 --- a/ui/scrollview.py +++ b/ui/scrollview.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/settingsdialog.py b/ui/settingsdialog.py index 9d61e937d..92da22546 100644 --- a/ui/settingsdialog.py +++ b/ui/settingsdialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/setupform.py b/ui/setupform.py index 45925447a..307917b02 100644 --- a/ui/setupform.py +++ b/ui/setupform.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/setupmanualfind.py b/ui/setupmanualfind.py index 9bd0dd2c4..875d09084 100644 --- a/ui/setupmanualfind.py +++ b/ui/setupmanualfind.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/setupsettings.py b/ui/setupsettings.py index 4327b37fe..ce889a358 100644 --- a/ui/setupsettings.py +++ b/ui/setupsettings.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/systemtray.py b/ui/systemtray.py index a088a369a..7effc020d 100644 --- a/ui/systemtray.py +++ b/ui/systemtray.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/ui_utils.py b/ui/ui_utils.py index 7f7130ef7..6c9f9b108 100644 --- a/ui/ui_utils.py +++ b/ui/ui_utils.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/unloadform.py b/ui/unloadform.py index 0fd8f6560..8397a689c 100644 --- a/ui/unloadform.py +++ b/ui/unloadform.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/upgradeform.py b/ui/upgradeform.py index 5b2b871ce..6b9acf5cc 100644 --- a/ui/upgradeform.py +++ b/ui/upgradeform.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2012 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui/waitform.py b/ui/waitform.py index 7adb94543..515af6b35 100644 --- a/ui/waitform.py +++ b/ui/waitform.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/__init__.py b/ui4/__init__.py index ffdcaff09..c740ead61 100644 --- a/ui4/__init__.py +++ b/ui4/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/aboutdialog.py b/ui4/aboutdialog.py index ae65b69aa..de081a72f 100644 --- a/ui4/aboutdialog.py +++ b/ui4/aboutdialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/aboutdialog_base.py b/ui4/aboutdialog_base.py index ad1f6ba3d..62689c8ee 100644 --- a/ui4/aboutdialog_base.py +++ b/ui4/aboutdialog_base.py @@ -110,7 +110,7 @@ class Ui_AboutDlg_base(object): self.textLabel3.setText(QtGui.QApplication.translate("AboutDlg_base", "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:\'DejaVu Sans\'; font-size:10pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">License and Copyright:</span> (c) Copyright 2009 Hewlett-Packard Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.</p></body></html>", None, QtGui.QApplication.UnicodeUTF8)) +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">License and Copyright:</span> (c) Copyright 2015 HP Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.</p></body></html>", None, QtGui.QApplication.UnicodeUTF8)) self.textLabel2.setText(QtGui.QApplication.translate("AboutDlg_base", "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:\'DejaVu Sans\'; font-size:10pt; font-weight:400; font-style:normal;\">\n" diff --git a/ui4/aboutdialog_base.ui b/ui4/aboutdialog_base.ui index 61350cfed..2f6830f51 100644 --- a/ui4/aboutdialog_base.ui +++ b/ui4/aboutdialog_base.ui @@ -144,7 +144,7 @@ p, li { white-space: pre-wrap; } <string><html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">License and Copyright:</span> (c) Copyright 2009 Hewlett-Packard Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.</p></body></html></string> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">License and Copyright:</span> (c) Copyright 2015 HP Development Company, L.P. This software is licensed under the GNU General Public License (GPL), BSD, and MIT licenses. See the software sources for details.</p></body></html></string> </property> <property name="wordWrap" > <bool>true</bool> diff --git a/ui4/aligndialog.py b/ui4/aligndialog.py index 0b333f7da..461e8a518 100644 --- a/ui4/aligndialog.py +++ b/ui4/aligndialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/cleandialog.py b/ui4/cleandialog.py index e21a8af7b..f0d3a6846 100644 --- a/ui4/cleandialog.py +++ b/ui4/cleandialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/colorcaldialog.py b/ui4/colorcaldialog.py index d9b30230e..e4e07d666 100644 --- a/ui4/colorcaldialog.py +++ b/ui4/colorcaldialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/devicesetupdialog.py b/ui4/devicesetupdialog.py index 6538a9a3b..22d9fd341 100644 --- a/ui4/devicesetupdialog.py +++ b/ui4/devicesetupdialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/deviceuricombobox.py b/ui4/deviceuricombobox.py index 3b78a2abd..4f6ccda34 100644 --- a/ui4/deviceuricombobox.py +++ b/ui4/deviceuricombobox.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/devmgr5.py b/ui4/devmgr5.py index 5d8f3b7dc..2f20a9f74 100644 --- a/ui4/devmgr5.py +++ b/ui4/devmgr5.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/fabgrouptable.py b/ui4/fabgrouptable.py index 68f35ed3d..3bf7778c8 100644 --- a/ui4/fabgrouptable.py +++ b/ui4/fabgrouptable.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/fabnametable.py b/ui4/fabnametable.py index 919d6fada..b9297afeb 100644 --- a/ui4/fabnametable.py +++ b/ui4/fabnametable.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/fabwindow.py b/ui4/fabwindow.py index 0d587a987..56b6ad2a4 100644 --- a/ui4/fabwindow.py +++ b/ui4/fabwindow.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/faxsetupdialog.py b/ui4/faxsetupdialog.py index c0eac7be7..98f502e44 100644 --- a/ui4/faxsetupdialog.py +++ b/ui4/faxsetupdialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/filetable.py b/ui4/filetable.py index ca85b6445..e9e798035 100644 --- a/ui4/filetable.py +++ b/ui4/filetable.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -272,10 +272,10 @@ class FileTable(QWidget): pass except : log.exception() - if stat.strip('\n') == 'Enforcing' : - FailureUI(self, self.__tr("<b>Unable to add file. Please disable SeLinux.</b><p>Either disable it manually or run hp-doctor from terminal.</p>"), - self.__tr("HP Device Manager")) - return + # if stat.strip('\n') == 'Enforcing' : + # FailureUI(self, self.__tr("<b>Unable to add file. Please disable SeLinux.</b><p>Either disable it manually or run hp-doctor from terminal.</p>"), + # self.__tr("HP Device Manager")) + # return s = self.__tr("Select File(s) to Send") diff --git a/ui4/firmwaredialog.py b/ui4/firmwaredialog.py index b8bb1f137..dc08419d3 100644 --- a/ui4/firmwaredialog.py +++ b/ui4/firmwaredialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/infodialog.py b/ui4/infodialog.py index e940478d4..878671aff 100644 --- a/ui4/infodialog.py +++ b/ui4/infodialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/linefeedcaldialog.py b/ui4/linefeedcaldialog.py index 195025a77..62c31a6bb 100644 --- a/ui4/linefeedcaldialog.py +++ b/ui4/linefeedcaldialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/loadpapergroupbox.py b/ui4/loadpapergroupbox.py index 9a94e4263..1d64b4eed 100644 --- a/ui4/loadpapergroupbox.py +++ b/ui4/loadpapergroupbox.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/makecopiesdialog.py b/ui4/makecopiesdialog.py index 97d05217a..fd8c8b1bf 100644 --- a/ui4/makecopiesdialog.py +++ b/ui4/makecopiesdialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/mimetypesdialog.py b/ui4/mimetypesdialog.py index c8fcc9467..7afc2aa07 100644 --- a/ui4/mimetypesdialog.py +++ b/ui4/mimetypesdialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/nodevicesdialog.py b/ui4/nodevicesdialog.py index 2a25352f7..ad7fa6271 100644 --- a/ui4/nodevicesdialog.py +++ b/ui4/nodevicesdialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/plugindiagnose.py b/ui4/plugindiagnose.py index 2b7645301..a7963ffbd 100644 --- a/ui4/plugindiagnose.py +++ b/ui4/plugindiagnose.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2011 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/plugindialog.py b/ui4/plugindialog.py index 85d25d209..298c2beb6 100644 --- a/ui4/plugindialog.py +++ b/ui4/plugindialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/pluginlicensedialog.py b/ui4/pluginlicensedialog.py index 43b71671a..e13ff621b 100644 --- a/ui4/pluginlicensedialog.py +++ b/ui4/pluginlicensedialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/pqdiagdialog.py b/ui4/pqdiagdialog.py index ab3f7367e..96ff8aa15 100644 --- a/ui4/pqdiagdialog.py +++ b/ui4/pqdiagdialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/printdialog.py b/ui4/printdialog.py index 0e958f60c..3190849eb 100644 --- a/ui4/printdialog.py +++ b/ui4/printdialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/printernamecombobox.py b/ui4/printernamecombobox.py index 47bb7ad80..b3dc07874 100644 --- a/ui4/printernamecombobox.py +++ b/ui4/printernamecombobox.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/printsettingsdialog.py b/ui4/printsettingsdialog.py index f2d447698..1e00a8b04 100644 --- a/ui4/printsettingsdialog.py +++ b/ui4/printsettingsdialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/printsettingstoolbox.py b/ui4/printsettingstoolbox.py index 2179235f3..77609d4dc 100644 --- a/ui4/printsettingstoolbox.py +++ b/ui4/printsettingstoolbox.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/printtestpagedialog.py b/ui4/printtestpagedialog.py index b41f7f0ec..e8e5860ce 100644 --- a/ui4/printtestpagedialog.py +++ b/ui4/printtestpagedialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/queuesconf.py b/ui4/queuesconf.py index 046f44fff..a6928ad95 100644 --- a/ui4/queuesconf.py +++ b/ui4/queuesconf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2011-2014 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2011-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/readonlyradiobutton.py b/ui4/readonlyradiobutton.py index 66f058f10..b32846551 100644 --- a/ui4/readonlyradiobutton.py +++ b/ui4/readonlyradiobutton.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/sendfaxdialog.py b/ui4/sendfaxdialog.py index 4fa91ac95..a1ecb59dc 100644 --- a/ui4/sendfaxdialog.py +++ b/ui4/sendfaxdialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/settingsdialog.py b/ui4/settingsdialog.py index 91c156da0..fcf879be7 100644 --- a/ui4/settingsdialog.py +++ b/ui4/settingsdialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/setupdialog.py b/ui4/setupdialog.py index 13b8ea661..05a445f41 100644 --- a/ui4/setupdialog.py +++ b/ui4/setupdialog.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -585,6 +585,12 @@ class SetupDialog(QDialog, Ui_Dialog): self.DevicesFoundIcon.setPixmap(load_pixmap('error', '16x16')) log.error("No devices found on bus: %s" % self.bus) self.DevicesFoundLabel.setText(self.__tr("<b>No devices found.</b><br>Click <i>Back</i> to change discovery options, or <i>Refresh</i> to search again.")) + if self.bus == 'net' and utils.check_lan(): + FailureUI(self, self.__tr('''<b>HPLIP cannot detect printers in your network.</b><p>This may be due to existing firewall settings blocking the required ports. + When you are in a trusted network environment, you may open the ports for network services like mdns and slp in the firewall. For detailed steps follow the link. + <b>http://hplipopensource.com/node/374</b></p>'''), + self.__tr("HP Device Manager")) + self.displayPage(PAGE_DEVICES) diff --git a/ui4/systemtray.py b/ui4/systemtray.py index 7c0d90429..7e8e5967a 100644 --- a/ui4/systemtray.py +++ b/ui4/systemtray.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/systrayframe.py b/ui4/systrayframe.py index d9e4ad032..c4b710653 100644 --- a/ui4/systrayframe.py +++ b/ui4/systrayframe.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/ui_utils.py b/ui4/ui_utils.py index 6552b214a..a63009702 100644 --- a/ui4/ui_utils.py +++ b/ui4/ui_utils.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/upgradedialog.py b/ui4/upgradedialog.py index 6d588a869..7b73aa8f9 100644 --- a/ui4/upgradedialog.py +++ b/ui4/upgradedialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2011 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ui4/wifisetupdialog.py b/ui4/wifisetupdialog.py index faa9e968c..6a5dd3bcb 100644 --- a/ui4/wifisetupdialog.py +++ b/ui4/wifisetupdialog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2001-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/uninstall.py b/uninstall.py index 888d7fd5c..25e00b03a 100755 --- a/uninstall.py +++ b/uninstall.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# (c) Copyright 2011-2014 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2011-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/upgrade.py b/upgrade.py index 8e94c27e8..8531eec60 100755 --- a/upgrade.py +++ b/upgrade.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# (c) Copyright 2011-2014 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2011-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/wificonfig.py b/wificonfig.py index dbed8c11b..c73490a97 100755 --- a/wificonfig.py +++ b/wificonfig.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +# (c) Copyright 2003-2015 HP Development Company, L.P. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by |