Imported Upstream version 3.10.5

1 files changed, 44 insertions, 4 deletions

diff --git a/Makefile.in b/Makefile.in
index 8972d5cca..fefc02d61 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -695,7 +695,6 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
 	prnt/ps/hp-designjet_4520ps-ps.ppd.gz \
 	prnt/ps/hp-color_laserjet_cp1514n-ps.ppd.gz \
 	prnt/ps/hp-color_laserjet_2500-ps.ppd.gz \
-	prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz \
 	prnt/ps/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz \
 	prnt/ps/hp-laserjet_m9050_mfp-ps.ppd.gz \
 	prnt/ps/hp-laserjet_4200-ps.ppd.gz \
@@ -821,7 +820,6 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
 	prnt/ps/hp-designjet_4520mfp-ps.ppd.gz \
 	prnt/ps/hp-color_laserjet_cp1518ni-ps.ppd.gz \
 	prnt/ps/hp-laserjet_2410-ps.ppd.gz \
-	prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz \
 	prnt/ps/hp-mopier_240-ps.ppd.gz \
 	prnt/ps/hp-laserjet_6p-ps.ppd.gz \
 	prnt/ps/hp-laserjet_1200-ps.ppd.gz \
@@ -882,6 +880,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
 	ppd/hpijs/hp-deskjet_f4100_series-hpijs.ppd.gz \
 	ppd/hpijs/hp-photosmart_a630_series-hpijs.ppd.gz \
 	ppd/hpijs/hp-deskjet_690c-hpijs.ppd.gz \
+	ppd/hpijs/hp-laserjet_professional_p1606dn-hpijs.ppd.gz \
 	ppd/hpijs/hp-officejet_5600_series-hpijs.ppd.gz \
 	ppd/hpijs/hp-officejet_4105-hpijs.ppd.gz \
 	ppd/hpijs/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz \
@@ -895,6 +894,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
 	ppd/hpijs/hp-deskjet_5551-hpijs.ppd.gz \
 	ppd/hpijs/hp-laserjet_4v-hpijs-pcl3.ppd.gz \
 	ppd/hpijs/hp-deskjet_935c-hpijs.ppd.gz \
+	ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz \
 	ppd/hpijs/hp-deskjet_3650-hpijs.ppd.gz \
 	ppd/hpijs/hp-color_laserjet_3500-hpijs.ppd.gz \
 	ppd/hpijs/hp-officejet_r60-hpijs.ppd.gz \
@@ -976,9 +976,11 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
 	ppd/hpijs/hp-laserjet_9040-hpijs-pcl3.ppd.gz \
 	ppd/hpijs/hp-deskjet_9800-hpijs.ppd.gz \
 	ppd/hpijs/hp-deskjet_3810-hpijs.ppd.gz \
+	ppd/hpijs/hp-officejet_150_mobile_l511-hpijs.ppd.gz \
 	ppd/hpijs/hp-deskjet_1200c-hpijs.ppd.gz \
 	ppd/hpijs/hp-deskjet_3500-hpijs.ppd.gz \
 	ppd/hpijs/hp-photosmart_c6200_series-hpijs.ppd.gz \
+	ppd/hpijs/hp-laserjet_professional_p1566-hpijs.ppd.gz \
 	ppd/hpijs/hp-laserjet_p4014n-hpijs.ppd.gz \
 	ppd/hpijs/hp-deskjet_3870-hpijs.ppd.gz \
 	ppd/hpijs/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz \
@@ -1057,6 +1059,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
 	ppd/hpijs/hp-officejet_r80xi-hpijs.ppd.gz \
 	ppd/hpijs/hp-deskjet_995c-hpijs.ppd.gz \
 	ppd/hpijs/hp-deskjet_d4300_series-hpijs.ppd.gz \
+	ppd/hpijs/hp-photosmart_d110_series-hpijs.ppd.gz \
 	ppd/hpijs/hp-deskjet_692-hpijs.ppd.gz \
 	ppd/hpijs/hp-officejet_pro_k8600-hpijs.ppd.gz \
 	ppd/hpijs/hp-photosmart_1215-hpijs.ppd.gz \
@@ -1075,6 +1078,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
 	ppd/hpijs/hp-deskjet_5100-hpijs.ppd.gz \
 	ppd/hpijs/hp-psc_780xi-hpijs.ppd.gz \
 	ppd/hpijs/hp-officejet_series_330-hpijs.ppd.gz \
+	ppd/hpijs/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz \
 	ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz \
 	ppd/hpijs/hp-laserjet_1300n-hpijs-pcl3.ppd.gz \
 	ppd/hpijs/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz \
@@ -1189,6 +1193,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
 	ppd/hpijs/hp-laserjet_p2014n-hpijs-zxs.ppd.gz \
 	ppd/hpijs/hp-officejet_5100_series-hpijs.ppd.gz \
 	ppd/hpijs/hp-deskjet_6980_series-hpijs.ppd.gz \
+	ppd/hpijs/hp-laserjet_professional_p1102-hpijs.ppd.gz \
 	ppd/hpijs/hp-business_inkjet_2200-hpijs.ppd.gz \
 	ppd/hpijs/hp-laserjet_p4515x-hpijs.ppd.gz \
 	ppd/hpijs/hp-officejet_pro_k5400-hpijs.ppd.gz \
@@ -1229,12 +1234,15 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
 	ppd/hpijs/hp-laserjet_5200lx-hpijs.ppd.gz \
 	ppd/hpijs/hp-officejet_7100_series-hpijs.ppd.gz \
 	ppd/hpijs/hp-photosmart_2600_series-hpijs.ppd.gz \
+	ppd/hpijs/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz \
 	ppd/hpijs/hp-deskjet_5800-hpijs.ppd.gz \
 	ppd/hpijs/hp-laserjet_1022-hpijs-zjs.ppd.gz \
+	ppd/hpijs/hp-officejet_4400_k410-hpijs.ppd.gz \
 	ppd/hpijs/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz \
 	ppd/hpijs/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz \
 	ppd/hpijs/hp-deskjet_670c-hpijs.ppd.gz \
 	ppd/hpijs/hp-deskjet_670-hpijs.ppd.gz \
+	ppd/hpijs/hp-officejet_4000_k210-hpijs.ppd.gz \
 	ppd/hpijs/hp-officejet_6500_e709n-hpijs.ppd.gz \
 	ppd/hpijs/hp-psc_2100_series-hpijs.ppd.gz \
 	ppd/hpijs/hp-photosmart_c6100_series-hpijs.ppd.gz \
@@ -1275,6 +1283,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
 	ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz \
 	ppd/hpijs/hp-laserjet_1320n-hpijs.ppd.gz \
 	ppd/hpijs/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz \
+	ppd/hpijs/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz \
 	ppd/hpijs/hp-deskjet_5900_series-hpijs.ppd.gz \
 	ppd/hpijs/hp-deskjet_400-hpijs.ppd.gz \
 	ppd/hpijs/hp-deskjet_832c-hpijs.ppd.gz \
@@ -1783,6 +1792,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
 	ppd/hpcups/hp-laserjet_m4349_mfp-pcl3.ppd.gz \
 	ppd/hpcups/hp-laserjet_m5025_mfp-pcl3.ppd.gz \
 	ppd/hpcups/hp-laserjet_m5035_mfp-pcl3.ppd.gz \
+	ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz \
 	ppd/hpcups/hp-laserjet_m9040_mfp-pcl3.ppd.gz \
 	ppd/hpcups/hp-laserjet_m9050_mfp-pcl3.ppd.gz \
 	ppd/hpcups/hp-laserjet_m9059_mfp-pcl3.ppd.gz \
@@ -1827,14 +1837,23 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
 	ppd/hpcups/hp-laserjet_p4515tn.ppd.gz \
 	ppd/hpcups/hp-laserjet_p4515xm.ppd.gz \
 	ppd/hpcups/hp-laserjet_p4515x.ppd.gz \
+	ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz \
+	ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz \
+	ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz \
+	ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \
+	ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz \
+	ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz \
 	ppd/hpcups/hp-mopier_240-pcl3.ppd.gz \
 	ppd/hpcups/hp-mopier_320-pcl3.ppd.gz \
+	ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz \
+	ppd/hpcups/hp-officejet_4000_k210.ppd.gz \
 	ppd/hpcups/hp-officejet_4100_series.ppd.gz \
 	ppd/hpcups/hp-officejet_4105.ppd.gz \
 	ppd/hpcups/hp-officejet_4115_series.ppd.gz \
 	ppd/hpcups/hp-officejet_4200_series.ppd.gz \
 	ppd/hpcups/hp-officejet_4255.ppd.gz \
 	ppd/hpcups/hp-officejet_4300_series.ppd.gz \
+	ppd/hpcups/hp-officejet_4400_k410.ppd.gz \
 	ppd/hpcups/hp-officejet_4500_g510a-f.ppd.gz \
 	ppd/hpcups/hp-officejet_4500_g510g-m.ppd.gz \
 	ppd/hpcups/hp-officejet_5100_series.ppd.gz \
@@ -1994,6 +2013,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
 	ppd/hpcups/hp-photosmart_c7100_series.ppd.gz \
 	ppd/hpcups/hp-photosmart_c7200_series.ppd.gz \
 	ppd/hpcups/hp-photosmart_c8100_series.ppd.gz \
+	ppd/hpcups/hp-photosmart_d110_series.ppd.gz \
 	ppd/hpcups/hp-photosmart_d5060_series.ppd.gz \
 	ppd/hpcups/hp-photosmart_d5100_series.ppd.gz \
 	ppd/hpcups/hp-photosmart_d5300_series.ppd.gz \
@@ -2356,6 +2376,7 @@ foomatic_ppd_printers = \
     ppd/hpijs/hp-deskjet_f4100_series-hpijs.ppd.gz \
     ppd/hpijs/hp-photosmart_a630_series-hpijs.ppd.gz \
     ppd/hpijs/hp-deskjet_690c-hpijs.ppd.gz \
+    ppd/hpijs/hp-laserjet_professional_p1606dn-hpijs.ppd.gz \
     ppd/hpijs/hp-officejet_5600_series-hpijs.ppd.gz \
     ppd/hpijs/hp-officejet_4105-hpijs.ppd.gz \
     ppd/hpijs/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz \
@@ -2369,6 +2390,7 @@ foomatic_ppd_printers = \
     ppd/hpijs/hp-deskjet_5551-hpijs.ppd.gz \
     ppd/hpijs/hp-laserjet_4v-hpijs-pcl3.ppd.gz \
     ppd/hpijs/hp-deskjet_935c-hpijs.ppd.gz \
+    ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz \
     ppd/hpijs/hp-deskjet_3650-hpijs.ppd.gz \
     ppd/hpijs/hp-color_laserjet_3500-hpijs.ppd.gz \
     ppd/hpijs/hp-officejet_r60-hpijs.ppd.gz \
@@ -2450,9 +2472,11 @@ foomatic_ppd_printers = \
     ppd/hpijs/hp-laserjet_9040-hpijs-pcl3.ppd.gz \
     ppd/hpijs/hp-deskjet_9800-hpijs.ppd.gz \
     ppd/hpijs/hp-deskjet_3810-hpijs.ppd.gz \
+    ppd/hpijs/hp-officejet_150_mobile_l511-hpijs.ppd.gz \
     ppd/hpijs/hp-deskjet_1200c-hpijs.ppd.gz \
     ppd/hpijs/hp-deskjet_3500-hpijs.ppd.gz \
     ppd/hpijs/hp-photosmart_c6200_series-hpijs.ppd.gz \
+    ppd/hpijs/hp-laserjet_professional_p1566-hpijs.ppd.gz \
     ppd/hpijs/hp-laserjet_p4014n-hpijs.ppd.gz \
     ppd/hpijs/hp-deskjet_3870-hpijs.ppd.gz \
     ppd/hpijs/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz \
@@ -2531,6 +2555,7 @@ foomatic_ppd_printers = \
     ppd/hpijs/hp-officejet_r80xi-hpijs.ppd.gz \
     ppd/hpijs/hp-deskjet_995c-hpijs.ppd.gz \
     ppd/hpijs/hp-deskjet_d4300_series-hpijs.ppd.gz \
+    ppd/hpijs/hp-photosmart_d110_series-hpijs.ppd.gz \
     ppd/hpijs/hp-deskjet_692-hpijs.ppd.gz \
     ppd/hpijs/hp-officejet_pro_k8600-hpijs.ppd.gz \
     ppd/hpijs/hp-photosmart_1215-hpijs.ppd.gz \
@@ -2549,6 +2574,7 @@ foomatic_ppd_printers = \
     ppd/hpijs/hp-deskjet_5100-hpijs.ppd.gz \
     ppd/hpijs/hp-psc_780xi-hpijs.ppd.gz \
     ppd/hpijs/hp-officejet_series_330-hpijs.ppd.gz \
+    ppd/hpijs/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz \
     ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz \
     ppd/hpijs/hp-laserjet_1300n-hpijs-pcl3.ppd.gz \
     ppd/hpijs/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz \
@@ -2663,6 +2689,7 @@ foomatic_ppd_printers = \
     ppd/hpijs/hp-laserjet_p2014n-hpijs-zxs.ppd.gz \
     ppd/hpijs/hp-officejet_5100_series-hpijs.ppd.gz \
     ppd/hpijs/hp-deskjet_6980_series-hpijs.ppd.gz \
+    ppd/hpijs/hp-laserjet_professional_p1102-hpijs.ppd.gz \
     ppd/hpijs/hp-business_inkjet_2200-hpijs.ppd.gz \
     ppd/hpijs/hp-laserjet_p4515x-hpijs.ppd.gz \
     ppd/hpijs/hp-officejet_pro_k5400-hpijs.ppd.gz \
@@ -2703,12 +2730,15 @@ foomatic_ppd_printers = \
     ppd/hpijs/hp-laserjet_5200lx-hpijs.ppd.gz \
     ppd/hpijs/hp-officejet_7100_series-hpijs.ppd.gz \
     ppd/hpijs/hp-photosmart_2600_series-hpijs.ppd.gz \
+    ppd/hpijs/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz \
     ppd/hpijs/hp-deskjet_5800-hpijs.ppd.gz \
     ppd/hpijs/hp-laserjet_1022-hpijs-zjs.ppd.gz \
+    ppd/hpijs/hp-officejet_4400_k410-hpijs.ppd.gz \
     ppd/hpijs/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz \
     ppd/hpijs/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz \
     ppd/hpijs/hp-deskjet_670c-hpijs.ppd.gz \
     ppd/hpijs/hp-deskjet_670-hpijs.ppd.gz \
+    ppd/hpijs/hp-officejet_4000_k210-hpijs.ppd.gz \
     ppd/hpijs/hp-officejet_6500_e709n-hpijs.ppd.gz \
     ppd/hpijs/hp-psc_2100_series-hpijs.ppd.gz \
     ppd/hpijs/hp-photosmart_c6100_series-hpijs.ppd.gz \
@@ -2749,6 +2779,7 @@ foomatic_ppd_printers = \
     ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz \
     ppd/hpijs/hp-laserjet_1320n-hpijs.ppd.gz \
     ppd/hpijs/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz \
+    ppd/hpijs/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz \
     ppd/hpijs/hp-deskjet_5900_series-hpijs.ppd.gz \
     ppd/hpijs/hp-deskjet_400-hpijs.ppd.gz \
     ppd/hpijs/hp-deskjet_832c-hpijs.ppd.gz \
@@ -2962,7 +2993,6 @@ foomatic_ps_printers = \
     prnt/ps/hp-designjet_4520ps-ps.ppd.gz \
     prnt/ps/hp-color_laserjet_cp1514n-ps.ppd.gz \
     prnt/ps/hp-color_laserjet_2500-ps.ppd.gz \
-    prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz \
     prnt/ps/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz \
     prnt/ps/hp-laserjet_m9050_mfp-ps.ppd.gz \
     prnt/ps/hp-laserjet_4200-ps.ppd.gz \
@@ -3088,7 +3118,6 @@ foomatic_ps_printers = \
     prnt/ps/hp-designjet_4520mfp-ps.ppd.gz \
     prnt/ps/hp-color_laserjet_cp1518ni-ps.ppd.gz \
     prnt/ps/hp-laserjet_2410-ps.ppd.gz \
-    prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz \
     prnt/ps/hp-mopier_240-ps.ppd.gz \
     prnt/ps/hp-laserjet_6p-ps.ppd.gz \
     prnt/ps/hp-laserjet_1200-ps.ppd.gz \
@@ -3460,6 +3489,7 @@ cups_ppd_printers = \
    ppd/hpcups/hp-laserjet_m4349_mfp-pcl3.ppd.gz \
    ppd/hpcups/hp-laserjet_m5025_mfp-pcl3.ppd.gz \
    ppd/hpcups/hp-laserjet_m5035_mfp-pcl3.ppd.gz \
+   ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz \
    ppd/hpcups/hp-laserjet_m9040_mfp-pcl3.ppd.gz \
    ppd/hpcups/hp-laserjet_m9050_mfp-pcl3.ppd.gz \
    ppd/hpcups/hp-laserjet_m9059_mfp-pcl3.ppd.gz \
@@ -3504,14 +3534,23 @@ cups_ppd_printers = \
    ppd/hpcups/hp-laserjet_p4515tn.ppd.gz \
    ppd/hpcups/hp-laserjet_p4515xm.ppd.gz \
    ppd/hpcups/hp-laserjet_p4515x.ppd.gz \
+   ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz \
+   ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz \
+   ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz \
+   ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \
+   ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz \
+   ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz \
    ppd/hpcups/hp-mopier_240-pcl3.ppd.gz \
    ppd/hpcups/hp-mopier_320-pcl3.ppd.gz \
+   ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz \
+   ppd/hpcups/hp-officejet_4000_k210.ppd.gz \
    ppd/hpcups/hp-officejet_4100_series.ppd.gz \
    ppd/hpcups/hp-officejet_4105.ppd.gz \
    ppd/hpcups/hp-officejet_4115_series.ppd.gz \
    ppd/hpcups/hp-officejet_4200_series.ppd.gz \
    ppd/hpcups/hp-officejet_4255.ppd.gz \
    ppd/hpcups/hp-officejet_4300_series.ppd.gz \
+   ppd/hpcups/hp-officejet_4400_k410.ppd.gz \
    ppd/hpcups/hp-officejet_4500_g510a-f.ppd.gz \
    ppd/hpcups/hp-officejet_4500_g510g-m.ppd.gz \
    ppd/hpcups/hp-officejet_5100_series.ppd.gz \
@@ -3671,6 +3710,7 @@ cups_ppd_printers = \
    ppd/hpcups/hp-photosmart_c7100_series.ppd.gz \
    ppd/hpcups/hp-photosmart_c7200_series.ppd.gz \
    ppd/hpcups/hp-photosmart_c8100_series.ppd.gz \
+   ppd/hpcups/hp-photosmart_d110_series.ppd.gz \
    ppd/hpcups/hp-photosmart_d5060_series.ppd.gz \
    ppd/hpcups/hp-photosmart_d5100_series.ppd.gz \
    ppd/hpcups/hp-photosmart_d5300_series.ppd.gz \