- Update to 2.7.9 (breaks out foomatic integration, all access is done via

  libusb now)

PR:		ports/117250
Submitted by:	Anish Mistry <amistry@am-productions.biz> (maintainer)

1 files changed, 654 insertions, 51 deletions

diff --git a/print/hplip/pkg-plist b/print/hplip/pkg-plist
index c389182eb9c7..634054de5889 100644
--- a/print/hplip/pkg-plist
+++ b/print/hplip/pkg-plist
@@ -1,4 +1,3 @@
-bin/foomatic-rip
 bin/hp-align
 bin/hp-check
 bin/hp-clean
@@ -11,6 +10,7 @@ bin/hp-makecopies
 bin/hp-makeuri
 bin/hp-print
 bin/hp-probe
+bin/hp-scan
 bin/hp-sendfax
 bin/hp-setup
 bin/hp-testpage
@@ -18,30 +18,32 @@ bin/hp-timedate
 bin/hp-toolbox
 bin/hp-unload
 bin/hpijs
+@unexec if cmp -s %D/etc/hp/hplip.conf.sample %D/etc/hp/hplip.conf; then rm -f %D/etc/hp/hplip.conf; fi
 etc/hp/hplip.conf.sample
+@exec if [ ! -f %D/etc/hp/hplip.conf ] ; then cp -p %D/%F %B/hplip.conf; fi
 lib/libhpip.la
 lib/libhpip.so
 lib/libhpip.so.0
-lib/libsane-hpaio.la
-lib/libsane-hpaio.so
-lib/libsane-hpaio.so.1
+lib/libhpmud.la
+lib/libhpmud.so
+lib/libhpmud.so.0
 %%PYTHON_SITELIBDIR%%/cupsext.la
 %%PYTHON_SITELIBDIR%%/cupsext.so
+%%PYTHON_SITELIBDIR%%/hpmudext.la
+%%PYTHON_SITELIBDIR%%/hpmudext.so
 %%PYTHON_SITELIBDIR%%/pcardext.la
 %%PYTHON_SITELIBDIR%%/pcardext.so
+%%PYTHON_SITELIBDIR%%/scanext.la
+%%PYTHON_SITELIBDIR%%/scanext.so
+lib/sane/libsane-hpaio.la
 lib/sane/libsane-hpaio.so
 lib/sane/libsane-hpaio.so.1
-lib/sane/libsane-hpaio.so.1.0.0
 libexec/cups/backend/hp
 libexec/cups/backend/hpfax
-libexec/cups/filter/foomatic-rip
-sbin/hpiod
 sbin/hpssd
 share/applications/hplip.desktop
-share/cups/model/foomatic-ppds
-%%PORTDOCS%%share/doc/hpijs-%%IJSVER%%/COPYING
-%%PORTDOCS%%share/doc/hpijs-%%IJSVER%%/README_LIBJPG
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/README_LIBJPG
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/about.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/contacts.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/downloads.html
@@ -53,25 +55,22 @@ share/cups/model/foomatic-ppds
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/install.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/io.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/known.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/negative.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/other.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/parallel.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/pcard.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/printing.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/scanning.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/toolbox.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/hpaio.desc
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/uninstall.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Screenshot-xsane.png
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/back.png
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/button.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/circular.gif
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_device_list.png
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_left.png
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_model_list.png
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_opening.png
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_printer_model.png
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/download.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/favicon.ico
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/favicon2.ico
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_1.png
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_2.png
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_3.png
@@ -207,6 +206,7 @@ share/cups/model/foomatic-ppds
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/index.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/make.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/make_install.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/permissions.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/apt.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/index.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/rpm.html
@@ -248,12 +248,34 @@ share/cups/model/foomatic-ppds
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/laser.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/mono_laser_mfp.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/photosmart.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/scanjet.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/unsupported.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/system_requirements.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/device_classes.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/hpijs.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/index.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/align.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/check.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/clean.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/colorcal.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/fab.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/firmware.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/hpssd.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/index.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/info.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/install.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/levels.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/makecopies.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/makeuri.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/print.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/probe.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/scan.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/sendfax.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/setup.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/testpage.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/timedate.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/toolbox.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/unload.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/overview.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/page_sizes.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/printable_areas.html
@@ -266,13 +288,560 @@ share/cups/model/foomatic-ppds
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/io.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/network.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/other.html
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/parallel.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/pcard.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/printing.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/scanning.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/toolbox.html
-%%DATADIR%%/COPYING
+share/foomatic/db/source/PPD/HP/HP_Business_Inkjet_2250.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Business_Inkjet_2280.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Business_Inkjet_2600.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Business_Inkjet_2800.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Business_Inkjet_3000.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Color_LaserJet.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_2550.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_2605.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_2700.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_2800.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_3000.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_3800.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_4500.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_4550.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_4700.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_4730_MFP.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_5550.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_5M.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_8500.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_8550.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_CM1015.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_CM4730_MFP.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_CP3505.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_CP4005.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_1200.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_1220.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_1320_Series.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_2100_Series.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_2200.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_2410.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_2420.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_2430.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_3050.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_3052.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_3200.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_3300_Series.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_3390.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_4.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_4000_Series.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_4050_Series.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_4100_MFP.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_4100_Series.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_4240.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_4250.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_4345_MFP.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_4350.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_4ML.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_4MP.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_4Si_v2011.110.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_4V.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_4_Plus.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_5000_Series.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_5100_Series.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_5200.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_5200L.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_5M.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_5MP.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_5Si.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_5Si_Mopier.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_6MP.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_8000_Series.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_8100_Series.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_8150_Series.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_9000_MFP.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_9000_Series.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_9040.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_9040_9050_MFP.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_9050.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_9055_9065_MFP.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_M3027_MFP.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_M3035_MFP.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_M4345_MFP.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_M5025_MFP.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_M5035_MFP.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_P2015.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_P3004.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_LaserJet_P3005.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Mopier_240.ppd.gz
+share/foomatic/db/source/PPD/HP/HP_Mopier_320.ppd.gz
+share/foomatic/db/source/PPD/HP/hp_LaserJet_1300_series.ppd.gz
+share/foomatic/db/source/PPD/HP/hp_LaserJet_2300.ppd.gz
+share/foomatic/db/source/PPD/HP/hp_LaserJet_3015.ppd.gz
+share/foomatic/db/source/PPD/HP/hp_LaserJet_3020_3030.ppd.gz
+share/foomatic/db/source/PPD/HP/hp_LaserJet_3380.ppd.gz
+share/foomatic/db/source/PPD/HP/hp_LaserJet_4200_Series.ppd.gz
+share/foomatic/db/source/PPD/HP/hp_LaserJet_4300_Series.ppd.gz
+share/foomatic/db/source/PPD/HP/hp_business_inkjet_2300.ppd.gz
+share/foomatic/db/source/PPD/HP/hp_color_LaserJet_2500.ppd.gz
+share/foomatic/db/source/PPD/HP/hp_color_LaserJet_3700.ppd.gz
+share/foomatic/db/source/PPD/HP/hp_color_LaserJet_4600.ppd.gz
+share/foomatic/db/source/PPD/HP/hp_color_LaserJet_4610.ppd.gz
+share/foomatic/db/source/PPD/HP/hp_color_LaserJet_4650.ppd.gz
+share/foomatic/db/source/PPD/HP/hp_color_LaserJet_5500.ppd.gz
+share/foomatic/db/source/PPD/HP/hp_color_LaserJet_9500.ppd.gz
+share/foomatic/db/source/PPD/HP/hp_color_LaserJet_9500_MFP.ppd.gz
+share/foomatic/db/source/PPD/HP/hp_officejet_9100_series.ppd.gz
+share/foomatic/db/source/driver/hpijs.xml
+share/foomatic/db/source/opt/hpijs-Duplex.xml
+share/foomatic/db/source/opt/hpijs-InputSlot.xml
+share/foomatic/db/source/opt/hpijs-Model.xml
+share/foomatic/db/source/opt/hpijs-PageSize.xml
+share/foomatic/db/source/opt/hpijs-PrintoutMode.xml
+share/foomatic/db/source/opt/hpijs-Quality.xml
+share/foomatic/db/source/printer/HP-2000C.xml
+share/foomatic/db/source/printer/HP-2500C.xml
+share/foomatic/db/source/printer/HP-2500CM.xml
+share/foomatic/db/source/printer/HP-910.xml
+share/foomatic/db/source/printer/HP-915.xml
+share/foomatic/db/source/printer/HP-Business_Inkjet_1000.xml
+share/foomatic/db/source/printer/HP-Business_Inkjet_1100.xml
+share/foomatic/db/source/printer/HP-Business_Inkjet_1200.xml
+share/foomatic/db/source/printer/HP-Business_Inkjet_2200.xml
+share/foomatic/db/source/printer/HP-Business_Inkjet_2230.xml
+share/foomatic/db/source/printer/HP-Business_Inkjet_2250.xml
+share/foomatic/db/source/printer/HP-Business_Inkjet_2250TN.xml
+share/foomatic/db/source/printer/HP-Business_Inkjet_2280.xml
+share/foomatic/db/source/printer/HP-Business_Inkjet_2300.xml
+share/foomatic/db/source/printer/HP-Business_Inkjet_2600.xml
+share/foomatic/db/source/printer/HP-Business_Inkjet_2800.xml
+share/foomatic/db/source/printer/HP-Business_Inkjet_3000.xml
+share/foomatic/db/source/printer/HP-Color_Inkjet_Printer_CP1160.xml
+share/foomatic/db/source/printer/HP-Color_Inkjet_Printer_CP1700.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_2500.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_3000.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_3500.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_3550.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_3600.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_3700.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_3800.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_4500.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_4550.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_4600.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_4610.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_4650.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_4700.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_4730_MFP.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_5.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_5000.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_5500.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_5550.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_5M.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_8500.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_8550GN.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_9500.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_9500_MFP.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_CM4730_MFP.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_CP3505.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_CP4005.xml
+share/foomatic/db/source/printer/HP-DesignJet_ColorPro_CAD.xml
+share/foomatic/db/source/printer/HP-DeskJet_1100C.xml
+share/foomatic/db/source/printer/HP-DeskJet_1120C.xml
+share/foomatic/db/source/printer/HP-DeskJet_1125C.xml
+share/foomatic/db/source/printer/HP-DeskJet_1200C.xml
+share/foomatic/db/source/printer/HP-DeskJet_1220C.xml
+share/foomatic/db/source/printer/HP-DeskJet_1280.xml
+share/foomatic/db/source/printer/HP-DeskJet_1600C.xml
+share/foomatic/db/source/printer/HP-DeskJet_3320.xml
+share/foomatic/db/source/printer/HP-DeskJet_3325.xml
+share/foomatic/db/source/printer/HP-DeskJet_3420.xml
+share/foomatic/db/source/printer/HP-DeskJet_3425.xml
+share/foomatic/db/source/printer/HP-DeskJet_350C.xml
+share/foomatic/db/source/printer/HP-DeskJet_3520.xml
+share/foomatic/db/source/printer/HP-DeskJet_3528.xml
+share/foomatic/db/source/printer/HP-DeskJet_3535.xml
+share/foomatic/db/source/printer/HP-DeskJet_3550.xml
+share/foomatic/db/source/printer/HP-DeskJet_3558.xml
+share/foomatic/db/source/printer/HP-DeskJet_3650.xml
+share/foomatic/db/source/printer/HP-DeskJet_3658.xml
+share/foomatic/db/source/printer/HP-DeskJet_3668.xml
+share/foomatic/db/source/printer/HP-DeskJet_3740.xml
+share/foomatic/db/source/printer/HP-DeskJet_3810.xml
+share/foomatic/db/source/printer/HP-DeskJet_3816.xml
+share/foomatic/db/source/printer/HP-DeskJet_3820.xml
+share/foomatic/db/source/printer/HP-DeskJet_3822.xml
+share/foomatic/db/source/printer/HP-DeskJet_3840.xml
+share/foomatic/db/source/printer/HP-DeskJet_3845.xml
+share/foomatic/db/source/printer/HP-DeskJet_3920.xml
+share/foomatic/db/source/printer/HP-DeskJet_3940.xml
+share/foomatic/db/source/printer/HP-DeskJet_400.xml
+share/foomatic/db/source/printer/HP-DeskJet_420C.xml
+share/foomatic/db/source/printer/HP-DeskJet_450.xml
+share/foomatic/db/source/printer/HP-DeskJet_460.xml
+share/foomatic/db/source/printer/HP-DeskJet_500.xml
+share/foomatic/db/source/printer/HP-DeskJet_500C.xml
+share/foomatic/db/source/printer/HP-DeskJet_505J_Plus.xml
+share/foomatic/db/source/printer/HP-DeskJet_510.xml
+share/foomatic/db/source/printer/HP-DeskJet_5150.xml
+share/foomatic/db/source/printer/HP-DeskJet_5158.xml
+share/foomatic/db/source/printer/HP-DeskJet_5160.xml
+share/foomatic/db/source/printer/HP-DeskJet_520.xml
+share/foomatic/db/source/printer/HP-DeskJet_540C.xml
+share/foomatic/db/source/printer/HP-DeskJet_5440.xml
+share/foomatic/db/source/printer/HP-DeskJet_550C.xml
+share/foomatic/db/source/printer/HP-DeskJet_5550.xml
+share/foomatic/db/source/printer/HP-DeskJet_5551.xml
+share/foomatic/db/source/printer/HP-DeskJet_560C.xml
+share/foomatic/db/source/printer/HP-DeskJet_5650.xml
+share/foomatic/db/source/printer/HP-DeskJet_5652.xml
+share/foomatic/db/source/printer/HP-DeskJet_5670.xml
+share/foomatic/db/source/printer/HP-DeskJet_5740.xml
+share/foomatic/db/source/printer/HP-DeskJet_5850.xml
+share/foomatic/db/source/printer/HP-DeskJet_5940.xml
+share/foomatic/db/source/printer/HP-DeskJet_600.xml
+share/foomatic/db/source/printer/HP-DeskJet_610C.xml
+share/foomatic/db/source/printer/HP-DeskJet_610CL.xml
+share/foomatic/db/source/printer/HP-DeskJet_6122.xml
+share/foomatic/db/source/printer/HP-DeskJet_6127.xml
+share/foomatic/db/source/printer/HP-DeskJet_612C.xml
+share/foomatic/db/source/printer/HP-DeskJet_630C.xml
+share/foomatic/db/source/printer/HP-DeskJet_632C.xml
+share/foomatic/db/source/printer/HP-DeskJet_640C.xml
+share/foomatic/db/source/printer/HP-DeskJet_648C.xml
+share/foomatic/db/source/printer/HP-DeskJet_6520.xml
+share/foomatic/db/source/printer/HP-DeskJet_6540.xml
+share/foomatic/db/source/printer/HP-DeskJet_656C.xml
+share/foomatic/db/source/printer/HP-DeskJet_6600.xml
+share/foomatic/db/source/printer/HP-DeskJet_660C.xml
+share/foomatic/db/source/printer/HP-DeskJet_670C.xml
+share/foomatic/db/source/printer/HP-DeskJet_670TV.xml
+share/foomatic/db/source/printer/HP-DeskJet_672C.xml
+share/foomatic/db/source/printer/HP-DeskJet_6800.xml
+share/foomatic/db/source/printer/HP-DeskJet_680C.xml
+share/foomatic/db/source/printer/HP-DeskJet_682C.xml
+share/foomatic/db/source/printer/HP-DeskJet_6840.xml
+share/foomatic/db/source/printer/HP-DeskJet_690C.xml
+share/foomatic/db/source/printer/HP-DeskJet_692C.xml
+share/foomatic/db/source/printer/HP-DeskJet_693C.xml
+share/foomatic/db/source/printer/HP-DeskJet_6940.xml
+share/foomatic/db/source/printer/HP-DeskJet_694C.xml
+share/foomatic/db/source/printer/HP-DeskJet_695C.xml
+share/foomatic/db/source/printer/HP-DeskJet_697C.xml
+share/foomatic/db/source/printer/HP-DeskJet_6980.xml
+share/foomatic/db/source/printer/HP-DeskJet_810C.xml
+share/foomatic/db/source/printer/HP-DeskJet_812C.xml
+share/foomatic/db/source/printer/HP-DeskJet_815C.xml
+share/foomatic/db/source/printer/HP-DeskJet_816C.xml
+share/foomatic/db/source/printer/HP-DeskJet_825C.xml
+share/foomatic/db/source/printer/HP-DeskJet_830C.xml
+share/foomatic/db/source/printer/HP-DeskJet_832C.xml
+share/foomatic/db/source/printer/HP-DeskJet_840C.xml
+share/foomatic/db/source/printer/HP-DeskJet_841C.xml
+share/foomatic/db/source/printer/HP-DeskJet_842C.xml
+share/foomatic/db/source/printer/HP-DeskJet_843C.xml
+share/foomatic/db/source/printer/HP-DeskJet_845C.xml
+share/foomatic/db/source/printer/HP-DeskJet_850C.xml
+share/foomatic/db/source/printer/HP-DeskJet_855C.xml
+share/foomatic/db/source/printer/HP-DeskJet_870C.xml
+share/foomatic/db/source/printer/HP-DeskJet_880C.xml
+share/foomatic/db/source/printer/HP-DeskJet_882C.xml
+share/foomatic/db/source/printer/HP-DeskJet_890C.xml
+share/foomatic/db/source/printer/HP-DeskJet_895C.xml
+share/foomatic/db/source/printer/HP-DeskJet_916C.xml
+share/foomatic/db/source/printer/HP-DeskJet_920C.xml
+share/foomatic/db/source/printer/HP-DeskJet_9300.xml
+share/foomatic/db/source/printer/HP-DeskJet_930C.xml
+share/foomatic/db/source/printer/HP-DeskJet_932C.xml
+share/foomatic/db/source/printer/HP-DeskJet_933C.xml
+share/foomatic/db/source/printer/HP-DeskJet_934C.xml
+share/foomatic/db/source/printer/HP-DeskJet_935C.xml
+share/foomatic/db/source/printer/HP-DeskJet_940C.xml
+share/foomatic/db/source/printer/HP-DeskJet_948C.xml
+share/foomatic/db/source/printer/HP-DeskJet_950C.xml
+share/foomatic/db/source/printer/HP-DeskJet_952C.xml
+share/foomatic/db/source/printer/HP-DeskJet_955C.xml
+share/foomatic/db/source/printer/HP-DeskJet_957C.xml
+share/foomatic/db/source/printer/HP-DeskJet_959C.xml
+share/foomatic/db/source/printer/HP-DeskJet_9600.xml
+share/foomatic/db/source/printer/HP-DeskJet_960C.xml
+share/foomatic/db/source/printer/HP-DeskJet_970C.xml
+share/foomatic/db/source/printer/HP-DeskJet_975C.xml
+share/foomatic/db/source/printer/HP-DeskJet_9800.xml
+share/foomatic/db/source/printer/HP-DeskJet_980C.xml
+share/foomatic/db/source/printer/HP-DeskJet_990C.xml
+share/foomatic/db/source/printer/HP-DeskJet_995C.xml
+share/foomatic/db/source/printer/HP-DeskJet_D1300.xml
+share/foomatic/db/source/printer/HP-DeskJet_D1400.xml
+share/foomatic/db/source/printer/HP-DeskJet_D2300.xml
+share/foomatic/db/source/printer/HP-DeskJet_D2400.xml
+share/foomatic/db/source/printer/HP-DeskJet_D4100.xml
+share/foomatic/db/source/printer/HP-DeskJet_D4200.xml
+share/foomatic/db/source/printer/HP-DeskJet_F2100.xml
+share/foomatic/db/source/printer/HP-DeskJet_F300.xml
+share/foomatic/db/source/printer/HP-DeskJet_F4100.xml
+share/foomatic/db/source/printer/HP-LaserJet_1010.xml
+share/foomatic/db/source/printer/HP-LaserJet_1012.xml
+share/foomatic/db/source/printer/HP-LaserJet_1015.xml
+share/foomatic/db/source/printer/HP-LaserJet_1022.xml
+share/foomatic/db/source/printer/HP-LaserJet_1100.xml
+share/foomatic/db/source/printer/HP-LaserJet_1100A.xml
+share/foomatic/db/source/printer/HP-LaserJet_1150.xml
+share/foomatic/db/source/printer/HP-LaserJet_1160.xml
+share/foomatic/db/source/printer/HP-LaserJet_1200.xml
+share/foomatic/db/source/printer/HP-LaserJet_1220.xml
+share/foomatic/db/source/printer/HP-LaserJet_1300.xml
+share/foomatic/db/source/printer/HP-LaserJet_1320.xml
+share/foomatic/db/source/printer/HP-LaserJet_2100.xml
+share/foomatic/db/source/printer/HP-LaserJet_2100M.xml
+share/foomatic/db/source/printer/HP-LaserJet_2200.xml
+share/foomatic/db/source/printer/HP-LaserJet_2300.xml
+share/foomatic/db/source/printer/HP-LaserJet_2410.xml
+share/foomatic/db/source/printer/HP-LaserJet_2420.xml
+share/foomatic/db/source/printer/HP-LaserJet_2430.xml
+share/foomatic/db/source/printer/HP-LaserJet_3015.xml
+share/foomatic/db/source/printer/HP-LaserJet_3020.xml
+share/foomatic/db/source/printer/HP-LaserJet_3030.xml
+share/foomatic/db/source/printer/HP-LaserJet_3050.xml
+share/foomatic/db/source/printer/HP-LaserJet_3052.xml
+share/foomatic/db/source/printer/HP-LaserJet_3055.xml
+share/foomatic/db/source/printer/HP-LaserJet_3200.xml
+share/foomatic/db/source/printer/HP-LaserJet_3200m.xml
+share/foomatic/db/source/printer/HP-LaserJet_3200se.xml
+share/foomatic/db/source/printer/HP-LaserJet_3300_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_3310_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_3320N_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_3320_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_3330_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_3380.xml
+share/foomatic/db/source/printer/HP-LaserJet_3390.xml
+share/foomatic/db/source/printer/HP-LaserJet_3392.xml
+share/foomatic/db/source/printer/HP-LaserJet_4.xml
+share/foomatic/db/source/printer/HP-LaserJet_4000.xml
+share/foomatic/db/source/printer/HP-LaserJet_4050.xml
+share/foomatic/db/source/printer/HP-LaserJet_4100.xml
+share/foomatic/db/source/printer/HP-LaserJet_4200.xml
+share/foomatic/db/source/printer/HP-LaserJet_4240.xml
+share/foomatic/db/source/printer/HP-LaserJet_4250.xml
+share/foomatic/db/source/printer/HP-LaserJet_4300.xml
+share/foomatic/db/source/printer/HP-LaserJet_4345_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_4350.xml
+share/foomatic/db/source/printer/HP-LaserJet_4L.xml
+share/foomatic/db/source/printer/HP-LaserJet_4M.xml
+share/foomatic/db/source/printer/HP-LaserJet_4ML.xml
+share/foomatic/db/source/printer/HP-LaserJet_4P.xml
+share/foomatic/db/source/printer/HP-LaserJet_4Si.xml
+share/foomatic/db/source/printer/HP-LaserJet_4V.xml
+share/foomatic/db/source/printer/HP-LaserJet_4V_4LJ_Pro.xml
+share/foomatic/db/source/printer/HP-LaserJet_4_Plus.xml
+share/foomatic/db/source/printer/HP-LaserJet_5.xml
+share/foomatic/db/source/printer/HP-LaserJet_5000.xml
+share/foomatic/db/source/printer/HP-LaserJet_5100.xml
+share/foomatic/db/source/printer/HP-LaserJet_5200.xml
+share/foomatic/db/source/printer/HP-LaserJet_5200L.xml
+share/foomatic/db/source/printer/HP-LaserJet_5L.xml
+share/foomatic/db/source/printer/HP-LaserJet_5M.xml
+share/foomatic/db/source/printer/HP-LaserJet_5MP.xml
+share/foomatic/db/source/printer/HP-LaserJet_5P.xml
+share/foomatic/db/source/printer/HP-LaserJet_5Si.xml
+share/foomatic/db/source/printer/HP-LaserJet_6.xml
+share/foomatic/db/source/printer/HP-LaserJet_6L.xml
+share/foomatic/db/source/printer/HP-LaserJet_6MP.xml
+share/foomatic/db/source/printer/HP-LaserJet_6P.xml
+share/foomatic/db/source/printer/HP-LaserJet_8000.xml
+share/foomatic/db/source/printer/HP-LaserJet_8100.xml
+share/foomatic/db/source/printer/HP-LaserJet_8150.xml
+share/foomatic/db/source/printer/HP-LaserJet_9000.xml
+share/foomatic/db/source/printer/HP-LaserJet_9000_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_9040.xml
+share/foomatic/db/source/printer/HP-LaserJet_9040_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_9050.xml
+share/foomatic/db/source/printer/HP-LaserJet_9050_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_9055_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_9065_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_M3027_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_M3035_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_M4345_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_M5025_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_M5035_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_P2010.xml
+share/foomatic/db/source/printer/HP-LaserJet_P2015.xml
+share/foomatic/db/source/printer/HP-LaserJet_P3004.xml
+share/foomatic/db/source/printer/HP-LaserJet_P3005.xml
+share/foomatic/db/source/printer/HP-Mopier_240.xml
+share/foomatic/db/source/printer/HP-Mopier_320.xml
+share/foomatic/db/source/printer/HP-OfficeJet.xml
+share/foomatic/db/source/printer/HP-OfficeJet_300.xml
+share/foomatic/db/source/printer/HP-OfficeJet_330.xml
+share/foomatic/db/source/printer/HP-OfficeJet_350.xml
+share/foomatic/db/source/printer/HP-OfficeJet_4100.xml
+share/foomatic/db/source/printer/HP-OfficeJet_4105.xml
+share/foomatic/db/source/printer/HP-OfficeJet_4110.xml
+share/foomatic/db/source/printer/HP-OfficeJet_4115.xml
+share/foomatic/db/source/printer/HP-OfficeJet_4200.xml
+share/foomatic/db/source/printer/HP-OfficeJet_4300.xml
+share/foomatic/db/source/printer/HP-OfficeJet_500.xml
+share/foomatic/db/source/printer/HP-OfficeJet_5105.xml
+share/foomatic/db/source/printer/HP-OfficeJet_5110.xml
+share/foomatic/db/source/printer/HP-OfficeJet_5110xi.xml
+share/foomatic/db/source/printer/HP-OfficeJet_520.xml
+share/foomatic/db/source/printer/HP-OfficeJet_5500.xml
+share/foomatic/db/source/printer/HP-OfficeJet_5600.xml
+share/foomatic/db/source/printer/HP-OfficeJet_570.xml
+share/foomatic/db/source/printer/HP-OfficeJet_580.xml
+share/foomatic/db/source/printer/HP-OfficeJet_590.xml
+share/foomatic/db/source/printer/HP-OfficeJet_600.xml
+share/foomatic/db/source/printer/HP-OfficeJet_610.xml
+share/foomatic/db/source/printer/HP-OfficeJet_6100.xml
+share/foomatic/db/source/printer/HP-OfficeJet_6105.xml
+share/foomatic/db/source/printer/HP-OfficeJet_6110.xml
+share/foomatic/db/source/printer/HP-OfficeJet_6150.xml
+share/foomatic/db/source/printer/HP-OfficeJet_6200.xml
+share/foomatic/db/source/printer/HP-OfficeJet_625.xml
+share/foomatic/db/source/printer/HP-OfficeJet_630.xml
+share/foomatic/db/source/printer/HP-OfficeJet_6300.xml
+share/foomatic/db/source/printer/HP-OfficeJet_635.xml
+share/foomatic/db/source/printer/HP-OfficeJet_700.xml
+share/foomatic/db/source/printer/HP-OfficeJet_710.xml
+share/foomatic/db/source/printer/HP-OfficeJet_7100.xml
+share/foomatic/db/source/printer/HP-OfficeJet_7110.xml
+share/foomatic/db/source/printer/HP-OfficeJet_7130.xml
+share/foomatic/db/source/printer/HP-OfficeJet_7140.xml
+share/foomatic/db/source/printer/HP-OfficeJet_720.xml
+share/foomatic/db/source/printer/HP-OfficeJet_7200.xml
+share/foomatic/db/source/printer/HP-OfficeJet_725.xml
+share/foomatic/db/source/printer/HP-OfficeJet_7300.xml
+share/foomatic/db/source/printer/HP-OfficeJet_7400.xml
+share/foomatic/db/source/printer/HP-OfficeJet_D125.xml
+share/foomatic/db/source/printer/HP-OfficeJet_D135.xml
+share/foomatic/db/source/printer/HP-OfficeJet_D145.xml
+share/foomatic/db/source/printer/HP-OfficeJet_D155.xml
+share/foomatic/db/source/printer/HP-OfficeJet_G55.xml
+share/foomatic/db/source/printer/HP-OfficeJet_G85.xml
+share/foomatic/db/source/printer/HP-OfficeJet_G95.xml
+share/foomatic/db/source/printer/HP-OfficeJet_J3600.xml
+share/foomatic/db/source/printer/HP-OfficeJet_J5500.xml
+share/foomatic/db/source/printer/HP-OfficeJet_J5700.xml
+share/foomatic/db/source/printer/HP-OfficeJet_K60.xml
+share/foomatic/db/source/printer/HP-OfficeJet_K60xi.xml
+share/foomatic/db/source/printer/HP-OfficeJet_K80.xml
+share/foomatic/db/source/printer/HP-OfficeJet_K80xi.xml
+share/foomatic/db/source/printer/HP-OfficeJet_LX.xml
+share/foomatic/db/source/printer/HP-OfficeJet_Pro_1150C.xml
+share/foomatic/db/source/printer/HP-OfficeJet_Pro_1170C.xml
+share/foomatic/db/source/printer/HP-OfficeJet_Pro_1175C.xml
+share/foomatic/db/source/printer/HP-OfficeJet_Pro_K5300.xml
+share/foomatic/db/source/printer/HP-OfficeJet_Pro_K5400.xml
+share/foomatic/db/source/printer/HP-OfficeJet_Pro_K550.xml
+share/foomatic/db/source/printer/HP-OfficeJet_Pro_K850.xml
+share/foomatic/db/source/printer/HP-OfficeJet_Pro_L7300.xml
+share/foomatic/db/source/printer/HP-OfficeJet_Pro_L7500.xml
+share/foomatic/db/source/printer/HP-OfficeJet_Pro_L7600.xml
+share/foomatic/db/source/printer/HP-OfficeJet_Pro_L7700.xml
+share/foomatic/db/source/printer/HP-OfficeJet_R40.xml
+share/foomatic/db/source/printer/HP-OfficeJet_R45.xml
+share/foomatic/db/source/printer/HP-OfficeJet_R60.xml
+share/foomatic/db/source/printer/HP-OfficeJet_R65.xml
+share/foomatic/db/source/printer/HP-OfficeJet_R80.xml
+share/foomatic/db/source/printer/HP-OfficeJet_T45.xml
+share/foomatic/db/source/printer/HP-OfficeJet_T65.xml
+share/foomatic/db/source/printer/HP-OfficeJet_V40.xml
+share/foomatic/db/source/printer/HP-OfficeJet_V40xi.xml
+share/foomatic/db/source/printer/HP-Officejet_K7100.xml
+share/foomatic/db/source/printer/HP-PSC_1100.xml
+share/foomatic/db/source/printer/HP-PSC_1110.xml
+share/foomatic/db/source/printer/HP-PSC_1200.xml
+share/foomatic/db/source/printer/HP-PSC_1205.xml
+share/foomatic/db/source/printer/HP-PSC_1210.xml
+share/foomatic/db/source/printer/HP-PSC_1300.xml
+share/foomatic/db/source/printer/HP-PSC_1310.xml
+share/foomatic/db/source/printer/HP-PSC_1400.xml
+share/foomatic/db/source/printer/HP-PSC_1500.xml
+share/foomatic/db/source/printer/HP-PSC_1510.xml
+share/foomatic/db/source/printer/HP-PSC_1600.xml
+share/foomatic/db/source/printer/HP-PSC_2110.xml
+share/foomatic/db/source/printer/HP-PSC_2150.xml
+share/foomatic/db/source/printer/HP-PSC_2170.xml
+share/foomatic/db/source/printer/HP-PSC_2175.xml
+share/foomatic/db/source/printer/HP-PSC_2210.xml
+share/foomatic/db/source/printer/HP-PSC_2300.xml
+share/foomatic/db/source/printer/HP-PSC_2350.xml
+share/foomatic/db/source/printer/HP-PSC_2400.xml
+share/foomatic/db/source/printer/HP-PSC_2500.xml
+share/foomatic/db/source/printer/HP-PSC_370.xml
+share/foomatic/db/source/printer/HP-PSC_380.xml
+share/foomatic/db/source/printer/HP-PSC_500.xml
+share/foomatic/db/source/printer/HP-PSC_750.xml
+share/foomatic/db/source/printer/HP-PSC_750xi.xml
+share/foomatic/db/source/printer/HP-PSC_950.xml
+share/foomatic/db/source/printer/HP-PSC_950xi.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_140.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_240.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_2570.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_2600.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_2700.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_3100.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_320.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_3200.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_330.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_3300.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_370.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_380.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_420.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_470.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7150.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7260.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7268.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7345.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7350.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7400.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7550.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7660.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7760.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7800.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7960.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_8000.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_8100.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_8200.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_8400.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_8700.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_A310.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_A320.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_A430.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_A440.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_A510.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_A520.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_A610.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_A620.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_A710.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_A820.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_C3100.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_C4100.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_C4200.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_C5100.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_C5200.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_C6100.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_C6200.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_C7100.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_C7200.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_C8100.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_D5060.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_D5100.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_D5300.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_D6100.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_D7100.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_D7200.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_D7300.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_D7400.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_P100.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_P1000.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_P1100.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_P1115.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_P1215.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_P1218.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_P130.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_P1315.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_P230.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_Pro_B8300.xml
+share/foomatic/db/source/printer/HP-e-printer_e20.xml
 %%DATADIR%%/__init__.py
-%%DATADIR%%/align
+%%DATADIR%%/align.py
 %%DATADIR%%/base/__init__.py
 %%DATADIR%%/base/async.py
 %%DATADIR%%/base/async_qt.py
@@ -295,15 +864,13 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/base/slp.py
 %%DATADIR%%/base/status.py
 %%DATADIR%%/base/strings.py
+%%DATADIR%%/base/tui.py
 %%DATADIR%%/base/utils.py
-%%DATADIR%%/check
-%%DATADIR%%/clean
-%%DATADIR%%/colorcal
+%%DATADIR%%/check.py
+%%DATADIR%%/clean.py
+%%DATADIR%%/colorcal.py
 %%DATADIR%%/copier/__init__.py
 %%DATADIR%%/copier/copier.py
-%%DATADIR%%/data/firmware/HP_LaserJet_1018.fw.gz
-%%DATADIR%%/data/firmware/HP_LaserJet_1020.fw.gz
-%%DATADIR%%/data/hplip.desktop
 %%DATADIR%%/data/images/120.png
 %%DATADIR%%/data/images/COLOR_INKJET_PRINTER_CP1700.png
 %%DATADIR%%/data/images/CP_1700.png
@@ -458,7 +1025,6 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/data/images/h-kc-3.png
 %%DATADIR%%/data/images/help.png
 %%DATADIR%%/data/images/hp-tux-printer.png
-%%DATADIR%%/data/images/hp-tux-printer.ppm
 %%DATADIR%%/data/images/hp_LaserJet_1200.png
 %%DATADIR%%/data/images/hp_LaserJet_2100.png
 %%DATADIR%%/data/images/hp_LaserJet_3015.png
@@ -519,7 +1085,6 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/data/images/ok.png
 %%DATADIR%%/data/images/ok_small.png
 %%DATADIR%%/data/images/opensource-75x65.png
-%%DATADIR%%/data/images/panel_lcd.xpm
 %%DATADIR%%/data/images/paper.png
 %%DATADIR%%/data/images/paper_small.png
 %%DATADIR%%/data/images/pcard_icon.png
@@ -528,6 +1093,7 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/data/images/photosmart_7150.png
 %%DATADIR%%/data/images/photosmart_7900_series.png
 %%DATADIR%%/data/images/photosmart_a610.png
+%%DATADIR%%/data/images/photosmart_a820_series.png
 %%DATADIR%%/data/images/png.png
 %%DATADIR%%/data/images/powered_by_python.png
 %%DATADIR%%/data/images/prev.png
@@ -571,6 +1137,13 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/data/ldl/cbccal_done.ldl.gz
 %%DATADIR%%/data/ldl/cbcpcal.ldl.gz
 %%DATADIR%%/data/ldl/cbpcal.ldl.gz
+%%DATADIR%%/data/localization/hplip_de.qm
+%%DATADIR%%/data/localization/hplip_es.qm
+%%DATADIR%%/data/localization/hplip_fr.qm
+%%DATADIR%%/data/localization/hplip_it.qm
+%%DATADIR%%/data/localization/hplip_pt.qm
+%%DATADIR%%/data/localization/hplip_ru.qm
+%%DATADIR%%/data/localization/hplip_zh.qm
 %%DATADIR%%/data/models/models.dat
 %%DATADIR%%/data/pcl/align1_8xx.pcl.gz
 %%DATADIR%%/data/pcl/align1_9xx.pcl.gz
@@ -592,25 +1165,23 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/data/pcl/crpcal.pcl.gz
 %%DATADIR%%/data/ps/clean_page.pdf.gz
 %%DATADIR%%/data/ps/testpage.ps.gz
-%%DATADIR%%/fab
+%%DATADIR%%/fab.py
 %%DATADIR%%/fax/__init__.py
-%%DATADIR%%/fax/backend/hpfax
 %%DATADIR%%/fax/coverpages.py
 %%DATADIR%%/fax/fax.py
-%%DATADIR%%/fax/ppd/HP-Fax-hplip.ppd
-%%DATADIR%%/firmware
+%%DATADIR%%/firmware.py
 %%DATADIR%%/hpaio.desc
 %%DATADIR%%/hplip-install
-%%DATADIR%%/hplip.sh
 %%DATADIR%%/hpssd.py
-%%DATADIR%%/info
+%%DATADIR%%/info.py
 %%DATADIR%%/install.py
 %%DATADIR%%/installer/__init__.py
+%%DATADIR%%/installer/core_install.py
 %%DATADIR%%/installer/dcheck.py
-%%DATADIR%%/installer/distros.py
-%%DATADIR%%/levels
-%%DATADIR%%/makecopies
-%%DATADIR%%/makeuri
+%%DATADIR%%/installer/distros.dat
+%%DATADIR%%/levels.py
+%%DATADIR%%/makecopies.py
+%%DATADIR%%/makeuri.py
 %%DATADIR%%/pcard/__init__.py
 %%DATADIR%%/pcard/photocard.py
 %%DATADIR%%/plugins/Deskjet_460.py
@@ -619,20 +1190,22 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/plugins/powersettings.py
 %%DATADIR%%/plugins/powersettingsdialog.py
 %%DATADIR%%/plugins/powersettingsdialog_base.py
-%%DATADIR%%/print
+%%DATADIR%%/print.py
 %%DATADIR%%/prnt/__init__.py
 %%DATADIR%%/prnt/colorcal.py
 %%DATADIR%%/prnt/cups.py
 %%DATADIR%%/prnt/ldl.py
 %%DATADIR%%/prnt/pcl.py
 %%DATADIR%%/prnt/printable_areas.py
-%%DATADIR%%/probe
+%%DATADIR%%/probe.py
+%%DATADIR%%/scan.py
 %%DATADIR%%/scan/__init__.py
-%%DATADIR%%/sendfax
-%%DATADIR%%/setup
-%%DATADIR%%/testpage
-%%DATADIR%%/timedate
-%%DATADIR%%/toolbox
+%%DATADIR%%/scan/sane.py
+%%DATADIR%%/sendfax.py
+%%DATADIR%%/setup.py
+%%DATADIR%%/testpage.py
+%%DATADIR%%/timedate.py
+%%DATADIR%%/toolbox.py
 %%DATADIR%%/ui/__init__.py
 %%DATADIR%%/ui/aboutdlg.py
 %%DATADIR%%/ui/aboutdlg_base.py
@@ -681,6 +1254,8 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/ui/nodevicesform_base.py
 %%DATADIR%%/ui/paperedgealignform.py
 %%DATADIR%%/ui/paperedgealignform_base.py
+%%DATADIR%%/ui/pluginform.py
+%%DATADIR%%/ui/pluginform_base.py
 %%DATADIR%%/ui/printerform.py
 %%DATADIR%%/ui/scrollcopy.py
 %%DATADIR%%/ui/scrollfax.py
@@ -704,10 +1279,12 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/ui/unloadform.py
 %%DATADIR%%/ui/waitform.py
 %%DATADIR%%/ui/waitform_base.py
-%%DATADIR%%/unload
+%%DATADIR%%/unload.py
 share/ppd/HP/HP-2000C-hpijs.ppd.gz
 share/ppd/HP/HP-2500C-hpijs.ppd.gz
 share/ppd/HP/HP-2500CM-hpijs.ppd.gz
+share/ppd/HP/HP-910-hpijs.ppd.gz
+share/ppd/HP/HP-915-hpijs.ppd.gz
 share/ppd/HP/HP-Business_Inkjet_1000-hpijs.ppd.gz
 share/ppd/HP/HP-Business_Inkjet_1100-hpijs.ppd.gz
 share/ppd/HP/HP-Business_Inkjet_1200-hpijs.ppd.gz
@@ -745,6 +1322,8 @@ share/ppd/HP/HP-Color_LaserJet_8500-hpijs.ppd.gz
 share/ppd/HP/HP-Color_LaserJet_8550GN-hpijs.ppd.gz
 share/ppd/HP/HP-Color_LaserJet_9500-hpijs.ppd.gz
 share/ppd/HP/HP-Color_LaserJet_9500_MFP-hpijs.ppd.gz
+share/ppd/HP/HP-Color_LaserJet_CM4730_MFP-hpijs.ppd.gz
+share/ppd/HP/HP-Color_LaserJet_CP3505-hpijs.ppd.gz
 share/ppd/HP/HP-Color_LaserJet_CP4005-hpijs.ppd.gz
 share/ppd/HP/HP-DesignJet_ColorPro_CAD-hpijs.ppd.gz
 share/ppd/HP/HP-DeskJet_1100C-hpijs.ppd.gz
@@ -790,8 +1369,10 @@ share/ppd/HP/HP-DeskJet_5160-hpijs.ppd.gz
 share/ppd/HP/HP-DeskJet_520-hpijs.ppd.gz
 share/ppd/HP/HP-DeskJet_540C-hpijs.ppd.gz
 share/ppd/HP/HP-DeskJet_5440-hpijs.ppd.gz
+share/ppd/HP/HP-DeskJet_550C-hpijs.ppd.gz
 share/ppd/HP/HP-DeskJet_5550-hpijs.ppd.gz
 share/ppd/HP/HP-DeskJet_5551-hpijs.ppd.gz
+share/ppd/HP/HP-DeskJet_560C-hpijs.ppd.gz
 share/ppd/HP/HP-DeskJet_5650-hpijs.ppd.gz
 share/ppd/HP/HP-DeskJet_5652-hpijs.ppd.gz
 share/ppd/HP/HP-DeskJet_5670-hpijs.ppd.gz
@@ -879,6 +1460,7 @@ share/ppd/HP/HP-DeskJet_D4200-hpijs.ppd.gz
 share/ppd/HP/HP-DeskJet_F2100-hpijs.ppd.gz
 share/ppd/HP/HP-DeskJet_F300-hpijs.ppd.gz
 share/ppd/HP/HP-DeskJet_F4100-hpijs.ppd.gz
+share/ppd/HP/HP-Fax-hplip.ppd.gz
 share/ppd/HP/HP-LaserJet_1010-hpijs.ppd.gz
 share/ppd/HP/HP-LaserJet_1012-hpijs.ppd.gz
 share/ppd/HP/HP-LaserJet_1015-hpijs.ppd.gz
@@ -963,6 +1545,7 @@ share/ppd/HP/HP-LaserJet_M3035_MFP-hpijs.ppd.gz
 share/ppd/HP/HP-LaserJet_M4345_MFP-hpijs.ppd.gz
 share/ppd/HP/HP-LaserJet_M5025_MFP-hpijs.ppd.gz
 share/ppd/HP/HP-LaserJet_M5035_MFP-hpijs.ppd.gz
+share/ppd/HP/HP-LaserJet_P2010-hpijs.ppd.gz
 share/ppd/HP/HP-LaserJet_P2015-hpijs.ppd.gz
 share/ppd/HP/HP-LaserJet_P3004-hpijs.ppd.gz
 share/ppd/HP/HP-LaserJet_P3005-hpijs.ppd.gz
@@ -1017,6 +1600,8 @@ share/ppd/HP/HP-OfficeJet_D155-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_G55-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_G85-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_G95-hpijs.ppd.gz
+share/ppd/HP/HP-OfficeJet_J3600-hpijs.ppd.gz
+share/ppd/HP/HP-OfficeJet_J5500-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_J5700-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_K60-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_K60xi-hpijs.ppd.gz
@@ -1043,6 +1628,7 @@ share/ppd/HP/HP-OfficeJet_T45-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_T65-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_V40-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_V40xi-hpijs.ppd.gz
+share/ppd/HP/HP-Officejet_K7100-hpijs.ppd.gz
 share/ppd/HP/HP-PSC_1100-hpijs.ppd.gz
 share/ppd/HP/HP-PSC_1110-hpijs.ppd.gz
 share/ppd/HP/HP-PSC_1200-hpijs.ppd.gz
@@ -1101,20 +1687,33 @@ share/ppd/HP/HP-PhotoSmart_8200-hpijs.ppd.gz
 share/ppd/HP/HP-PhotoSmart_8400-hpijs.ppd.gz
 share/ppd/HP/HP-PhotoSmart_8700-hpijs.ppd.gz
 share/ppd/HP/HP-PhotoSmart_A310-hpijs.ppd.gz
+share/ppd/HP/HP-PhotoSmart_A320-hpijs.ppd.gz
 share/ppd/HP/HP-PhotoSmart_A430-hpijs.ppd.gz
+share/ppd/HP/HP-PhotoSmart_A440-hpijs.ppd.gz
 share/ppd/HP/HP-PhotoSmart_A510-hpijs.ppd.gz
+share/ppd/HP/HP-PhotoSmart_A520-hpijs.ppd.gz
 share/ppd/HP/HP-PhotoSmart_A610-hpijs.ppd.gz
+share/ppd/HP/HP-PhotoSmart_A620-hpijs.ppd.gz
 share/ppd/HP/HP-PhotoSmart_A710-hpijs.ppd.gz
+share/ppd/HP/HP-PhotoSmart_A820-hpijs.ppd.gz
 share/ppd/HP/HP-PhotoSmart_C3100-hpijs.ppd.gz
 share/ppd/HP/HP-PhotoSmart_C4100-hpijs.ppd.gz
+share/ppd/HP/HP-PhotoSmart_C4200-hpijs.ppd.gz
 share/ppd/HP/HP-PhotoSmart_C5100-hpijs.ppd.gz
+share/ppd/HP/HP-PhotoSmart_C5200-hpijs.ppd.gz
 share/ppd/HP/HP-PhotoSmart_C6100-hpijs.ppd.gz
+share/ppd/HP/HP-PhotoSmart_C6200-hpijs.ppd.gz
 share/ppd/HP/HP-PhotoSmart_C7100-hpijs.ppd.gz
+share/ppd/HP/HP-PhotoSmart_C7200-hpijs.ppd.gz
+share/ppd/HP/HP-PhotoSmart_C8100-hpijs.ppd.gz
 share/ppd/HP/HP-PhotoSmart_D5060-hpijs.ppd.gz
 share/ppd/HP/HP-PhotoSmart_D5100-hpijs.ppd.gz
+share/ppd/HP/HP-PhotoSmart_D5300-hpijs.ppd.gz
 share/ppd/HP/HP-PhotoSmart_D6100-hpijs.ppd.gz
 share/ppd/HP/HP-PhotoSmart_D7100-hpijs.ppd.gz
+share/ppd/HP/HP-PhotoSmart_D7200-hpijs.ppd.gz
 share/ppd/HP/HP-PhotoSmart_D7300-hpijs.ppd.gz
+share/ppd/HP/HP-PhotoSmart_D7400-hpijs.ppd.gz
 share/ppd/HP/HP-PhotoSmart_P100-hpijs.ppd.gz
 share/ppd/HP/HP-PhotoSmart_P1000-hpijs.ppd.gz
 share/ppd/HP/HP-PhotoSmart_P1100-hpijs.ppd.gz
@@ -1131,7 +1730,6 @@ share/ppd/HP/HP_Business_Inkjet_2280.ppd.gz
 share/ppd/HP/HP_Business_Inkjet_2600.ppd.gz
 share/ppd/HP/HP_Business_Inkjet_2800.ppd.gz
 share/ppd/HP/HP_Business_Inkjet_3000.ppd.gz
-share/ppd/HP/HP_CM8050_CM8060_MFP.ppd.gz
 share/ppd/HP/HP_Color_LaserJet.ppd.gz
 share/ppd/HP/HP_Color_LaserJet_2550.ppd.gz
 share/ppd/HP/HP_Color_LaserJet_2605.ppd.gz
@@ -1148,6 +1746,8 @@ share/ppd/HP/HP_Color_LaserJet_5M.ppd.gz
 share/ppd/HP/HP_Color_LaserJet_8500.ppd.gz
 share/ppd/HP/HP_Color_LaserJet_8550.ppd.gz
 share/ppd/HP/HP_Color_LaserJet_CM1015.ppd.gz
+share/ppd/HP/HP_Color_LaserJet_CM4730_MFP.ppd.gz
+share/ppd/HP/HP_Color_LaserJet_CP3505.ppd.gz
 share/ppd/HP/HP_Color_LaserJet_CP4005.ppd.gz
 share/ppd/HP/HP_LaserJet_1200.ppd.gz
 share/ppd/HP/HP_LaserJet_1220.ppd.gz
@@ -1204,7 +1804,6 @@ share/ppd/HP/HP_LaserJet_P3004.ppd.gz
 share/ppd/HP/HP_LaserJet_P3005.ppd.gz
 share/ppd/HP/HP_Mopier_240.ppd.gz
 share/ppd/HP/HP_Mopier_320.ppd.gz
-share/ppd/HP/fax/HP-Fax-hplip.ppd.gz
 share/ppd/HP/hp_LaserJet_1300_series.ppd.gz
 share/ppd/HP/hp_LaserJet_2300.ppd.gz
 share/ppd/HP/hp_LaserJet_3015.ppd.gz
@@ -1222,7 +1821,6 @@ share/ppd/HP/hp_color_LaserJet_5500.ppd.gz
 share/ppd/HP/hp_color_LaserJet_9500.ppd.gz
 share/ppd/HP/hp_color_LaserJet_9500_MFP.ppd.gz
 share/ppd/HP/hp_officejet_9100_series.ppd.gz
-@dirrm share/ppd/HP/fax
 @dirrm share/ppd/HP
 @dirrm share/ppd
 @unexec rm -f %D/%%DATADIR%%/*/*.pyc 2>/dev/null || true
@@ -1232,20 +1830,25 @@ share/ppd/HP/hp_officejet_9100_series.ppd.gz
 @dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/pcard
 @dirrm %%DATADIR%%/installer
-@dirrm %%DATADIR%%/fax/ppd
-@dirrm %%DATADIR%%/fax/backend
 @dirrm %%DATADIR%%/fax
 @dirrm %%DATADIR%%/data/ps
 @dirrm %%DATADIR%%/data/pcl
 @dirrm %%DATADIR%%/data/models
+@dirrm %%DATADIR%%/data/localization
 @dirrm %%DATADIR%%/data/ldl
 @dirrm %%DATADIR%%/data/images
-@dirrm %%DATADIR%%/data/firmware
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%/copier
 @dirrm %%DATADIR%%/base
 @dirrm %%DATADIR%%
-@dirrmtry share/gnome
+@dirrm share/foomatic/db/source/printer
+@dirrm share/foomatic/db/source/opt
+@dirrm share/foomatic/db/source/driver
+@dirrm share/foomatic/db/source/PPD/HP
+@dirrm share/foomatic/db/source/PPD
+@dirrm share/foomatic/db/source
+@dirrm share/foomatic/db
+@dirrm share/foomatic
 %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/troubleshooting
 %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages
 %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/tech_docs
@@ -1265,6 +1868,6 @@ share/ppd/HP/hp_officejet_9100_series.ppd.gz
 %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/howtos
 %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%
-%%PORTDOCS%%@dirrm share/doc/hpijs-%%IJSVER%%
 @dirrmtry share/applications
+@dirrmtry share/gnome
 @dirrmtry etc/hp