hplip 3.12.4-1

(cherry picked from commit d935305e163c2820a5ba28e57f9e987753af98f6)

5 files changed, 111 insertions, 29 deletions

diff --git a/hplip/.footprint.i686 b/hplip/.footprint.i686
index 21429132c..17c8a631d 100644
--- a/hplip/.footprint.i686
+++ b/hplip/.footprint.i686
@@ -4,7 +4,9 @@ drwxr-xr-x	root/root	etc/hp/
 drwxr-xr-x	root/root	etc/udev/
 drwxr-xr-x	root/root	etc/udev/rules.d/
 -rw-r--r--	root/root	etc/udev/rules.d/55-hpmud.rules
+-rw-r--r--	root/root	etc/udev/rules.d/56-hpmud_add_printer.rules
 -rw-r--r--	root/root	etc/udev/rules.d/56-hpmud_support.rules
+-rw-r--r--	root/root	etc/udev/rules.d/86-hpmud_plugin.rules
 drwxr-xr-x	root/root	etc/xdg/
 drwxr-xr-x	root/root	etc/xdg/autostart/
 -rw-r--r--	root/root	etc/xdg/autostart/hplip-systray.desktop
@@ -12,9 +14,13 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 lrwxrwxrwx	root/root	usr/bin/hp-align -> ../share/hplip/align.py
 lrwxrwxrwx	root/root	usr/bin/hp-check -> ../share/hplip/check.py
+lrwxrwxrwx	root/root	usr/bin/hp-check-plugin -> ../share/hplip/check-plugin.py
 lrwxrwxrwx	root/root	usr/bin/hp-clean -> ../share/hplip/clean.py
 lrwxrwxrwx	root/root	usr/bin/hp-colorcal -> ../share/hplip/colorcal.py
+lrwxrwxrwx	root/root	usr/bin/hp-config_usb_printer -> ../share/hplip/config_usb_printer.py
 lrwxrwxrwx	root/root	usr/bin/hp-devicesettings -> ../share/hplip/devicesettings.py
+lrwxrwxrwx	root/root	usr/bin/hp-diagnose_plugin -> ../share/hplip/diagnose_plugin.py
+lrwxrwxrwx	root/root	usr/bin/hp-diagnose_queues -> ../share/hplip/diagnose_queues.py
 lrwxrwxrwx	root/root	usr/bin/hp-fab -> ../share/hplip/fab.py
 lrwxrwxrwx	root/root	usr/bin/hp-faxsetup -> ../share/hplip/faxsetup.py
 lrwxrwxrwx	root/root	usr/bin/hp-firmware -> ../share/hplip/firmware.py
@@ -38,7 +44,9 @@ lrwxrwxrwx	root/root	usr/bin/hp-systray -> ../share/hplip/systray.py
 lrwxrwxrwx	root/root	usr/bin/hp-testpage -> ../share/hplip/testpage.py
 lrwxrwxrwx	root/root	usr/bin/hp-timedate -> ../share/hplip/timedate.py
 lrwxrwxrwx	root/root	usr/bin/hp-toolbox -> ../share/hplip/toolbox.py
+lrwxrwxrwx	root/root	usr/bin/hp-uninstall -> ../share/hplip/uninstall.py
 lrwxrwxrwx	root/root	usr/bin/hp-unload -> ../share/hplip/unload.py
+lrwxrwxrwx	root/root	usr/bin/hp-upgrade -> ../share/hplip/upgrade.py
 lrwxrwxrwx	root/root	usr/bin/hp-wificonfig -> ../share/hplip/wificonfig.py
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/cups/
@@ -263,6 +271,8 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm6049_mfp.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp1215-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp1215.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp1217-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp1217.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp1514n-hpijs-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp1514n-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp1514n-ps.ppd.gz
@@ -371,6 +381,8 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_3050_j610_series.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_3050a_j611_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_3050a_j611_series.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_3070_b611_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_3070_b611_series.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_3320-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_3320.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_3325-hpijs.ppd.gz
@@ -665,6 +677,8 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-dj450.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-envy_100_d410_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-envy_100_d410_series.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-envy_110_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-envy_110_series.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1000-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1000.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1005_series-hpijs.ppd.gz
@@ -740,6 +754,7 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1320tn-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1320tn-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1320tn.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_200_colormfp_m275-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2100-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2100-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2100.ppd.gz
@@ -864,6 +879,7 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5000_series-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5000_series-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_500_color_m551-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5100_series-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5100_series-ps.ppd.gz
@@ -890,6 +906,7 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5si_mopier-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5si_mopier-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_600_m601_m602_m603-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_6l-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_6l.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_6mp-hpijs-pcl3.ppd.gz
@@ -956,21 +973,15 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cm1417fnw-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cm1418fnw-pcl3.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1021-hpijs.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1021.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1022-hpijs.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1022.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1023-hpijs.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1023.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1025-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1025.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1025nw-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1025nw.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1027nw-hpijs.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1027nw.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1028nw-hpijs.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1028nw.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1520_series-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp_1025-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp_1025.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp_1025nw-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp_1025nw.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m1005-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m1005.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m1120_mfp-hpijs.ppd.gz
@@ -1134,12 +1145,18 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1102.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1102w-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1102w.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1106-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1106.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1108-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1108.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1566-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1566.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1606dn-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1606dn.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p_1102w-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p_1102w.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-lj_300_400_color_m351_m451-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-mopier_240-hpijs-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-mopier_240-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-mopier_240-ps.ppd.gz
@@ -1190,6 +1207,8 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6000_e609a.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6000_e609n-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6000_e609n.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6100-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6100.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6100_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6100_series.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6150_series-hpijs.ppd.gz
@@ -1206,6 +1225,10 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6500_e710a-f.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6500_e710n-z-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6500_e710n-z.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6600-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6600.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6700-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6700.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_7000_e809a-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_7000_e809a.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_7000_e809a_series-hpijs.ppd.gz
@@ -1271,6 +1294,8 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8000_a809-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8000_a809.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8100-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8100.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8500_a909a-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8500_a909a.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8500_a909g-hpijs.ppd.gz
@@ -1279,6 +1304,8 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8500_a909n.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8500_a910-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8500_a910.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8600-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8600.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_k5300-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_k5300.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_k5400-hpijs.ppd.gz
@@ -1323,8 +1350,6 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_series_330.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_series_350-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_series_350.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_series_500-hpijs.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_series_500.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_series_520-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_series_520.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_series_570-hpijs.ppd.gz
@@ -1399,6 +1424,12 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_420_series.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_470_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_470_series.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_5510_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_5510_series.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_5510d_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_5510d_series.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_6510_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_6510_series.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7150-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7150.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7200_series-hpijs.ppd.gz
@@ -1409,6 +1440,8 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7350.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7400_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7400_series.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7510_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7510_series.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7550-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7550.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7600_series-hpijs.ppd.gz
@@ -1652,9 +1685,11 @@ drwxr-xr-x	root/root	usr/share/hplip/base/
 -rw-r--r--	root/root	usr/share/hplip/base/utils.py
 -rw-r--r--	root/root	usr/share/hplip/base/vcard.py
 -rw-r--r--	root/root	usr/share/hplip/base/wifi.py
+-rwxr-xr-x	root/root	usr/share/hplip/check-plugin.py
 -rwxr-xr-x	root/root	usr/share/hplip/check.py
 -rwxr-xr-x	root/root	usr/share/hplip/clean.py
 -rwxr-xr-x	root/root	usr/share/hplip/colorcal.py
+-rwxr-xr-x	root/root	usr/share/hplip/config_usb_printer.py
 drwxr-xr-x	root/root	usr/share/hplip/copier/
 -rw-r--r--	root/root	usr/share/hplip/copier/__init__.py
 -rw-r--r--	root/root	usr/share/hplip/copier/copier.py
@@ -1836,6 +1871,7 @@ drwxr-xr-x	root/root	usr/share/hplip/data/images/devices/
 -rw-r--r--	root/root	usr/share/hplip/data/images/devices/OFFICEJET_PRO_1150C.png
 -rw-r--r--	root/root	usr/share/hplip/data/images/devices/OfficeJet_5105.png
 -rw-r--r--	root/root	usr/share/hplip/data/images/devices/OfficeJet_6100_Series.png
+-rw-r--r--	root/root	usr/share/hplip/data/images/devices/OfficeJet_8500_a910.png
 -rw-r--r--	root/root	usr/share/hplip/data/images/devices/OfficeJet_G85.png
 -rw-r--r--	root/root	usr/share/hplip/data/images/devices/OfficeJet_Series_300.png
 -rw-r--r--	root/root	usr/share/hplip/data/images/devices/Officejet_6150_Series.png
@@ -2024,6 +2060,8 @@ drwxr-xr-x	root/root	usr/share/hplip/data/ps/
 -rw-r--r--	root/root	usr/share/hplip/data/ps/clean_page.pdf.gz
 -rw-r--r--	root/root	usr/share/hplip/data/ps/testpage.ps.gz
 -rwxr-xr-x	root/root	usr/share/hplip/devicesettings.py
+-rwxr-xr-x	root/root	usr/share/hplip/diagnose_plugin.py
+-rwxr-xr-x	root/root	usr/share/hplip/diagnose_queues.py
 -rwxr-xr-x	root/root	usr/share/hplip/fab.py
 -rwxr-xr-x	root/root	usr/share/hplip/faxsetup.py
 -rwxr-xr-x	root/root	usr/share/hplip/firmware.py
@@ -2065,9 +2103,12 @@ drwxr-xr-x	root/root	usr/share/hplip/scan/
 -rwxr-xr-x	root/root	usr/share/hplip/testpage.py
 -rwxr-xr-x	root/root	usr/share/hplip/timedate.py
 -rwxr-xr-x	root/root	usr/share/hplip/toolbox.py
+-rwxr-xr-x	root/root	usr/share/hplip/uninstall.py
 -rwxr-xr-x	root/root	usr/share/hplip/unload.py
+-rwxr-xr-x	root/root	usr/share/hplip/upgrade.py
 -rwxr-xr-x	root/root	usr/share/hplip/wificonfig.py
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/lib/
 drwxr-xr-x	root/root	var/lib/hp/
--rw-r--r--	root/root	var/lib/hp/hplip.state
+drwxr-xr-x	root/root	var/log/
+drwxrwxr--	root/lp	var/log/hp/
diff --git a/hplip/.footprint.x86_64 b/hplip/.footprint.x86_64
index 21429132c..17c8a631d 100644
--- a/hplip/.footprint.x86_64
+++ b/hplip/.footprint.x86_64
@@ -4,7 +4,9 @@ drwxr-xr-x	root/root	etc/hp/
 drwxr-xr-x	root/root	etc/udev/
 drwxr-xr-x	root/root	etc/udev/rules.d/
 -rw-r--r--	root/root	etc/udev/rules.d/55-hpmud.rules
+-rw-r--r--	root/root	etc/udev/rules.d/56-hpmud_add_printer.rules
 -rw-r--r--	root/root	etc/udev/rules.d/56-hpmud_support.rules
+-rw-r--r--	root/root	etc/udev/rules.d/86-hpmud_plugin.rules
 drwxr-xr-x	root/root	etc/xdg/
 drwxr-xr-x	root/root	etc/xdg/autostart/
 -rw-r--r--	root/root	etc/xdg/autostart/hplip-systray.desktop
@@ -12,9 +14,13 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 lrwxrwxrwx	root/root	usr/bin/hp-align -> ../share/hplip/align.py
 lrwxrwxrwx	root/root	usr/bin/hp-check -> ../share/hplip/check.py
+lrwxrwxrwx	root/root	usr/bin/hp-check-plugin -> ../share/hplip/check-plugin.py
 lrwxrwxrwx	root/root	usr/bin/hp-clean -> ../share/hplip/clean.py
 lrwxrwxrwx	root/root	usr/bin/hp-colorcal -> ../share/hplip/colorcal.py
+lrwxrwxrwx	root/root	usr/bin/hp-config_usb_printer -> ../share/hplip/config_usb_printer.py
 lrwxrwxrwx	root/root	usr/bin/hp-devicesettings -> ../share/hplip/devicesettings.py
+lrwxrwxrwx	root/root	usr/bin/hp-diagnose_plugin -> ../share/hplip/diagnose_plugin.py
+lrwxrwxrwx	root/root	usr/bin/hp-diagnose_queues -> ../share/hplip/diagnose_queues.py
 lrwxrwxrwx	root/root	usr/bin/hp-fab -> ../share/hplip/fab.py
 lrwxrwxrwx	root/root	usr/bin/hp-faxsetup -> ../share/hplip/faxsetup.py
 lrwxrwxrwx	root/root	usr/bin/hp-firmware -> ../share/hplip/firmware.py
@@ -38,7 +44,9 @@ lrwxrwxrwx	root/root	usr/bin/hp-systray -> ../share/hplip/systray.py
 lrwxrwxrwx	root/root	usr/bin/hp-testpage -> ../share/hplip/testpage.py
 lrwxrwxrwx	root/root	usr/bin/hp-timedate -> ../share/hplip/timedate.py
 lrwxrwxrwx	root/root	usr/bin/hp-toolbox -> ../share/hplip/toolbox.py
+lrwxrwxrwx	root/root	usr/bin/hp-uninstall -> ../share/hplip/uninstall.py
 lrwxrwxrwx	root/root	usr/bin/hp-unload -> ../share/hplip/unload.py
+lrwxrwxrwx	root/root	usr/bin/hp-upgrade -> ../share/hplip/upgrade.py
 lrwxrwxrwx	root/root	usr/bin/hp-wificonfig -> ../share/hplip/wificonfig.py
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/cups/
@@ -263,6 +271,8 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cm6049_mfp.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp1215-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp1215.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp1217-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp1217.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp1514n-hpijs-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp1514n-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-color_laserjet_cp1514n-ps.ppd.gz
@@ -371,6 +381,8 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_3050_j610_series.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_3050a_j611_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_3050a_j611_series.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_3070_b611_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_3070_b611_series.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_3320-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_3320.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-deskjet_3325-hpijs.ppd.gz
@@ -665,6 +677,8 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-dj450.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-envy_100_d410_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-envy_100_d410_series.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-envy_110_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-envy_110_series.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1000-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1000.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1005_series-hpijs.ppd.gz
@@ -740,6 +754,7 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1320tn-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1320tn-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_1320tn.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_200_colormfp_m275-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2100-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2100-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_2100.ppd.gz
@@ -864,6 +879,7 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5000_series-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5000_series-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_500_color_m551-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5100_series-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5100_series-ps.ppd.gz
@@ -890,6 +906,7 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5si_mopier-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_5si_mopier-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_600_m601_m602_m603-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_6l-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_6l.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_6mp-hpijs-pcl3.ppd.gz
@@ -956,21 +973,15 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cm1417fnw-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cm1418fnw-pcl3.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1021-hpijs.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1021.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1022-hpijs.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1022.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1023-hpijs.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1023.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1025-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1025.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1025nw-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1025nw.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1027nw-hpijs.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1027nw.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1028nw-hpijs.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1028nw.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp1520_series-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp_1025-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp_1025.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp_1025nw-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_cp_1025nw.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m1005-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m1005.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_m1120_mfp-hpijs.ppd.gz
@@ -1134,12 +1145,18 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1102.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1102w-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1102w.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1106-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1106.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1108-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1108.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1566-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1566.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1606dn-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p1606dn.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p_1102w-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-laserjet_professional_p_1102w.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-lj_300_400_color_m351_m451-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-mopier_240-hpijs-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-mopier_240-pcl3.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-mopier_240-ps.ppd.gz
@@ -1190,6 +1207,8 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6000_e609a.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6000_e609n-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6000_e609n.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6100-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6100.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6100_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6100_series.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6150_series-hpijs.ppd.gz
@@ -1206,6 +1225,10 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6500_e710a-f.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6500_e710n-z-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6500_e710n-z.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6600-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6600.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6700-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_6700.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_7000_e809a-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_7000_e809a.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_7000_e809a_series-hpijs.ppd.gz
@@ -1271,6 +1294,8 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8000_a809-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8000_a809.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8100-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8100.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8500_a909a-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8500_a909a.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8500_a909g-hpijs.ppd.gz
@@ -1279,6 +1304,8 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8500_a909n.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8500_a910-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8500_a910.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8600-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_8600.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_k5300-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_k5300.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_pro_k5400-hpijs.ppd.gz
@@ -1323,8 +1350,6 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_series_330.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_series_350-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_series_350.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_series_500-hpijs.ppd.gz
--rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_series_500.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_series_520-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_series_520.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-officejet_series_570-hpijs.ppd.gz
@@ -1399,6 +1424,12 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_420_series.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_470_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_470_series.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_5510_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_5510_series.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_5510d_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_5510d_series.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_6510_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_6510_series.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7150-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7150.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7200_series-hpijs.ppd.gz
@@ -1409,6 +1440,8 @@ drwxr-xr-x	root/root	usr/share/cups/model/HP/
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7350.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7400_series-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7400_series.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7510_series-hpijs.ppd.gz
+-rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7510_series.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7550-hpijs.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7550.ppd.gz
 -rw-r--r--	root/root	usr/share/cups/model/HP/hp-photosmart_7600_series-hpijs.ppd.gz
@@ -1652,9 +1685,11 @@ drwxr-xr-x	root/root	usr/share/hplip/base/
 -rw-r--r--	root/root	usr/share/hplip/base/utils.py
 -rw-r--r--	root/root	usr/share/hplip/base/vcard.py
 -rw-r--r--	root/root	usr/share/hplip/base/wifi.py
+-rwxr-xr-x	root/root	usr/share/hplip/check-plugin.py
 -rwxr-xr-x	root/root	usr/share/hplip/check.py
 -rwxr-xr-x	root/root	usr/share/hplip/clean.py
 -rwxr-xr-x	root/root	usr/share/hplip/colorcal.py
+-rwxr-xr-x	root/root	usr/share/hplip/config_usb_printer.py
 drwxr-xr-x	root/root	usr/share/hplip/copier/
 -rw-r--r--	root/root	usr/share/hplip/copier/__init__.py
 -rw-r--r--	root/root	usr/share/hplip/copier/copier.py
@@ -1836,6 +1871,7 @@ drwxr-xr-x	root/root	usr/share/hplip/data/images/devices/
 -rw-r--r--	root/root	usr/share/hplip/data/images/devices/OFFICEJET_PRO_1150C.png
 -rw-r--r--	root/root	usr/share/hplip/data/images/devices/OfficeJet_5105.png
 -rw-r--r--	root/root	usr/share/hplip/data/images/devices/OfficeJet_6100_Series.png
+-rw-r--r--	root/root	usr/share/hplip/data/images/devices/OfficeJet_8500_a910.png
 -rw-r--r--	root/root	usr/share/hplip/data/images/devices/OfficeJet_G85.png
 -rw-r--r--	root/root	usr/share/hplip/data/images/devices/OfficeJet_Series_300.png
 -rw-r--r--	root/root	usr/share/hplip/data/images/devices/Officejet_6150_Series.png
@@ -2024,6 +2060,8 @@ drwxr-xr-x	root/root	usr/share/hplip/data/ps/
 -rw-r--r--	root/root	usr/share/hplip/data/ps/clean_page.pdf.gz
 -rw-r--r--	root/root	usr/share/hplip/data/ps/testpage.ps.gz
 -rwxr-xr-x	root/root	usr/share/hplip/devicesettings.py
+-rwxr-xr-x	root/root	usr/share/hplip/diagnose_plugin.py
+-rwxr-xr-x	root/root	usr/share/hplip/diagnose_queues.py
 -rwxr-xr-x	root/root	usr/share/hplip/fab.py
 -rwxr-xr-x	root/root	usr/share/hplip/faxsetup.py
 -rwxr-xr-x	root/root	usr/share/hplip/firmware.py
@@ -2065,9 +2103,12 @@ drwxr-xr-x	root/root	usr/share/hplip/scan/
 -rwxr-xr-x	root/root	usr/share/hplip/testpage.py
 -rwxr-xr-x	root/root	usr/share/hplip/timedate.py
 -rwxr-xr-x	root/root	usr/share/hplip/toolbox.py
+-rwxr-xr-x	root/root	usr/share/hplip/uninstall.py
 -rwxr-xr-x	root/root	usr/share/hplip/unload.py
+-rwxr-xr-x	root/root	usr/share/hplip/upgrade.py
 -rwxr-xr-x	root/root	usr/share/hplip/wificonfig.py
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/lib/
 drwxr-xr-x	root/root	var/lib/hp/
--rw-r--r--	root/root	var/lib/hp/hplip.state
+drwxr-xr-x	root/root	var/log/
+drwxrwxr--	root/lp	var/log/hp/
diff --git a/hplip/.md5sum.i686 b/hplip/.md5sum.i686
index cf99d53f5..ab927738a 100755
--- a/hplip/.md5sum.i686
+++ b/hplip/.md5sum.i686
@@ -1 +1 @@
-5cb89a00b0c680d8bf9bf4b4f1f863b1  hplip-3.11.7.tar.gz
+a063f76aa47edab55a3f31ff2558df07  hplip-3.12.4.tar.gz
diff --git a/hplip/.md5sum.x86_64 b/hplip/.md5sum.x86_64
index cf99d53f5..ab927738a 100755
--- a/hplip/.md5sum.x86_64
+++ b/hplip/.md5sum.x86_64
@@ -1 +1 @@
-5cb89a00b0c680d8bf9bf4b4f1f863b1  hplip-3.11.7.tar.gz
+a063f76aa47edab55a3f31ff2558df07  hplip-3.12.4.tar.gz
diff --git a/hplip/Pkgfile b/hplip/Pkgfile
index e2857c8e1..b4274788a 100755
--- a/hplip/Pkgfile
+++ b/hplip/Pkgfile
@@ -6,7 +6,7 @@
 # Run on: cups,foomatic-db,foomatic-db-engine,foomatic-filters,ghostscript,libusb,dbus-python,sane
 
 name=hplip
-version=3.11.7
+version=3.12.4
 release=1
 source=(http://downloads.sourceforge.net/$name/$name-$version.tar.gz)
 build() {